Commit 1fb5b892 authored by spawar's avatar spawar

Added Changes for Stock transfer and lock both on Expiry And NearExpiry


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99218 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 34c16562
......@@ -152,6 +152,11 @@ public class NearExpirySchedule implements Schedule
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
String nearExpLock = ""; //NEAR_EXP_LOCK
String expLock = ""; //EXP_LOCK
String lockSites = "";
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
try
{
ConnDriver connDriver = new ConnDriver();
......@@ -194,6 +199,18 @@ public class NearExpirySchedule implements Schedule
dataVal1 = distComm.getDisparams("999999","NEAR_EXP_LOCK",conn);
dataVal2 = distComm.getDisparams("999999","EXP_LOCK",conn);
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
else if( "B".equalsIgnoreCase(lockORTransfer.trim()) )//For Both)
{
lockSites = distComm.getDisparams("999999","LOCK_SITES",conn);
dataVal1 = distComm.getDisparams("999999","NEAREXP_LOC",conn);
dataVal2 = distComm.getDisparams("999999","EXP_LOC",conn);
nearExpLock = distComm.getDisparams("999999","NEAR_EXP_LOCK",conn);
expLock = distComm.getDisparams("999999","EXP_LOCK",conn);
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both 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, " +
......@@ -388,49 +405,114 @@ public class NearExpirySchedule implements Schedule
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);
//Start Added by chandrashekar 0n 28-05-2015
tempList.add(dataMap);
if(siteCodeExpeMap.containsKey(siteItemSer))
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
//stockExpList.add(dataMap);
//System.out.println("stockExpList**********************"+stockExpList);
if( !"B".equalsIgnoreCase(lockORTransfer.trim()) )//For Both)
{
siteCodeExpeMap.put(siteItemSer,tempList);
stockExpList.add(dataMap);
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
//Start Added by chandrashekar 0n 28-05-2015
tempList.add(dataMap);
if(siteCodeExpeMap.containsKey(siteItemSer))
{
siteCodeExpeMap.put(siteItemSer,tempList);
}
else
{
siteCodeExpeMap.put(siteItemSer,tempList);
}
//End Added by chandrashekar 0n 28-05-2015
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
}
else
{
siteCodeExpeMap.put(siteItemSer,tempList);
System.out.println("[LockAndTransferBoth]LockSites:["+lockSites+"]");
System.out.println("[LockAndTransferBoth]SiteCode:["+siteCode+"]");
if(lockSites.indexOf(siteCode) == -1)
{
tempList.add(dataMap);
siteCodeExpeMap.put(siteItemSer,tempList);
}
else
{
stockExpList.add(dataMap);
}
}
//End Added by chandrashekar 0n 28-05-2015
System.out.println("stockExpList**********************"+stockExpList);
//Changed By Samadhan on 20/11/2015 for transfer and lock both end
//Changed by sumit on 02/10/12 start
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= ? "
+" and D.LOT_SL =? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, nexpLoc);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs=pstmt.executeQuery();
if(rs.next())
{
holdStatus=rs.getString(1);
if("H".equalsIgnoreCase(holdStatus))
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
if( !"B".equalsIgnoreCase(lockORTransfer.trim()) )//For Both)
{
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
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= ? "
+" and D.LOT_SL =? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, nexpLoc);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs=pstmt.executeQuery();
if(rs.next())
{
HashMap lockRelMap = new HashMap();
lockRelMap.put("tran_id", rs.getString("tran_id"));
lockRelMap.put("line_no", rs.getString("line_no"));
lockRelList.add(lockRelMap);
System.out.println("lockRelList**********************"+lockRelList);
holdStatus=rs.getString(1);
if("H".equalsIgnoreCase(holdStatus))
{
HashMap lockRelMap = new HashMap();
lockRelMap.put("tran_id", rs.getString("tran_id"));
lockRelMap.put("line_no", rs.getString("line_no"));
lockRelList.add(lockRelMap);
System.out.println("lockRelList**********************"+lockRelList);
}
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
//Changed by sumit on 02/10/12 end
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
//Changed by sumit on 02/10/12 end
else
{
System.out.println("[LockAndTransferBoth]CheckForLock LockSites:["+lockSites+"]");
System.out.println("[LockAndTransferBoth]CheckForLock SiteCode:["+siteCode+"]");
if(lockSites.indexOf(siteCode) != -1)
{
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= ? "
+" and D.LOT_SL =? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, nexpLoc);
pstmt.setString(2, itemCode);
pstmt.setString(3, siteCode);
pstmt.setString(4, locCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
rs=pstmt.executeQuery();
if(rs.next())
{
holdStatus=rs.getString(1);
if("H".equalsIgnoreCase(holdStatus))
{
HashMap lockRelMap = new HashMap();
lockRelMap.put("tran_id", rs.getString("tran_id"));
lockRelMap.put("line_no", rs.getString("line_no"));
lockRelList.add(lockRelMap);
System.out.println("lockRelList**********************"+lockRelList);
}
}
pstmt.close();
pstmt=null;
rs.close();
rs=null;
}
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
}
if ( rsStock != null)
{
......@@ -538,19 +620,44 @@ public class NearExpirySchedule implements Schedule
dataMap.put( "no_art", ""+noArt );
dataMap.put( "acct_code__inv", acctCodeInv );
dataMap.put( "cctr_code__inv", cctrCodeInv );
stockNexpList.add(dataMap);
System.out.println("stockNexpList **********************"+stockNexpList);
//Start Added by chandrashekar 0n 28-05-2015
tempListNe.add(dataMap);
if(siteCodeNeExpeMap.containsKey(siteItemSer))
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
//stockNexpList.add(dataMap);
//System.out.println("stockNexpList **********************"+stockNexpList);
if( !"B".equalsIgnoreCase(lockORTransfer.trim()) )//For Both)
{
siteCodeNeExpeMap.put(siteItemSer,tempListNe);
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
//Start Added by chandrashekar 0n 28-05-2015
stockNexpList.add(dataMap);
tempListNe.add(dataMap);
if(siteCodeNeExpeMap.containsKey(siteItemSer))
{
siteCodeNeExpeMap.put(siteItemSer,tempListNe);
}
else
{
siteCodeNeExpeMap.put(siteItemSer,tempListNe);
}
//End Added by chandrashekar 0n 28-05-2015
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
else
{
siteCodeNeExpeMap.put(siteItemSer,tempListNe);
System.out.println("[LockAndTransferBoth]LockSites:["+lockSites+"]");
System.out.println("[LockAndTransferBoth]SiteCode:["+siteCode+"]");
if(lockSites.indexOf(siteCode) == -1)
{
tempListNe.add(dataMap);
siteCodeNeExpeMap.put(siteItemSer,tempListNe);
}
else
{
stockNexpList.add(dataMap);
}
}
//End Added by chandrashekar 0n 28-05-2015
System.out.println("stockNexpList **********************"+stockNexpList);
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
}
if ( rsStock != null)
{
......@@ -655,6 +762,86 @@ public class NearExpirySchedule implements Schedule
}
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both Start
else if("B".equalsIgnoreCase(lockORTransfer.trim()) ) //For Both
{
//For Transfer Start
System.out.println("[LockAndTransferBoth] Calling........");
System.out.println("[LockAndTransferBoth] Transfer Start........");
System.out.println("[LockAndTransferBoth] siteCodeExpeMap: "+siteCodeExpeMap.size()+"Count: "+count);
if ( siteCodeExpeMap.size() > 0 && count > 0 )
{
remarksFlag="EXPR";
//retString = inventoryTransfer( stockExpList, "w_stock_transfer", xtraParams, conn );
retString = inventoryTransfer( siteCodeExpeMap, "w_stock_transfer", xtraParams, remarksFlag,conn );//Change by chandrashekar 0n 28-05-2015
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
//return retString;
}
System.out.println("[LockAndTransferBoth] siteCodeNeExpeMap: "+siteCodeNeExpeMap.size()+"Count1: "+count1);
if ( siteCodeNeExpeMap.size() > 0 && count1 > 0)
{
remarksFlag="NEXP";
//retString = inventoryTransfer( stockNexpList, "w_stock_transfer", xtraParams, conn );
retString = inventoryTransfer( siteCodeNeExpeMap, "w_stock_transfer", xtraParams,remarksFlag, conn );//Change by chandrashekar 0n 28-05-2015
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
//return retString;
}
//For Transfer End
//For Lock Start
System.out.println("[LockAndTransferBoth] Locking Start........");
System.out.println("[LockAndTransferBoth] lockRelList: "+lockRelList.size()+"Count: "+count);
if (count > 0)
{
System.out.println("Calling EXPIRED-------------------->");
isInsert=true;
if(lockRelList.size() >0)
{
System.out.println("going to insert in inv_hold__Rel ");
retString=genInvRelTrans(lockRelList, scheduleParamXML , conn);
System.out.println("retString" +retString);
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
}
System.out.println("going to insert in inv_hold EXPIRED");
if ( stockExpList.size() > 0)
{
retString = holdGen.generateHoldTrans( expLock, "EXPIRED","EXP", siteCode, stockExpList, "", conn );
}
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
}
System.out.println("in count1 > 0 if loop");
System.out.println("[LockAndTransferBoth]stockNexpList.size() ["+stockNexpList.size()+"] and count1 -> ["+count1+"]");
if ( stockNexpList.size() > 0 && count1 > 0 )
{
System.out.println("going to insert in inv_hold for NEAREXPIRY----> ");
isInsert=true;
retString = holdGen.generateHoldTrans( nearExpLock, "NEAREXPIRY","NEXP", siteCode, stockNexpList, "", conn );
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
{
isError = true;
}
//For Lock End
}
//Changed By Samadhan on 20/11/2015 for transfer and lock both End
}
}
catch(SQLException se)
......
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