Skip to content

B
business-java
Commit b4c9b45e 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@91981 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6e101ba9
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 11 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ b4c9b45e
...@@ -10439,11 +10439,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10439,11 +10439,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(Double.parseDouble(itmWeightVol[0]) != 0.0) if(Double.parseDouble(itmWeightVol[0]) != 0.0)
{ {
packetMaxVolumeActive = Double.parseDouble(itmWeightVol[0]); packetMaxWeightActive = Double.parseDouble(itmWeightVol[0]);
} }
if(Double.parseDouble(itmWeightVol[1]) != 0.0) if(Double.parseDouble(itmWeightVol[1]) != 0.0)
{ {
packetMaxWeightActive = Double.parseDouble(itmWeightVol[1]); packetMaxVolumeActive = Double.parseDouble(itmWeightVol[1]);
} }
} }
...@@ -11229,11 +11229,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11229,11 +11229,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME"); double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME");
double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT"); double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT");
System.out.println("ON ACTIVE CURRENT VOLUME ACTIVE ["+currentvolumeActive+"]");
System.out.println("ON ACTIVE lastPackVolume ["+lastPackVolume+"]");
System.out.println("ON ACTIVE lastPackWeight ["+lastPackWeight+"]");
if(lastPackVolume < packetMaxVolumeActive && lastPackWeight < packetMaxWeightActive) if(lastPackVolume < packetMaxVolumeActive && lastPackWeight < packetMaxWeightActive)
{ {
double remainingVolume = packetMaxVolumeActive - lastPackVolume; double remainingVolume = packetMaxVolumeActive - lastPackVolume;
System.out.println("ON ACTIVE remainingVolume ["+remainingVolume+"]");
if(remainingVolume >= perItemVolume) if(remainingVolume >= perItemVolume)
{ {
...@@ -11252,6 +11258,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11252,6 +11258,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
else else
{ {
double requiredQuantityToStore = Math.floor(remainingVolume / perItemVolume); double requiredQuantityToStore = Math.floor(remainingVolume / perItemVolume);
System.out.println("ON ACTIVE requiredQuantityToStore ["+requiredQuantityToStore+"]");
HashMap activeTempMap = (HashMap)dataMap.clone(); HashMap activeTempMap = (HashMap)dataMap.clone();
activeTempMap.put("no_art", "1"); activeTempMap.put("no_art", "1");
activeTempMap.put("alloc_qty", requiredQuantityToStore); activeTempMap.put("alloc_qty", requiredQuantityToStore);
...@@ -11260,13 +11267,26 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11260,13 +11267,26 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
activeTempPickList.add(activeTempMap); activeTempPickList.add(activeTempMap);
lastPackVolume = lastPackVolume + remainingVolume; lastPackVolume = lastPackVolume + remainingVolume;
double reqVolumeToStore = currentvolumeActive - remainingVolume; double reqVolumeToStore = currentvolumeActive - (requiredQuantityToStore * perItemVolume);
System.out.println("ON ACTIVE reqVolumeToStore ["+reqVolumeToStore+"]");
double remain_quantity = Math.floor(reqVolumeToStore/perItemVolume); double remain_quantity = Math.floor(reqVolumeToStore/perItemVolume);
System.out.println("ON ACTIVE remain_quantity ["+remain_quantity+"]");
activeTempPickList = new ArrayList(); activeTempPickList = new ArrayList();
HashMap activeTempMap1 = (HashMap)dataMap.clone(); HashMap activeTempMap1 = (HashMap)dataMap.clone();
activeTempMap1.put("no_art", "1"); activeTempMap1.put("no_art", "1");
activeTempMap1.put("alloc_qty", remain_quantity); activeTempMap1.put("alloc_qty", remain_quantity);
//activeTempMap1.put("LAST_PACK_VOLUME", reqVolumeToStore);
if((reqVolumeToStore + lastPackVolume) > packetMaxVolumeActive)
{
activeTempMap1.put("LAST_PACK_VOLUME", reqVolumeToStore); activeTempMap1.put("LAST_PACK_VOLUME", reqVolumeToStore);
System.out.println("ON ACTIVE After storing 2nd Last Pack Volume Volume ["+reqVolumeToStore+"]");
}
else
{
activeTempMap1.put("LAST_PACK_VOLUME", reqVolumeToStore + lastPackVolume);
System.out.println("ON ACTIVE After storing 2nd Last Pack Volume Volume ["+reqVolumeToStore + lastPackVolume+"]");
}
activeTempMap1.put("LAST_PACK_WEIGHT", remain_quantity * itemWeight); activeTempMap1.put("LAST_PACK_WEIGHT", remain_quantity * itemWeight);
activeTempPickList.add(activeTempMap1); activeTempPickList.add(activeTempMap1);
allActivesList.add(activeTempPickList); allActivesList.add(activeTempPickList);
...@@ -11314,6 +11334,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11314,6 +11334,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
volumeRmaining = volumeRmaining - totQtyPerPallet * perItemVolume; volumeRmaining = volumeRmaining - totQtyPerPallet * perItemVolume;
System.out.println("ON ACTIVE volumeRmaining ["+volumeRmaining+"]totQtyPerPallet"+totQtyPerPallet);
if(totQtyPerPallet < Math.floor((volumeRmaining/perItemVolume))) if(totQtyPerPallet < Math.floor((volumeRmaining/perItemVolume)))
{ {
} }
...@@ -12425,7 +12446,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12425,7 +12446,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(14,acPrvReplOrder); pstmtDet.setString(14,acPrvReplOrder);
pstmtDet.setInt(15,Integer.parseInt(acPrvLineNo)); pstmtDet.setInt(15,Integer.parseInt(acPrvLineNo));
pstmtDet.executeUpdate(); pstmtDet.executeUpdate();
itemVolumeTotal = itemWeightTotal + quantityToUpd*itemVolume; itemVolumeTotal = itemVolumeTotal + quantityToUpd*itemVolume;
itemWeightTotal = itemWeightTotal + quantityToUpd*itemWeight; itemWeightTotal = itemWeightTotal + quantityToUpd*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType); //updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
} }
...@@ -12494,7 +12515,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12494,7 +12515,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,actPkDeepLoc, (packSizeCase - quantityToUpd) ,replRefDeepId,String.valueOf(replCnt), 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); updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - packSizeCase - quantityToUpd) ,cReplOrder,cReplOrderLine, conn);
itemVolumeTotal = itemWeightTotal + quantityToUpd*itemVolume; itemVolumeTotal = itemVolumeTotal + quantityToUpd*itemVolume;
itemWeightTotal = itemWeightTotal + quantityToUpd*itemWeight; itemWeightTotal = itemWeightTotal + quantityToUpd*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType); //updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
...@@ -12756,7 +12777,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12756,7 +12777,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header //Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
//updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acReplOrder, conn); //updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acReplOrder, conn);
updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acPrvReplOrder,acPrvLineNo, conn); updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acPrvReplOrder,acPrvLineNo, conn);
itemVolumeTotal = itemWeightTotal + quantity*itemVolume; itemVolumeTotal = itemVolumeTotal + quantity*itemVolume;
itemWeightTotal = itemWeightTotal + quantity*itemWeight; itemWeightTotal = itemWeightTotal + quantity*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType); //updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
} }
...@@ -12816,7 +12837,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12816,7 +12837,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder,replLineNo, conn); //updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - avilableCaseActQty) ,lloReplOrder,replLineNo, conn);
updateReplenishmentRecord(itemCode, siteCode, lotNo, lotSl, locCode, avilableCaseActQty, lloReplOrder,"",9999, 2,casePackSize,false, conn); updateReplenishmentRecord(itemCode, siteCode, lotNo, lotSl, locCode, avilableCaseActQty, lloReplOrder,"",9999, 2,casePackSize,false, conn);
itemVolumeTotal = itemWeightTotal + avilableCaseActQty*itemVolume; itemVolumeTotal = itemVolumeTotal + avilableCaseActQty*itemVolume;
itemWeightTotal = itemWeightTotal + avilableCaseActQty*itemWeight; itemWeightTotal = itemWeightTotal + avilableCaseActQty*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType); //updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
//Insert avilableQty into Pick Ord hdr and Det.end //Insert avilableQty into Pick Ord hdr and Det.end
...@@ -12923,7 +12944,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12923,7 +12944,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
updateReplOrdDet( "Q",itemCode, siteCode, locCodeCase, lotNo, lotSl,locCodeCaseAct,pendActQty,sReplOrder,replLineNoDsa, 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); //updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,actPkDeepLoc, (avilableCaseQty - quantity) ,lloReplOrder,replLineNo, conn);
updateReplenishmentRecord(itemCode, siteCode, lotNo, lotSl, locCode, quantity, lloReplOrder,"",9999, 2,casePackSize,false, conn); updateReplenishmentRecord(itemCode, siteCode, lotNo, lotSl, locCode, quantity, lloReplOrder,"",9999, 2,casePackSize,false, conn);
itemVolumeTotal =itemWeightTotal + quantity*itemVolume; itemVolumeTotal =itemVolumeTotal + quantity*itemVolume;
itemWeightTotal = itemWeightTotal + quantity*itemWeight; itemWeightTotal = itemWeightTotal + quantity*itemWeight;
//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType); //updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
} }
...@@ -13243,6 +13264,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -13243,6 +13264,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
//////////////////////To add Carton no generation for Actives Hear/////////////////////////////////////// //////////////////////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); updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"A-PICK", xtraParams, conn,itemWeightTotal,itemVolumeTotal,pickType);
} }
......
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