Skip to content

B
business-java
Commit 5b4a4ad0 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@91995 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4a17bb4f
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 16 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 5b4a4ad0
...@@ -11657,8 +11657,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11657,8 +11657,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(9,lotSl); pstmtRplDet.setString(9,lotSl);
pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase)); pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase));
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));//Changes Done By Ashish pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));//Changes Done By Ashish
pstmtRplDet.setString(12,replRefPNDId); /*pstmtRplDet.setString(12,replRefPNDId);
pstmtRplDet.setInt(13,replCtr); pstmtRplDet.setInt(13,replCtr);*/
pstmtRplDet.setString(12,"");
pstmtRplDet.setInt(13,0);
pstmtRplDet.setString(14,expLevel); pstmtRplDet.setString(14,expLevel);
if(invStat.equalsIgnoreCase(invDeepReserve)) if(invStat.equalsIgnoreCase(invDeepReserve))
{ {
...@@ -11961,8 +11963,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11961,8 +11963,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(9,lotSl); pstmtRplDet.setString(9,lotSl);
pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase)); pstmtRplDet.setDouble(10,( Double.parseDouble(replQuantity)/packSizeCase));
pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity)); pstmtRplDet.setDouble(11, Double.parseDouble(replQuantity));
pstmtRplDet.setString(12,replRefPNDId); /*pstmtRplDet.setString(12,replRefPNDId);
pstmtRplDet.setInt(13,replCtr); pstmtRplDet.setInt(13,replCtr);*/
pstmtRplDet.setString(12,"");
pstmtRplDet.setInt(13,0);
pstmtRplDet.setString(14,expLevel); pstmtRplDet.setString(14,expLevel);
if(invStat.equalsIgnoreCase(invDeepReserve)) if(invStat.equalsIgnoreCase(invDeepReserve))
{ {
...@@ -12274,7 +12278,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12274,7 +12278,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ArrayList tempReplList = new ArrayList(); ArrayList tempReplList = new ArrayList();
ArrayList tempCaseReplList = new ArrayList(); ArrayList tempCaseReplList = new ArrayList();
if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve)) //if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve))
if(!locInvStat.equalsIgnoreCase(activePickInv))
{ {
tempReplList = getActiveCaseReplMap("I",locInvStat,invPndReserve,invDeepReserve,invReserve, 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); tempCaseReplList = getActiveCaseReplMap("",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
...@@ -12316,7 +12321,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12316,7 +12321,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate(); pstmtDet.executeUpdate();
//updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct,0.0,acReplOrder,replLineNo, conn); //updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct,0.0,acReplOrder,replLineNo, conn);
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct,0.0,acPrvReplOrder,acPrvLineNo, conn); if(locInvStat.equalsIgnoreCase(invDeepReserve))
{
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct,0.0,acPrvReplOrder,acPrvLineNo, conn);
}
else
{
updateReplOrdDet( "",itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct,0.0,acReplOrder,replLineNo, conn);
}
itemVolumeTotal = itemVolumeTotal + avilableQty*itemVolume; itemVolumeTotal = itemVolumeTotal + avilableQty*itemVolume;
itemWeightTotal = itemWeightTotal + avilableQty*itemWeight; itemWeightTotal = itemWeightTotal + avilableQty*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);
...@@ -12382,7 +12394,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12382,7 +12394,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
if(!isReplHdr) if(!isReplHdr)
{ {
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn); replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId); pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q"); pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate(); pstmtRplHdr.executeUpdate();
...@@ -12779,7 +12791,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12779,7 +12791,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.executeUpdate(); pstmtDet.executeUpdate();
//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); if(locInvStat.equalsIgnoreCase(invDeepReserve))
{
updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acPrvReplOrder,acPrvLineNo, conn);
}
else
{
updateReplOrdDet("I", itemCode, siteCode, locCode, lotNo, lotSl,locCodeAct, avilableQty - quantity,acReplOrder,replLineNo, conn);
}
itemVolumeTotal = itemVolumeTotal + 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);
...@@ -12870,8 +12889,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12870,8 +12889,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(7,locCodeCase); pstmtRplDet.setString(7,locCodeCase);
//Changed by Rohan on 12-09-12 to add pick order as reference of depended Replanishment //Changed by Rohan on 12-09-12 to add pick order as reference of depended Replanishment
//pstmtRplDet.setString(12,pickRefId); //pstmtRplDet.setString(12,pickRefId);
pstmtRplDet.setString(12,sReplOrder); /*pstmtRplDet.setString(12,sReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(replLineNoDsa)); pstmtRplDet.setInt(13,Integer.parseInt(replLineNoDsa));*/
pstmtRplDet.setString(12,lloReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(replLineNo));
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl); actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0) if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{ {
...@@ -12982,16 +13003,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12982,16 +13003,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(7,locCodeCase); pstmtRplDet.setString(7,locCodeCase);
//Changed by Rohan on 11-09-12 to add pick order reference //Changed by Rohan on 11-09-12 to add pick order reference
//pstmtRplDet.setString(12,pickRefId); //pstmtRplDet.setString(12,pickRefId);
if(locInvStat.equalsIgnoreCase(invDeepReserve)) /*if(locInvStat.equalsIgnoreCase(invDeepReserve))
{
pstmtRplDet.setString(12,prvpickOrder);
pstmtRplDet.setInt(13,Integer.parseInt(pickLineNo));
}
else
{ {
pstmtRplDet.setString(12,lloReplOrder); pstmtRplDet.setString(12,lloReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(replLineNo)); pstmtRplDet.setInt(13,Integer.parseInt(replLineNo));
} }
else
{
pstmtRplDet.setString(12,prvpickOrder);
pstmtRplDet.setInt(13,Integer.parseInt(pickLineNo));
}*/
pstmtRplDet.setString(12,lloReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(replLineNo));
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl); actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0) if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{ {
......
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