Skip to content

B
business-java
Commit 7aa5fbbc authored by prane's avatar prane
Browse files
Options

If all site option enabled, separate stock transfer to be created for each site. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201025 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 48b59093
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 29 deletions
webitm-wms/ibase/webitm/ejb/wms/NearExpiryPrc.java
View file @ 7aa5fbbc
......@@ -174,7 +174,11 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
dataVal1 = genericUtility.getColumnValue("lock_code_exp",hdrDom);
dataVal2 = genericUtility.getColumnValue("lock_code_nexp",hdrDom);
siteCode = genericUtility.getColumnValue("site_code",hdrDom);
//Pavan Rane 21may19[Near expiry process - if all site option enabled, separate stock transfer to be created for each site ]
HashMap<String, ArrayList> stockNExpMap = new HashMap<String, ArrayList>();
HashMap<String, ArrayList> stockExpMap = new HashMap<String, ArrayList>();
String siteCodeTemp = "";
//Pavan Rane 21may19 end
//Changed by sumit sarkar on 21/06/12 insert CHECK_PHYSCAN_VALUE function in sql start.
/*selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
......@@ -341,9 +345,29 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
dataMap.put( "alloc_qty", ""+allocQty );
dataMap.put( "no_art", ""+noArt );
dataMap.put( "acct_code__inv", acctCodeInv );
dataMap.put( "cctr_code__inv", cctrCodeInv );
stockExpList.add(dataMap);
System.out.println("stockExpList**********************"+stockExpList);
dataMap.put( "cctr_code__inv", cctrCodeInv );
//Pavan Rane 21may19[Near expiry process - if all site option enabled, separate stock transfer to be created for each site ]
if("L".equals(lockORTransfer))
{
stockExpList.add(dataMap);
System.out.println("stockExpList**********************"+stockExpList);
}
else
{
if(stockExpMap.containsKey(siteCode))
{
ArrayList tmplist = stockExpMap.get(siteCode);
tmplist.add(dataMap);
stockExpMap.put(siteCode, tmplist);
}
else
{
ArrayList tmplist = new ArrayList();
tmplist.add(dataMap);
stockExpMap.put(siteCode, tmplist);
}
}
//Pavan Rane 21may19 end
//check for lock
System.out.println("..............check for lock..................");
sql ="select D.HOLD_STATUS ,D.tran_id ,D.line_no from INV_HOLD H, INV_HOLD_DET D where H.tran_id= D.tran_id and H.lock_code =? and D.ITEM_CODE =? and D.SITE_CODE= ? and D.LOC_CODE=? and D.LOT_NO= ? "
......@@ -453,9 +477,27 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
dataMap.put( "no_art", ""+noArt );
dataMap.put( "acct_code__inv", acctCodeInv );
dataMap.put( "cctr_code__inv", cctrCodeInv );
stockNexpList.add(dataMap);
//Pavan Rane 21may19[Near expiry process - if all site option enabled, separate stock transfer to be created for each site ]
if("L".equals(lockORTransfer))
{
stockNexpList.add(dataMap);
}
else
{
if(stockNExpMap.containsKey(siteCode))
{
ArrayList tmplist = stockNExpMap.get(siteCode);
tmplist.add(dataMap);
stockNExpMap.put(siteCode, tmplist);
}
else
{
ArrayList tmplist = new ArrayList();
tmplist.add(dataMap);
stockNExpMap.put(siteCode, tmplist);
}
}
//Pavan Rane 21may19 end
System.out.println("stockNexpList **********************"+stockNexpList);
}
......@@ -470,7 +512,8 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
pstmtStock = null;
}
System.out.println("Pavan Rane:1:stockNExpMap.size()::["+stockNExpMap.size()+"] stockExpMap.size()::["+stockExpMap.size()+"]"
//System.out.println("Pavan Rane:2:stockNExpMap::["+stockNExpMap+"] stockExpMap::["+stockExpMap+"]"
//Changed by sumit sarkar on 03/06/12 SQL For near expiry process end.
......@@ -535,25 +578,59 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
}
if ( "T".equalsIgnoreCase(lockORTransfer.trim()) ) //For Transfer
{
if ( stockExpList.size() > 0 && count > 0 )
{
retString = inventoryTransfer( stockExpList, "w_stock_transfer", xtraParams, conn );
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
//return retString;
}
if ( stockNexpList.size() > 0 && count1 > 0)
{
retString = inventoryTransfer( stockNexpList, "w_stock_transfer", xtraParams, conn );
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
//return retString;
//Pavan Rane 21may19[Near expiry process - if all site option enabled, separate stock transfer to be created for each site ]
//Stock Transfer for Expiry
Set setSite = stockExpMap.entrySet();
Iterator itrSite = setSite.iterator();
while (itrSite.hasNext())
{
Map.Entry siteMapEntry = (Map.Entry) itrSite.next();
String currSiteCode = (String) siteMapEntry.getKey();
System.out.println("Current Stock Transfer for::> siteCode["+currSiteCode+"]");
stockExpList = (ArrayList) siteMapEntry.getValue();
System.out.println("Current Stock Transfer for::> stockExpList.size()["+stockExpList.size()+"] stockExpList["+stockExpList+"]");
if ( stockExpList.size() > 0 && count > 0 )
{
retString = inventoryTransfer(currSiteCode, stockExpList, "w_stock_transfer", xtraParams, conn );
System.out.println("retString......1["+retString+"]isError["+isError);
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
}
}
setSite.clear();
itrSite = null;
//Stock Transfer for NearExpiry
setSite = stockNExpMap.entrySet();
itrSite = setSite.iterator();
while (itrSite.hasNext())
{
Map.Entry siteMapEntry = (Map.Entry) itrSite.next();
String currSiteCode = (String) siteMapEntry.getKey();
System.out.println("Current Stock Transfer for::> siteCode["+currSiteCode+"]");
stockNexpList = (ArrayList) siteMapEntry.getValue();
System.out.println("Current Stock Transfer for::> stockExpList.size()["+stockNexpList.size()+"] stockExpList["+stockNexpList+"]");
if ( stockNexpList.size() > 0 && count > 0 )
{
//retString = inventoryTransfer(stockNexpList, "w_stock_transfer", xtraParams, conn );
retString = inventoryTransfer(currSiteCode, stockNexpList, "w_stock_transfer", xtraParams, conn );
System.out.println("retString......2["+retString+"]isError["+isError);
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
}
}
}
//Pavan Rane 21may19 end
}
}
catch(SQLException se)
......@@ -632,7 +709,8 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
System.out.println("retString........:: " + retString);
return retString;
}
public String inventoryTransfer( ArrayList stockList, String windowName,String xtraParams, Connection conn ) throws RemoteException,ITMException
//public String inventoryTransfer( ArrayList stockList, String windowName,String xtraParams, Connection conn ) throws RemoteException,ITMException
public String inventoryTransfer(String currSiteCode, ArrayList stockList, String windowName,String xtraParams, Connection conn ) throws RemoteException,ITMException
{
String salesPerson = "";
String itemCode = "";
......@@ -710,7 +788,8 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
//Insert into header table i.e stock_transfer
pstmtHdr.setString( 1, tranID );
pstmtHdr.setTimestamp( 2, currDate );
pstmtHdr.setString( 3, loginSiteCode );
//pstmtHdr.setString( 3, loginSiteCode ); //Pavan Rane 21may19[Near expiry process - if all site option enabled, separate stock transfer to be created for each site ]
pstmtHdr.setString( 3, currSiteCode );
pstmtHdr.setString( 4, "XFRX" );
pstmtHdr.setString( 5, "N" );
pstmtHdr.setTimestamp( 6, currDate );
......@@ -822,7 +901,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
retString = invAllocTrace.updateInvallocTrace(strAllocate, conn);
strAllocate = null;
System.out.println("retString ::: " + retString);
System.out.println("retString invAllocTrace::: [" + retString+"]");
if (retString != null && retString.trim().length() > 0 )
{
isError = true;
......@@ -925,7 +1004,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
}catch(Exception se){}
}
System.out.println("retString........:: " + retString);
System.out.println("retString........:: " + retString+"]");
return retString;
}
private String generateTranId( String windowName, Connection conn )throws ITMException
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment