Skip to content

B
business-java
Commit ab411657 authored by ppatro's avatar ppatro
Browse files
Options

To merge src for WMS updated wave gen changes. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91987 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a5a13277
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 214 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ ab411657
......@@ -3571,7 +3571,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return returnRefId;
}
//Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table start.
/* //Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table start.
//private String updatePickOrd(Document headerDom, Document detailDom,String waveID,String siteCode,String saleOrder,String lineNo, String xtraParams, ArrayList dataList,boolean isReplanished,String ptcn, Connection conn )throws Exception
private String updatePickOrd(Document headerDom, Document detailDom,String waveID,String siteCode,String saleOrder, String xtraParams, ArrayList dataList,boolean isReplanished,boolean isDeepStoreLoc ,String ptcn,HashMap transportInfoMap, Connection conn )throws Exception
{
......@@ -3650,7 +3650,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
/*//Changed By Pragyan Demo4.start
//Changed By Pragyan Demo4.start
activePickInvstat = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
casePickInvstat = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
docLocInvstat = discommon.getDisparams("999999","DOCKLOC_INVSTAT",conn);
......@@ -3658,7 +3658,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pndInvstat = discommon.getDisparams("999999","PND_INVSTAT",conn);
reserveInvStat = discommon.getDisparams("999999","RESERV_LOCATION",conn);
//Changed By Pragyan Demo4.end
*/
//Changed By Pragyan Demo4.start
tranCode = (String)transportInfoMap.get("TRAN_CODE");
maxWeight = (String)transportInfoMap.get("MAX_WEIGHT");
......@@ -3689,14 +3689,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//isMasterPackAllow = isMasterPackAllow(saleOrder,custCodeDlv,tranCode,conn);
//Changed by Rohan on 14/08/12 to get wave type info.start
/*
waveTypeInfo = getWaveTypeInfo(saleOrder, conn);
waveInfo = waveTypeInfo.split(":");
mPackAllow = waveInfo[0];
aPickAllow = waveInfo[1];
stockToDoc = waveInfo[2];
*/
//String mPackAllowCust = genericUtility.getColumnValue("cust_code",headerDom);
//String mPackAllowCust1 = genericUtility.getColumnValue("cust_code",detailDom);
//System.out.println("mPackAllowCust:["+mPackAllowCust+"]mPackAllowCust1["+mPackAllowCust1);
......@@ -3714,12 +3714,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if (maxWeight != null && maxWeight.length()> 0)
{
//Changed by Rohan on 16/08/12 to get master pack staus from wave Type master
/*
if(!(Double.parseDouble(maxWeight) <= masterPackWeightPerOrder ))
{
isMasterPackAllow = false;
}
*/
masterPackWeightPerOrder = Double.parseDouble(maxWeight);
}
......@@ -3834,7 +3834,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
/*Added by Ashish Sonawane on 7-jul-12 for Master packing with pallet wise [START]*/
Added by Ashish Sonawane on 7-jul-12 for Master packing with pallet wise [START]
double cashCountPerPallet =Math.floor( (cashCount * caseVolume)/palletVolume);
totalCaseOnPallet = Math.floor(palletVolume/caseVolume);
//double renCtr = 0;
......@@ -4020,8 +4020,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
while(renCtr <= cashCountPerPallet);
}
/*Added by Ashish Sonawane on 7-jul-12 for Master packing with pallet wise [END]*/
/*commented by Ashish Sonawane on 7-jul-12 as per Manoharan sir [START] */
Added by Ashish Sonawane on 7-jul-12 for Master packing with pallet wise [END]
commented by Ashish Sonawane on 7-jul-12 as per Manoharan sir [START]
else
{
do
......@@ -4276,10 +4276,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(allCasePickList.size() > 0)
{
//Changed by Rohan on 24-11-11 [WM1ESUN006].For bug fixing.start
/*
caseTempPickList = (ArrayList)allCasePickList.get(allListLen -1);
Map tempMap = (HashMap)caseTempPickList.get(caseTempPickList.size() -1);
*/
int allListLen = allCasePickList.size();
caseTempPickList = (ArrayList)allCasePickList.get(allListLen -1);
int innerListLen = caseTempPickList.size();
......@@ -4653,12 +4653,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+"SALE_ORDER,WAVE_ID,PICK_TYPE, CHG_USER, CHG_DATE, CHG_TERM) VALUES (?,?,?,?,?,?,?,?,?)";
//Changed by Rohan on 30-08-12 for bug fixing.start
/*
sqlDtl = "INSERT INTO PICK_ORD_DET(PICK_ORDER, LINE_NO, " +
"SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,EXP_LEV,LOC_CODE__TO) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
*/
sqlDtl = "INSERT INTO PICK_ORD_DET(PICK_ORDER, LINE_NO, " +
"SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,EXP_LEV,LOC_CODE__TO,REPL_ORDER,LINE_NO__REPL) " +
......@@ -4686,7 +4686,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
/* sqlHdrPick="INSERT INTO PICK_ORD_HDR(PICK_ORDER, ORDER_DATE, SITE_CODE,"
sqlHdrPick="INSERT INTO PICK_ORD_HDR(PICK_ORDER, ORDER_DATE, SITE_CODE,"
+"SALE_ORDER,WAVE_ID,PICK_TYPE, CHG_USER, CHG_DATE, CHG_TERM) VALUES (?,?,?,?,?,?,?,?,?)";
//Changed By Pragyan Demo4
......@@ -4713,7 +4713,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
sqlReplOrdDtl = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,PICK_ORDER,LINE_NO__PICK,EXP_LEV,LOC_CODE__TO) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sqlHdrPick);
......@@ -4728,13 +4728,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan Demo4
//Changed by Rohan on 14-12-11 [WM1ESUN006] To add exp_lev into repl_ord_det
/*String sql1 = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
String sql1 = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?)";*/
"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
/*String sql1 = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
String sql1 = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,EXP_LEV) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";*/
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
String sql1 = "INSERT INTO REPL_ORD_DET(REPL_ORDER, LINE_NO, SALE_ORDER, LINE_NO__SORD, SITE_CODE, " +
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,EXP_LEV,LOC_CODE__TO) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
......@@ -4811,14 +4811,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
isPick = true;
pickType = "C";
//Changed By Sank
/*ArrayList casePickLocList = getAvilablePickLocationList(pickType, conn);
int casePickLocListSize = casePickLocList.size();*/
ArrayList casePickLocList = getAvilablePickLocationList(pickType, conn);
int casePickLocListSize = casePickLocList.size();
//Added By Ashish for replenishment [START]
ArrayList tempListToRepl = (ArrayList)allCasePickList.get(cCTR);
int tempListToReplLen = tempListToRepl.size();
String isCreateReplHeader ="N";
//Changed by Rohan on 27-08-12 for bug fixing .start
/*
for(int listCtr = 0;listCtr < tempListToReplLen;listCtr++)
{
Map tempItemMap = (HashMap)tempListToRepl.get(listCtr);
......@@ -4835,13 +4835,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
*/
//Changed by Rohan on 27-08-12 for bug fixing.end
String pickRefId = "";
String replRefId ="";
//Changed by Rohan on 27-08-12 for bug fixing .start
/*
if("Y".equalsIgnoreCase(isCreateReplHeader))
{
replRefId = updateWaveTaskDet(waveID,1,saleOrder,"","",ptcn,conn);
......@@ -4872,8 +4872,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setDate(8,orderDate);
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();
*/
/*pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"C-PICK","C",ptcn,conn);
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"C-PICK","C",ptcn,conn);
pstmt.setString(1,pickRefId);
pstmt.setDate( 2, orderDate );
pstmt.setString(3,siteCode);
......@@ -4883,7 +4883,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(7,chgUser);
pstmt.setDate(8,orderDate);
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();*/
pstmt.executeUpdate();
//Changed by Rohan on 27-08-12 for bug fixing.end
ArrayList tempList = (ArrayList)allCasePickList.get(cCTR);
......@@ -5003,7 +5003,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan Demo4.start
//Changed By Sankara.start
/*if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
{
pstmtRplDet.setString(15,(String)casePickLocList.get(aCtr));
}
......@@ -5012,7 +5012,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVCPKLOC",conn);
return errString;
}*/
}
if(casePkLoc != null && casePkLoc.length() > 0)
......@@ -5108,12 +5108,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//String chgPtcn = ptcn;
double ctrMaster = 0.0;
int lengthOfMaster = allMasterPackList.size();
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START]
double totalWeight =0.0;
int totalNoArt=0;
String packRefId="",pickRefId="";
int cntSingleMasterPick=0;
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END]
//Changed By Amaya.start
double caseVolume = 0.0;
double caseWeight = 0.0;
......@@ -5132,8 +5132,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Check Whether the Master Pack Per Order Exceeding The Truck Load.end
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn.end
/*ArrayList casePickLocList = getAvilablePickLocationList("C", conn);
int casePickLocListSize = casePickLocList.size();*/
ArrayList casePickLocList = getAvilablePickLocationList("C", conn);
int casePickLocListSize = casePickLocList.size();
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn
//String replRefId = updateWaveTaskDet(waveID,1,saleOrder,chgPtcn,conn);
//Added By Ashish for replenishment [START]
......@@ -5141,7 +5141,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
int tempListToReplLen = tempListToRepl.size();
String isCreateReplHeader ="N";
//Changed by Rohan on 28-08-12 for bug fixing.start
/*
for(int listCtr = 0;listCtr < tempListToReplLen;listCtr++)
{
Map tempItemMap = (HashMap)tempListToRepl.get(listCtr);
......@@ -5159,13 +5159,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
*/
//Changed by Rohan on 28-08-12 for bug fixing.end
String replRefId ="";
pickType = "M";
//Changed by Rohan on 28-08-12 for bug fixing.start
/*
if("Y".equalsIgnoreCase(isCreateReplHeader))
{
replRefId = updateWaveTaskDet(waveID,1,saleOrder,"","",ptcn,conn);
......@@ -5183,11 +5183,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.executeUpdate();
}
pickType = "M";
*/
//Changed by Rohan on 28-08-12 for bug fixing.end
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn
//pickRefId = updateWaveTaskDet(waveID,2,saleOrder,chgPtcn,conn);
/*if(("Y".equalsIgnoreCase(isSinglePickMasterPack)) && Ctr == 0)
if(("Y".equalsIgnoreCase(isSinglePickMasterPack)) && Ctr == 0)
{
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
pstmt.setString(1,pickRefId);
......@@ -5216,28 +5216,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();
pstmt.clearParameters();
}*/
}
//updateCartonMaster(replRefId, Ctr + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn);
//Changed by Ameya on 09-08-2012 start.
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
updateCartonMaster(pickRefId, Ctr + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn); //commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
}*/
}
//Changed by Ameya on 09-08-2012 end.
//Updating pack order for each pack order
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn
//String packRefId = updateWaveTaskDet(waveID,3,saleOrder,chgPtcn,conn);
//Changed According To Manohran Sir
/*String packRefId = updateWaveTaskDet(waveID,3,saleOrder,ptcn,conn);
updatePacking(waveID,saleOrder,packRefId,pickRefId,xtraParams, conn);*/
String packRefId = updateWaveTaskDet(waveID,3,saleOrder,ptcn,conn);
updatePacking(waveID,saleOrder,packRefId,pickRefId,xtraParams, conn);
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
packRefId = updateWaveTaskDet(waveID,3,saleOrder,"","",ptcn,conn);
updatePacking(waveID,saleOrder,packRefId,pickRefId,xtraParams, conn); //commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
}*/
}
ArrayList tempMastList = (ArrayList)allMasterPackList.get(Ctr);
int tempMastLen = tempMastList.size();
System.out.println("SIZE OF ALL MASTER SUB CASES["+tempMastLen+"]OUTER Ctr["+Ctr);
......@@ -5291,14 +5291,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changes by Rohan on 28/08/12 for bug fixing.end
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]
//double grossWeight=getGrossWeight(itemCode,lotNo,conn);
//totalWeight =totalWeight + (itemGrossWeight * Double.parseDouble(noArt));
totalWeight = totalWeight + caseWeightTotal;
totalNoArt= totalNoArt + (int)(Double.parseDouble(noArt));
System.out.println("totalNoArt till counter ["+aCtr+"] "+totalNoArt);
System.out.println("totalWeight till counter ["+aCtr+"] "+totalWeight);
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]
}
//Changed by Rohan 14-12-11 [WM1ESUN006] To add exp_lev in repl_ord_det
expLevel = (String)tempMap.get("exp_lev");
......@@ -5395,7 +5395,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setInt(13,aCtr + 1);
//Changed by Rohan 0n 14-12-11 [WM1ESUN006] To add exp-lev into repl_ord_det
pstmtRplDet.setString(14,expLevel);
/*if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
{
pstmtRplDet.setString(15,(String)casePickLocList.get(aCtr));
}
......@@ -5404,7 +5404,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVCPKLOC",conn);
return errString;
}*/
}
if(caseMpkLoc != null && caseMpkLoc.length() > 0)
{
pstmtRplDet.setString(15,caseMpkLoc);
......@@ -5501,8 +5501,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//int masterPackCount = 60;
double cashCount = Double.parseDouble(noArt);
/*double masterPackWeight = 70;
double caseWeight = 22;*/
double masterPackWeight = 70;
double caseWeight = 22;
double mPackCounter = Math.floor(cashCount / masterPackCount);
double masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
double totalCaseOnPallet = masterPackCount;
......@@ -5596,7 +5596,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//<<<<<<<<<<<<<<<<<>
ctrMaster++;
}
/* if("Y".equalsIgnoreCase(isSinglePickMasterPack))
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
Added by Ashish Sonawane on 07-jul-12 for Master Pack [START]
System.out.println("totalWeight final :["+totalWeight+"]");
......@@ -5628,12 +5628,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// changed by Ameya on 08-08-2012 for M-PACK End.
}
Added by Ashish Sonawane on 07-jul-12 for Master Pack [END]
}*/
}
}
//End Master Pack
//Changed by Rohan on 4-12-11 [WM1ESUN006] For master pack allow.end
/*int allActivesListLen = allActivesList.size();
int allActivesListLen = allActivesList.size();
if(allActivesListLen > 0)
{
System.out.println("DSOACTIVE*********** ");
......@@ -6206,7 +6206,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}//for(int cCTR = 0;cCTR < allActivesListLen; cCTR ++)
}*/
}
int allActivesListLen = allActivesList.size();
if(allActivesListLen > 0)
......@@ -6240,7 +6240,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(7,chgTerm);
pstmtRplHdr.setDate(8,orderDate);
//pstmtRplHdr.setString(9,"A");
/*
if(allActivesListLen > 1)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
......@@ -6251,7 +6251,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
isReplHdr = true;
replOrdCpy = replRefDeepId;
}
*/
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -6260,7 +6260,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pickType = "A";
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
String replRefId ="";
String replRefDeepId = "";//updateWaveTaskDet(waveID,1,saleOrder,"R-DSO","E",ptcn,conn); //Added by chandni 06-06-12
//Replanishment Hader
......@@ -6274,7 +6274,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setDate(8,orderDate);
pstmtRplHdr.setString(9,"A");
*/
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
pstmt.setDate( 2, orderDate );
......@@ -6301,15 +6301,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
Map tempItemMap = (HashMap)tempListToRepl.get(listCtr);
//Changed by Rohan on 1/8/12 to change scope of variables.start
/*
String itemRepl = (String)tempItemMap.get("item_code");
String siteCodeRepl = (String)tempItemMap.get("site_code");
Double quantityRepl = (Double)tempItemMap.get("alloc_qty");
String locCodeRepl = (String)tempItemMap.get("loc_code");
String lotNoRepl = (String)tempItemMap.get("lot_no");
String lotSlRepl = (String)tempItemMap.get("lot_sl");
*/
/*
itemRepl = (String)tempItemMap.get("item_code");
siteCodeRepl = (String)tempItemMap.get("site_code");
quantityRepl = (Double)tempItemMap.get("alloc_qty");
......@@ -6317,7 +6317,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
locCodeRepl = (String)tempItemMap.get("loc_code");
lotNoRepl = (String)tempItemMap.get("lot_no");
lotSlRepl = (String)tempItemMap.get("lot_sl");
*/
itemCode = (String)tempItemMap.get("item_code");
siteCode = (String)tempItemMap.get("site_code");
......@@ -6406,7 +6406,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//is Active Replanishment with Stock Primary Key Exist > 0.start
ArrayList tempReplList = getActiveCaseReplMap("I",activePickInv, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
ArrayList tempCaseReplList = getActiveCaseReplMap("",casePickInv, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
/*
if(tempReplList.size() == 0 && (allActivesListLen == 1) && tempCaseReplList.size() == 0 && !(isReplHdr))
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
......@@ -6421,7 +6421,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
replRefDeepId = replOrdCpy ;
replCnt++;
}
*/
if(tempReplList.size() > 0)
{
String locCodeAct =(String) tempReplList.get(0);
......@@ -6555,7 +6555,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate();
//Chnages by Rohan on 26/08/12.for insert pick order hdr...start
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
pstmt.setString(1,pickRefId);
pstmt.executeUpdate();
pstmtDet.setString(1,pickRefId);
......@@ -6564,14 +6564,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setDouble(11,avilableQty);
pstmtDet.setString(14,acReplOrder);
pstmtDet.executeUpdate();
*/
//Chnages by Rohan on 26/08/12.for insert pick order hdr...start
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, (packSizeCase - pendActQty) ,dReplOrder, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, (packSizeCase - pendActQty) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder,repLineNo, conn);
......@@ -6655,10 +6655,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setInt(15,replCnt);
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkLoc, (packSizeCase - quantityToUpd) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkLoc, (packSizeCase - quantityToUpd) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder,repLineNo,conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -6680,18 +6680,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"E");
pstmtRplHdr.executeUpdate();
*/
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
/*///
///
pstmtRplHdr.setString(1,replRefPNDId);
pstmtRplHdr.setString(9,"I");
pstmtRplHdr.executeUpdate();
*/
replCnt = replCnt + 1;
System.out.println("repl Counter"+replCnt);
pstmt.setString(1,pickRefId);
......@@ -6798,10 +6798,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(14,sReplOrder);
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, 0.0,sReplOrder, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, 0.0,sReplOrder,replLineNo, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder,replLineNo, conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -6836,11 +6836,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
//Replanishment Hader
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"T");
pstmtRplHdr.executeUpdate();
*/
pstmtRplDet.setString(1,replRefDeepId);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
pstmtRplDet.setInt(2,replCnt);
......@@ -6871,10 +6871,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - pendActQty) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - pendActQty - avilableCaseActQty) ,lloReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - pendActQty) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - pendActQty - avilableCaseActQty) ,replRefDeepId,String.valueOf(replCnt), conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -6902,10 +6902,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//System.out.println("sReplOrder");
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct,pendActQty,sReplOrder, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct,pendActQty,sReplOrder,prvReplLineNo, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder,prvReplLineNo, conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -6924,11 +6924,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
//Replanishment Hader
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"T");
pstmtRplHdr.executeUpdate();
*/
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
......@@ -6978,10 +6978,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(14,replRefDeepId);
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantity) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder, conn);
*/
updateReplOrdDet( "T",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantity) ,replRefDeepId,replLineNo, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder,replLineNo, conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -7014,11 +7014,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.executeUpdate();
*/
pstmt.setString(1,pickRefId);
pstmt.executeUpdate();
pstmtRplDet.setString(1,replRefDeepId);
......@@ -7092,8 +7092,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
for(int rptr = 0;rptr < stkToDockLen; rptr ++)
{
/*ArrayList pndLocList = getAvilablePickLocationList("N", conn);
int pndLocListSize = pndLocList.size();*/
ArrayList pndLocList = getAvilablePickLocationList("N", conn);
int pndLocListSize = pndLocList.size();
Map tempMap = (HashMap)allStockToDockList.get(rptr);
siteCode = (String)tempMap.get("site_code");
......@@ -7151,7 +7151,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplStk.setInt(13, rptr +1);
pstmtRplStk.setString(14, expLevel);
//CHANGED BY PRAGYAN 12-JUL-12 FOR DEEP STORAGE LOCATION COMMIT .START
/* if(pndLocListSize > 0 && rptr < pndLocListSize)
if(pndLocListSize > 0 && rptr < pndLocListSize)
{
pstmtRplStk.setString(15,(String)pndLocList.get(rptr));
}
......@@ -7164,8 +7164,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplStk.setString(1,replRefPNDId);
pstmtRplStk.setString(12,"");
pstmtRplStk.setInt(13, 0);
pstmtRplStk.setString(15,docLoc);*/
/*if(pndLocListSize > 0 && rptr < pndLocListSize)
pstmtRplStk.setString(15,docLoc);
if(pndLocListSize > 0 && rptr < pndLocListSize)
{
pndLocation = (String)pndLocList.get(rptr);
pstmtRplStk.setString(15,pndLocation);
......@@ -7175,7 +7175,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplStk.setString(15,"");
errString = getError(saleOrder,"INVPNDLOC",conn);
return errString;
}*/
}
if(pndLoc != null && pndLoc.length() > 0)
{
//pndLocation = (String)pndLocList.get(rptr);
......@@ -7228,17 +7228,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
pickType = "C";
isPick = true;
/*ArrayList pndLocList = getAvilablePickLocationList("N", conn);
ArrayList pndLocList = getAvilablePickLocationList("N", conn);
int pndLocListSize = pndLocList.size();
ArrayList casePickLocList = getAvilablePickLocationList(pickType, conn);
int casePickLocListSize = casePickLocList.size();*/
int casePickLocListSize = casePickLocList.size();
//Asiss Change.start
ArrayList tempListToRepl = (ArrayList)allCasePickList.get(cCTR);
int tempListToReplLen = tempListToRepl.size();
String isCreateReplHeader ="N";
//Changed by Rohan on 27-08-12 for bug fixing .start
/*
for(int listCtr = 0;listCtr < tempListToReplLen;listCtr++)
{
......@@ -7256,13 +7256,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
*/
//Changed by Rohan on 27-08-12 for bug fixing.end
String pickRefId = "";
String replRefId ="";
String replRefDeepId ="",replRefPNDId="";
//Changed by Rohan on 27-08-12 for bug fixing .start
/*
if("Y".equalsIgnoreCase(isCreateReplHeader))
{
......@@ -7302,8 +7302,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setDate(8,orderDate);
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();
*/
/*pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"C-PICK","C",ptcn,conn);
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"C-PICK","C",ptcn,conn);
pstmt.setString(1,pickRefId);
pstmt.setDate( 2, orderDate );
pstmt.setString(3,siteCode);
......@@ -7313,7 +7313,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(7,chgUser);
pstmt.setDate(8,orderDate);
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();*/
pstmt.executeUpdate();
//Changed by Rohan on 27-08-12 for bug fixing.end
ArrayList tempList = (ArrayList)allCasePickList.get(cCTR);
......@@ -7448,7 +7448,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan 0n 14-12-11 [WM1ESUN006] To add exp-lev into repl_ord_det
pstmtRplDet.setString(14,expLevel);
//Changed By Pragyan Demo4.start
/*if(pndLocListSize > 0 && aCtr < pndLocListSize)
if(pndLocListSize > 0 && aCtr < pndLocListSize)
{
pstmtRplDet.setString(15,(String)pndLocList.get(aCtr));
}
......@@ -7457,7 +7457,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVPNDLOC",conn);
return errString;
}*/
}
if(pndLoc != null && pndLoc.length() > 0)
{
pstmtRplDet.setString(15,pndLoc);
......@@ -7476,7 +7476,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setInt(13,replCtr);
//pstmtRplDet.setString(7,(String)pndLocList.get(aCtr));//Added by Ashish Sonawane on 07-Jul-12 to make PND location_from (loc_code) same as replenishment location_to (loc_code__to)
pstmtRplDet.setString(7,pndLoc);//Added by Ashish Sonawane on 07-Jul-12 to make PND location_from (loc_code) same as replenishment location_to (loc_code__to)
/*if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
{
pstmtRplDet.setString(15,(String)casePickLocList.get(aCtr));
}
......@@ -7485,7 +7485,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVCPKLOC",conn);
return errString;
}*/
}
if(casePkDeepLoc != null && casePkDeepLoc.length() > 0)
{
pstmtRplDet.setString(15,casePkDeepLoc);
......@@ -7568,12 +7568,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(lengthOfMaster > 0)
{
double ctrMaster = 0.0;
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START]
double totalWeight =0.0;
int totalNoArt=0;
String packRefId="",pickRefId="";
int cntSingleMasterPick =0;
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END]
// Changed by Ameya on 08-08-2012 for M-PICK Start.
double caseVolume=0.0;
double caseWeight=0.0;
......@@ -7588,16 +7588,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
isPick = true;
pickType = "M";
/*ArrayList pndLocList = getAvilablePickLocationList("N", conn);
ArrayList pndLocList = getAvilablePickLocationList("N", conn);
int pndLocListSize = pndLocList.size();
ArrayList casePickLocList = getAvilablePickLocationList(pickType, conn);
int casePickLocListSize = casePickLocList.size();*/
int casePickLocListSize = casePickLocList.size();
ArrayList tempListToRepl = (ArrayList)allMasterPackList.get(cCTR);
int tempListToReplLen = tempListToRepl.size();
String isCreateReplHeader ="N";
//Changed by Rohan on 28/08/12 for bug fixing.start
/*
for(int listCtr = 0;listCtr < tempListToReplLen;listCtr++)
{
Map tempItemMap = (HashMap)tempListToRepl.get(listCtr);
......@@ -7615,11 +7615,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//@shish
*/
//Changed by Rohan on 28/08/12 for bug fixing.end
String replRefDeepId ="",replRefPNDId="";
//Changed by Rohan on 28/08/12 for bug fixing.start
/*
if("Y".equalsIgnoreCase(isCreateReplHeader))
{
//String replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"E-ORD","E",ptcn,conn); //commented by chandni 06-06-12
......@@ -7645,21 +7645,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.executeUpdate();
pstmtRplHdr.clearParameters();
}
*/
//Changed by Rohan on 28/08/12 for bug fixing.end
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
packRefId = updateWaveTaskDet(waveID,3,saleOrder,"","",ptcn,conn);
updatePacking(waveID,saleOrder,packRefId,pickRefId,xtraParams, conn); //commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
}*/
}
//updateCartonMaster(replRefDeepId, cCTR + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn);
//updateCartonMaster(replRefPNDId, cCTR + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn);
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
updateCartonMaster(pickRefId, cCTR + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn); //commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
}*/
/*if(("Y".equalsIgnoreCase(isSinglePickMasterPack)) && cCTR == 0)
}
if(("Y".equalsIgnoreCase(isSinglePickMasterPack)) && cCTR == 0)
{
pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
pstmt.setString(1,pickRefId);
......@@ -7686,7 +7686,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setDate(8,orderDate);
pstmt.setString(9,chgTerm);
pstmt.executeUpdate();
}*/
}
ArrayList tempList = (ArrayList)allMasterPackList.get(cCTR);
int tempLen = tempList.size();
......@@ -7799,14 +7799,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Picking Detail start
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]
//double grossWeight=getGrossWeight(itemCode,lotNo,conn);
//totalWeight =totalWeight + (itemGrossWeight * Double.parseDouble(noArt));
totalWeight =totalWeight + caseWeightTotal;
totalNoArt = totalNoArt + (int)(Double.parseDouble(noArt));
System.out.println("totalNoArt till counter ["+aCtr+"] "+totalNoArt);
System.out.println("totalWeight till counter ["+aCtr+"] "+totalWeight);
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]
}
int pickCtr = 0;
String isRepl="";
......@@ -7861,7 +7861,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan 0n 14-12-11 [WM1ESUN006] To add exp-lev into repl_ord_det
pstmtRplDet.setString(14,expLevel);
//Changed By Pragyan Demo4.start
/*if(pndLocListSize > 0 && aCtr < pndLocListSize)
if(pndLocListSize > 0 && aCtr < pndLocListSize)
{
pstmtRplDet.setString(15,(String)pndLocList.get(aCtr));
}
......@@ -7870,7 +7870,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVPNDLOC",conn);
return errString;
}*/
}
if(pndLoc != null && pndLoc.length() > 0)
{
pstmtRplDet.setString(15,pndLoc);
......@@ -7889,7 +7889,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setInt(13,replCtr);
//pstmtRplDet.setString(7,(String)pndLocList.get(aCtr));//Added by Ashish Sonawane on 07-Jul-12 to make PND location_from (loc_code) same as replenishment location_to (loc_code__to)
pstmtRplDet.setString(7,pndLoc);//Added by Ashish Sonawane on 07-Jul-12 to make PND location_from (loc_code) same as replenishment location_to (loc_code__to)
/*if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
if(casePickLocListSize > 0 && aCtr < casePickLocListSize)
{
pstmtRplDet.setString(15,(String)casePickLocList.get(aCtr));
}
......@@ -7898,7 +7898,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVCPKLOC",conn);
return errString;
}*/
}
if(casMpkDeepLoc != null && casMpkDeepLoc.length() > 0)
{
pstmtRplDet.setString(15,casMpkDeepLoc);
......@@ -7984,8 +7984,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//int masterPackCount = 60;
double cashCount = Double.parseDouble(noArt);
/*double masterPackWeight = 70;
double caseWeight = 22;*/
double masterPackWeight = 70;
double caseWeight = 22;
double mPackCounter = Math.floor(cashCount / masterPackCount);
double masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
double totalCaseOnPallet = masterPackCount;
......@@ -8064,7 +8064,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ctrMaster++;
}
/*if("Y".equalsIgnoreCase(isSinglePickMasterPack))
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
Added by Ashish Sonawane on 07-jul-12 for Master Pack [START]
......@@ -8092,10 +8092,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// changed by Ameya on 08-08-2012 for M-PACK End.
}
Added by Ashish Sonawane on 07-jul-12 for Master Pack [END]
}*/
}
}
/*int allActivesListLen = allActivesList.size();
int allActivesListLen = allActivesList.size();
if(allActivesListLen > 0)
{
double packSizeCase = 0;
......@@ -8715,7 +8715,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
} */
}
int allActivesListLen = allActivesList.size();
if(allActivesListLen > 0)
......@@ -8748,7 +8748,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//String replRefDeepId = "";//updateWaveTaskDet(waveID,1,saleOrder,"R-DSO","E",ptcn,conn); //Added by chandni 06-06-12
//Replanishment Hader
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setDate(2,orderDate);
pstmtRplHdr.setString(3, siteCode);
......@@ -8758,7 +8758,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(7,chgTerm);
pstmtRplHdr.setDate(8,orderDate);
pstmtRplHdr.setString(9,"E");
*/
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
pstmt.setDate( 2, orderDate );
......@@ -8892,10 +8892,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setDouble(10,Double.parseDouble(noArt));
pstmtDet.setDouble(11,avilableQty);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
pstmtDet.setString(14,acPrvReplOrder);
pstmtDet.setInt(15,Integer.parseInt(acPrvLineNo));
*/
pstmtDet.setString(14,acReplOrder);
pstmtDet.setInt(15,Integer.parseInt(replLineNo));
......@@ -8966,11 +8966,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Replanishment Hader
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
*/
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
......@@ -9016,7 +9016,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//pstmtDet.setInt(15,Integer.parseInt(acPrvLineNo));
pstmtDet.executeUpdate();
/*pstmt.setString(1,pickRefId);
pstmt.setString(1,pickRefId);
pstmt.executeUpdate();
pstmtDet.setString(1,pickRefId);
pstmtDet.setString(7,locCodeAct);
......@@ -9024,14 +9024,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setDouble(11,avilableQty);
pstmtDet.setString(14,acPrvReplOrder);
pstmtDet.setInt(15,Integer.parseInt(acPrvLineNo));
pstmtDet.executeUpdate();*/
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder, conn);
//Changed by Rohan 26/08/12 to add pick.end
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, - (packSizeCase - pendActQty) ,dReplOrder, conn);
*/
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder,cReplOrderLine, conn);
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, (packSizeCase - pendActQty) ,dReplOrder,dReplOrderLine, conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -9063,11 +9063,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
//double pendActQty = quantityToUpd - avilableCaseActQty;
/*
locCodeCase =(String) tempReplCaseList.get(0);
avilableCaseQty = (Double) tempReplCaseList.get(1);
cReplOrder =(String) tempReplCaseList.get(2);
*/
//cReplOrder = (String) tempReplCaseActList.get(1);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
......@@ -9077,12 +9077,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Replanishment Hader
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
*/
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
......@@ -9138,10 +9138,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantityToUpd) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder, conn);
*/
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantityToUpd) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder,cReplOrderLine, conn);
......@@ -9160,7 +9160,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-DSO","E",ptcn,conn); //Ad
//String replRefPNDId = updateWaveTaskDet(waveID,1,saleOrder,"R-PSO","N",ptcn,conn);
String replRefPNDId = updateWaveTaskDet(waveID,1,saleOrder,"R-PND","N",ptcn,conn);
......@@ -9170,7 +9170,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(1,replRefPNDId);
pstmtRplHdr.setString(9,"I");
pstmtRplHdr.executeUpdate();
*/
if(!isReplHdr)
{
......@@ -9179,11 +9179,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"E");
pstmtRplHdr.executeUpdate();
/*
pstmtRplHdr.setString(1,replRefPNDId);
pstmtRplHdr.setString(9,"I");
pstmtRplHdr.executeUpdate();
*/
isReplHdr = true;
replOrdCpy = replRefDeepId;
//replPndCpy = replRefPNDId;
......@@ -9252,11 +9252,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
/*else
else
{
updateReplOrdDet( "Q",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty, conn);
}*/
}
}
else
......@@ -9306,9 +9306,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String pickLineNoDsa = (String) tempCaseReplList.get(5);
//Changed by Rohan on 12-09-12 to add pick order as reference of depended Replanishment.end
String pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
/*pstmt.setString(1,pickRefId);
pstmt.setString(1,pickRefId);
pstmt.executeUpdate();
pstmtDet.setString(1,pickRefId);*/
pstmtDet.setString(1,pickRefId);
if(quantity >= avilableCaseActQty)
{
......@@ -9327,10 +9327,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, 0.0,sReplOrder, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder, conn);
*/
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct, 0.0,sReplOrder,replLineNoDsa, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder,replLineNo, conn);
......@@ -9344,11 +9344,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
//replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-DSA","C",ptcn,conn);
/*
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
*/
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","C",ptcn,conn);
......@@ -9404,10 +9404,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setInt(15,replCnt);
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - pendActQty) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - pendActQty - avilableCaseActQty) ,lloReplOrder, conn);
*/
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - pendActQty) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - pendActQty - avilableCaseActQty) ,lloReplOrder,replLineNo, conn);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.end
......@@ -9432,10 +9432,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setInt(15,Integer.parseInt(replLineNoDsa));
pstmtDet.executeUpdate();
////Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct,pendActQty,sReplOrder, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder, conn);
*/
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct,pendActQty,sReplOrder,replLineNoDsa, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder,replLineNo, conn);
......@@ -9447,12 +9447,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-DSA","C",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
*/
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","C",ptcn,conn);
......@@ -9508,10 +9508,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setInt(15,replCnt);
pstmtDet.executeUpdate();
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantity) ,replRefDeepId, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder, conn);
*/
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantity) ,replRefDeepId,String.valueOf(replCnt), conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder,replLineNo, conn);
......@@ -9525,7 +9525,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
/*
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-DSO","E",ptcn,conn); //Added by chandni 06-06-12
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.executeUpdate();
......@@ -9533,7 +9533,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(9,"I");
pstmtRplHdr.executeUpdate();
String replRefPNDId = updateWaveTaskDet(waveID,1,saleOrder,"R-PND","N",ptcn,conn);
*/
//String replRefPNDId = updateWaveTaskDet(waveID,1,saleOrder,"R-PSO","N",ptcn,conn);
//String replRefPNDId = "";
if(!isReplHdr)
......@@ -9543,11 +9543,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"E");
pstmtRplHdr.executeUpdate();
/*
pstmtRplHdr.setString(1,replRefPNDId);
pstmtRplHdr.setString(9,"I");
pstmtRplHdr.executeUpdate();
*/
isReplHdr = true;
replOrdCpy = replRefDeepId;
//replPndCpy = replRefPNDId;
......@@ -9735,12 +9735,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn
//String chgPtcn = ptcn;
double ctrMaster = 0.0;
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [START]
double totalWeight =0.0;
int totalNoArt=0;
int cntSingleMasterPick=0;
String packRefId="",pickRefId="";
/*Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END] */
Added By Ashish Sonawane on 07-Jul-12 for master pack generation logic on weight or no of cases [END]
//Changed by Ameya 07-08-2012 for A-ORD Start.
double caseWeight=0.0;
double caseVolume=0.0;
......@@ -9752,14 +9752,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn.start
//Check Whether the Master Pack Per Order Exceeding The Truck Load.start
/*if(masterPackCountPerOrder > 0.0 && ctrMaster == masterPackCountPerOrder)
if(masterPackCountPerOrder > 0.0 && ctrMaster == masterPackCountPerOrder)
{
chgPtcn = getTranId( "w_ptcn", conn );
String dspRefId = updateWaveTaskDet(waveID,4,saleOrder,chgPtcn,conn);
updateShipment(headerDom, detailDom,waveID,saleOrder,dspRefId, xtraParams, conn);
ctrMaster = 0.0;
}
*/
//Check Whether the Master Pack Per Order Exceeding The Truck Load.end
//Changed by Rohan on 12-03-12 To remove logic of generate new ptcn.end
......@@ -9810,10 +9810,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ArrayList tempMastList = (ArrayList)allMasterPackList.get(Ctr);
int tempMastLen = tempMastList.size();
System.out.println("SIZE OF ALL MASTER SUB CASES["+tempMastLen+"]OUTER Ctr["+Ctr);
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
updateCartonMaster(pickRefId, 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn);//commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
}*/
}
for(int aCtr = 0;aCtr < tempMastLen;aCtr++)
{
Map tempMap = (HashMap)tempMastList.get(aCtr);
......@@ -9836,14 +9836,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [START]
//double grossWeight=getGrossWeight(itemCode,lotNo,conn);
//totalWeight =totalWeight + (itemGrossWeight * Double.parseDouble(noArt));
totalWeight =totalWeight + caseWeightTotal;
totalNoArt= totalNoArt + (int)(Double.parseDouble(noArt));
System.out.println("totalNoArt till counter ["+aCtr+"] "+totalNoArt);
System.out.println("totalWeight till counter ["+aCtr+"] "+totalWeight);
/*Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]*/
Added by Ashish Sonawane on 07-jul-12 for getting total weight and no of art [END]
}
......@@ -9883,8 +9883,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
//int masterPackCount = 60;
double cashCount = Double.parseDouble(noArt);
/*double masterPackWeight = 70;
double caseWeight = 22;*/
double masterPackWeight = 70;
double caseWeight = 22;
double mPackCounter = Math.floor(cashCount / masterPackCount);
double masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
double totalCaseOnPallet = masterPackCount;
......@@ -9954,19 +9954,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
/*if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
if(!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
{
//updateCartonMaster(pickRefId, 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn);//commented by Ashish Sonawane on 07-jul-12 as per monoharan sir for master pack logic
updateCartonMaster(pickRefId, 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn,caseWeightTotal,caseVolumeTotal,pickType);
System.out.println("updateCartonMaster M-PICK 7");
}*/
}
//changed by Ameya on 09-08-2012 for M-PACK End.
ctrMaster++;
}
/*if("Y".equalsIgnoreCase(isSinglePickMasterPack))
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
Added by Ashish Sonawane on 07-jul-12 for Master Pack [START]
System.out.println("totalWeight final :["+totalWeight+"]");
......@@ -9997,7 +9997,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Ameya on 08-08-2012 for M-PACK End.
}
Added by Ashish Sonawane on 07-jul-12 for Master Pack [END]
}*/
}
}
//End Master Pack
......@@ -10017,7 +10017,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Chnaged by rohan on 13-09-12
int replCtr = 1;
//Changed by Rohan on 30-08-12 for bug fixing.start
/*
if(pstmtDet != null)
{
pstmtDet.close();
......@@ -10028,7 +10028,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
"ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL, NO_ART, QUANTITY,EXP_LEV,LOC_CODE__TO,REPL_ORDER,LINE_NO__REPL) " +
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtDet = conn.prepareStatement(sqlPstmtPick);
*/
//Changed by Rohan on 30-08-12 for bug fixing.end
//Change by Rohan on 11/08/12 to define variables.end
......@@ -10096,7 +10096,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
packSizeCase = (Double)tempMap.get("pack_size");
//Changed by Rohan on 11/08/12 if stock is not in active location.start
/*
pstmtDet.setString(1,pickRefId);
pstmtDet.setInt(2,aCtr + 1);
pstmtDet.setString(3,saleOrder);
......@@ -10113,11 +10113,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(13,docLoc);
pstmtDet.executeUpdate();
pstmtDet.clearParameters();
*/
locZonePref = Integer.parseInt(String.valueOf(tempMap.get("loc_zone_pref")));
String actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
/*sqlLocInv = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
sqlLocInv = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
pstmtLoc = conn.prepareStatement(sqlLocInv);
pstmtLoc.setString(1, locCode);
......@@ -10136,7 +10136,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
rsLoc.close();
rsLoc = null;
}*/
}
String replQuantityID = checkForReplenishment(itemCode, siteCode, lotNo, lotSl, locCode, quantity, 2, conn);
double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
System.out.println("CURRENTLY STOCK QTY >>>>>>>>>>>>>>>>>>>>["+stkQty+"]<<<<<<<<<<<<<<");
......@@ -10331,7 +10331,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return errString;
}
//Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table end.
//$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-PICKING LOGIC CHANGE.START
*/ //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$-PICKING LOGIC CHANGE.START
private String updatePickOrdPartII(Document headerDom, Document detailDom,String waveID,String siteCode,String saleOrder, String xtraParams, ArrayList dataList,String ptcn,HashMap transportInfoMap,double totActVolume,double totActWeight, Connection conn )throws Exception
{
String errString = "";
......@@ -10348,6 +10348,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String invStat = "";
String invReserve = "";
String invDeepReserve = "";
String invPndReserve = "";
int locZonePref = 0;
double casePackSize = 0.0;
double itemGrossWeight=0.0 ;
......@@ -10421,7 +10422,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
activePickInv = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
invReserve = discommon.getDisparams("999999","RESERV_LOCATION",conn);
invDeepReserve = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
invPndReserve = discommon.getDisparams("999999","PND_INVSTAT",conn);
partialResrvLoc = discommon.getDisparams("999999","PRSRV_INVSTAT",conn);
//The Dimension of pallet are 60*48*40 inches H*L*W = 115200
palletVolume = Double.parseDouble(discommon.getDisparams("999999","PER_PALLET__VOLUME",conn));
palletMaxWeight = Double.parseDouble(discommon.getDisparams("999999","PER_PALLET__WEIGHT",conn));
......@@ -12273,8 +12276,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ArrayList tempCaseReplList = new ArrayList();
if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve))
{
tempReplList = getActiveCaseReplMap("I",activePickInv, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
tempCaseReplList = getActiveCaseReplMap("",casePickInv, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
tempReplList = getActiveCaseReplMap("I",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
tempCaseReplList = getActiveCaseReplMap("",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
}
if(tempReplList.size() > 0)
......@@ -12322,7 +12325,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(quantityToUpd > 0)
{
ArrayList tempReplCaseList = getActiveCaseReplMap("",casePickInv, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
ArrayList tempReplCaseList = getActiveCaseReplMap("",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
if(tempReplCaseList.size() > 0)
{
......@@ -12332,7 +12335,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String cReplOrderLine =(String) tempReplCaseList.get(3);
String cPReplOrder =(String) tempReplCaseList.get(4);
String cPReplOrderLine =(String) tempReplCaseList.get(5);
ArrayList tempReplCaseActList = getActiveCaseReplMap("Q",activePickInv, itemCode, siteCode, locCodeCase, lotNo, lotSl, quantity, conn);
ArrayList tempReplCaseActList = getActiveCaseReplMap("Q",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCodeCase, lotNo, lotSl, quantity, conn);
if(tempReplCaseActList.size() > 0)
{
......@@ -12794,7 +12797,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String pickLineNo = (String) tempCaseReplList.get(5);
//Chnaged by Rohan on to pick order from list.end
ArrayList tempReplCaseActList = getActiveCaseReplMap("Q",activePickInv, itemCode, siteCode, locCodeCase, lotNo, lotSl, quantity, conn);
ArrayList tempReplCaseActList = getActiveCaseReplMap("Q",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCodeCase, lotNo, lotSl, quantity, conn);
System.out.println("Current size activity repl exist ["+tempReplCaseActList.size()+"]");
if(tempReplCaseActList.size() > 0)
{
String locCodeCaseAct =(String) tempReplCaseActList.get(0);
......@@ -12951,6 +12955,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
else
{
System.out.println("in replenishment block");
if(!isReplHdr)
{
......@@ -19002,7 +19007,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return errString;
}
//Changed by sumit on 23/08/12n update wave_status as per their sequence of task end.
public ArrayList getActiveCaseReplMap(String replType ,String invStat,String itemCode,String siteCode,String locCode,String lotNo,String lotSl,double reqQuantity,Connection conn) throws Exception
public ArrayList getActiveCaseReplMap(String replType ,String locInvstat,String pndInvstat,String deepStoreInvstat,String reserveInvstat,String itemCode,String siteCode,String locCode,String lotNo,String lotSl,double reqQuantity,Connection conn) throws Exception
{
PreparedStatement pstmt = null;
......@@ -19020,7 +19025,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
try
{
if(replType == "")
{
sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
......@@ -19034,7 +19039,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L WHERE R.REPL_ORDER = ? AND R.LINE_NO = ?";
sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L WHERE R.PICK_ORDER = ? AND R.LINE_NO__PICK = ?";
/*else if(replType.equalsIgnoreCase("I"))
{
......@@ -19055,6 +19060,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("case1");
replOrder = checkNull(rs.getString("REPL_ORDER"));
replLineNo = checkNull(rs.getString("LINE_NO"));
pickOrder = checkNull(rs.getString("PICK_ORDER"));
......@@ -19075,28 +19081,39 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//if((replType.equalsIgnoreCase("I") || replType == "") && ( pickOrder != null && pickOrder.length() > 0))
if((replType.equalsIgnoreCase("I") || replType == ""))
if(replType.equalsIgnoreCase("I") || locInvstat.equalsIgnoreCase(deepStoreInvstat))
{
pstmt = conn.prepareStatement(sqlPnd);
pstmt.setString(1, replOrder);
pstmt.setString(2, replLineNo);
rs = pstmt.executeQuery();
if(replType == "")
if(replType == "I")
{
sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L WHERE R.PICK_ORDER = ? AND L.LOC_CODE = R.LOC_CODE AND R.LINE_NO__PICK = ?";
System.out.println("case2");
pstmt = conn.prepareStatement(sqlPnd);
pstmt.setString(1, replOrder);
pstmt.setString(2, replLineNo);
rs = pstmt.executeQuery();
if(rs.next())
{
//replOrder = checkNull(rs.getString("REPL_ORDER"));
//replLineNo = checkNull(rs.getString("LINE_NO"));
//pickOrder = checkNull(rs.getString("PICK_ORDER"));
//lineNoPick = checkNull(rs.getString("LINE_NO__PICK"));
replOrder = checkNull(rs.getString("REPL_ORDER"));
replLineNo = checkNull(rs.getString("LINE_NO"));
pickOrder = checkNull(rs.getString("PICK_ORDER"));
lineNoPick = checkNull(rs.getString("LINE_NO__PICK"));
LocCodeTo = checkNull(rs.getString("LOC_CODE__TO"));
}
}
else
{
sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L " +
" WHERE R.PICK_ORDER = ? AND R.LINE_NO__PICK = ? AND L.LOC_CODE = R.LOC_CODE AND L.INV_STAT = ?";
System.out.println("case2");
pstmt = conn.prepareStatement(sqlPnd);
pstmt.setString(1, replOrder);
pstmt.setString(2, replLineNo);
pstmt.setString(3, pndInvstat);
rs = pstmt.executeQuery();
if(rs.next())
{
replOrder = checkNull(rs.getString("REPL_ORDER"));
......@@ -19124,6 +19141,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(LocCodeTo != null && LocCodeTo.length() > 0)
{
System.out.println("case3");
tempList.add(LocCodeTo);
tempList.add(actuaQty);
tempList.add(replOrder);
......
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