Skip to content

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

wave gen bug 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92246 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cc1ffe4d
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 43 deletions
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 278abb11
......@@ -2879,7 +2879,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
System.out.println("xtraParams=["+xtraParams+"]");
String objNameChk = "";
DistCommon distComm = new DistCommon();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -2920,12 +2920,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.start
String loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ));
System.out.println("MAP_USER_STR_VAL----["+MAP_USER_STR_VAL.toString()+"]");
System.out.println("MAP_USER_STR_VAL----["+USER_DEFINED_VALUE_MAP.toString()+"]");
if(MAP_USER_STR_VAL.containsKey(loginCode))
if(USER_DEFINED_VALUE_MAP.containsKey(loginCode))
{
System.out.println("MAP_USER_STR_VAL---- Inside["+MAP_USER_STR_VAL.toString()+"]");
replOrderChkInv = (String)MAP_USER_STR_VAL.get(loginCode);
System.out.println("USER_DEFINED_VALUE_MAP---- Inside["+USER_DEFINED_VALUE_MAP.toString()+"]");
replOrderChkInv = (String)USER_DEFINED_VALUE_MAP.get(loginCode);
objNameChk = getObjNameFromDom(currFormDataDom, "objName", objContext);
System.out.println("objNameChk["+objNameChk+"]");
System.out.println("replOrderChkInv["+replOrderChkInv+"]");
......@@ -2965,6 +2965,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
pstmt.close();
pstmt = null;
}
if(replOrderChk == null || replOrderChk.length() <= 0)
{
System.out.println("RETURNING MESSAGES AND REMOVE THE KEY FOR THAT USER["+loginCode+"]");
USER_DEFINED_VALUE_MAP.remove(loginCode);
//Changed By Pragyan To send the Fatal Error.
//return itmDBAccessEJB.getErrorString("","RECONEXIST","","",conn);
}
valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
}
//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.end
......@@ -3110,23 +3117,23 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.start
if("H".equalsIgnoreCase(orderType) || "E".equalsIgnoreCase(orderType) || "F".equalsIgnoreCase(orderType) || "G".equalsIgnoreCase(orderType))
{
MAP_USER_STR_VAL.put(loginCode, invDeepReserve);
System.out.println("MAP_USER_STR_VAL----set 1loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
USER_DEFINED_VALUE_MAP.put(loginCode, invDeepReserve);
System.out.println("USER_DEFINED_VALUE_MAP----set 1loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
}
else if("L".equalsIgnoreCase(orderType) || "N".equalsIgnoreCase(orderType) || "J".equalsIgnoreCase(orderType) || "K".equalsIgnoreCase(orderType))
{
MAP_USER_STR_VAL.put(loginCode, invPndReserve);
System.out.println("MAP_USER_STR_VAL----set 2loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
USER_DEFINED_VALUE_MAP.put(loginCode, invPndReserve);
System.out.println("USER_DEFINED_VALUE_MAP----set 2loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
}
else if("D".equalsIgnoreCase(orderType) || "C".equalsIgnoreCase(orderType) || "M".equalsIgnoreCase(orderType) || "Q".equalsIgnoreCase(orderType))
{
MAP_USER_STR_VAL.put(loginCode, invReserve);
System.out.println("MAP_USER_STR_VAL----set 3loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
USER_DEFINED_VALUE_MAP.put(loginCode, invReserve);
System.out.println("USER_DEFINED_VALUE_MAP----set 3loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
}
else if("T".equalsIgnoreCase(orderType))
{
MAP_USER_STR_VAL.put(loginCode, partialResrvLoc);
System.out.println("MAP_USER_STR_VAL----set 4loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
USER_DEFINED_VALUE_MAP.put(loginCode, partialResrvLoc);
System.out.println("USER_DEFINED_VALUE_MAP----set 4loginCode["+loginCode+"]invDeepReserve"+invDeepReserve);
}
//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.end
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 278abb11
......@@ -10605,8 +10605,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String mPackAllow = "";
String aPickAllow = "";
String stockToDoc = "";
//Changed by Rohan on 24-11-12 for define variable
int cartonCount = 0;
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
/*replCnt = 1;
isReplHdr = false;
......@@ -10647,8 +10646,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
masterPackWeight = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT",conn));
masterPackWeightPerOrder = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT_PER_ORDER",conn));
isSinglePickMasterPack = discommon.getDisparams("999999","MASTER_PACK_SINGLE_PICK",conn);
//Changed by Rohan on 24-11-12 to get variable from disparam for active pick case count
String actPkCnt = discommon.getDisparams("999999","ACTIVE_PICK_CASE_COUNT",conn);
mPackAllow = genericUtility.getColumnValue("master_pack_allow",detailDom);
mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N";
......@@ -11815,7 +11812,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 9/03/12 to get case packet,volume,wegiht.end
double quantityPerPallet = Math.floor( (quantity * perItemVolume)/packetMaxVolumeActive);
System.out.println("quantityPerPallet::::::"+quantityPerPallet);
double totQtyPerPallet = Math.floor(packetMaxVolumeActive/perItemVolume);
double renCtr = 0;
double volumeRmaining = Math.floor(perItemVolume * quantity);
......@@ -11830,7 +11826,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
quantityPerPallet = quantityPerPallet + 1;
}
System.out.println("activeCount"+activeCount+"quantityPerPallet"+quantityPerPallet);
do
{
......@@ -12373,8 +12369,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else
{
if(invStat.equalsIgnoreCase(invDeepReserve))
{
if("0".equalsIgnoreCase(prvPickOrd))
{
pstmtDet.setString(14, "");
}
else
{
pstmtDet.setString(14, prvPickOrd);
}
pstmtDet.setInt(15, prvPickLineNo);
}
else
......@@ -12673,6 +12677,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(13,docLoc);
if("Y".equalsIgnoreCase(isRepl))
{
if(invStat.equalsIgnoreCase(invDeepReserve))
{
pstmtDet.setString(14, replRefPNDId);
......@@ -12683,10 +12688,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(14, replRefDeepId);
pstmtDet.setInt(15, replCtr);
}
}
else
{
if("0".equalsIgnoreCase(prvPickOrd))
{
pstmtDet.setString(14, "");
}
else
{
pstmtDet.setString(14, prvPickOrd);
}
pstmtDet.setInt(15, prvPickLineNo);
}
pstmtDet.executeUpdate();
......@@ -12881,10 +12895,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//String replRefId ="";
String replRefDeepId = "";
String replRefPndId ="";
//Changed by Rohan on 24-11-12 to get variable from disparam for active pick case count.start
//casePickLoc = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
cartonCount = 0;
//Changed by Rohan on 24-11-12 to get variable from disparam for active pick case count.end
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setDate(2,orderDate);
pstmtRplHdr.setString(3, siteCode);
......@@ -14025,17 +14036,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//////////////////////To add Carton no generation for Actives Hear///////////////////////////////////////
System.out.println("Finally ["+itemWeightTotal+"]Finally itemVolumeTotal["+itemVolumeTotal+"]");
updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.start
cartonCount++;
System.out.println("cartonCount:::"+cartonCount+"Active pick case count::"+Integer.parseInt(actPkCnt));
if(cartonCount == Integer.parseInt(actPkCnt))
{
System.out.println("Creating new pick header");
isActivePickHdr = false;
cartonCount = 0;
pickCtr = 1;
}
//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.end
}
}
......@@ -18894,14 +18894,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit on 03/10/12 commented as printer entered inputed .
//String printerStr = discommon.getDisparams("999999","WAVE_PRINTER",conn);
String reportObjName = discommon.getDisparams("999999","WAVE_REP_OBJ_NAME",conn);
//Changed by sumit on 26/11/12 report will save in final report folder start.
//String reportSavetype = discommon.getDisparams("999999","REPORT_SAVE_TYPE",conn);
/*if( reportSavetype == null || reportSavetype.trim().length() == 0 )
String reportSavetype = discommon.getDisparams("999999","REPORT_SAVE_TYPE",conn);
if( reportSavetype == null || reportSavetype.trim().length() == 0 )
{
reportSavetype = "NATIVE";
}*/
//Changed by sumit on 26/11/12 report will save in final report folder start.
String reportSavetype = "PDF";
}
System.out.println("Printer *->["+printer.trim()+"] report_obj_name ["+reportObjName+"] reportSavetype ->["+reportSavetype+"]");
/*for (int i=0; i< ptcnList.size(); i++)
......
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