Skip to content

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

Changed by Pragyan stock to doc consideration 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92166 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e4641780
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ e15104b3
...@@ -2271,7 +2271,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2271,7 +2271,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap itmVolumeMap1 = getItemVoumeMap(itemCode,"",conn); HashMap itmVolumeMap1 = getItemVoumeMap(itemCode,"",conn);
double packSize1 = (Double)itmVolumeMap1.get("PACK_SIZE"); double packSize1 = (Double)itmVolumeMap1.get("PACK_SIZE");
double caseVolume1 = (Double)itmVolumeMap1.get("LOT_SIZE");//Items Case Volume double caseVolume1 = (Double)itmVolumeMap1.get("LOT_SIZE");//Items Case Volume
System.out.println("STOCK TO DOCK TRUE NoOfCases>>>>>>>>>>>>>>>>>["+isStockToDockChecked+"]"); /*System.out.println("STOCK TO DOCK TRUE NoOfCases>>>>>>>>>>>>>>>>>["+isStockToDockChecked+"]");
System.out.println("packSize1>>>>>>>>>>>>>>>>>["+packSize1+"]caseVolume1"+caseVolume1); System.out.println("packSize1>>>>>>>>>>>>>>>>>["+packSize1+"]caseVolume1"+caseVolume1);
if("Y".equalsIgnoreCase(isStockToDockChecked)) if("Y".equalsIgnoreCase(isStockToDockChecked))
...@@ -2288,7 +2288,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2288,7 +2288,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("STOCK TO DOCK TRUE"); System.out.println("STOCK TO DOCK TRUE");
isStockToDock = true; isStockToDock = true;
} }
} }*/
/*if((pendingQty % packSize1) > 0) /*if((pendingQty % packSize1) > 0)
{ {
...@@ -2527,6 +2527,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2527,6 +2527,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if (allocQty >= qtyAvailAlloc) if (allocQty >= qtyAvailAlloc)
{ {
lotQtyToBeAllocated = qtyAvailAlloc; lotQtyToBeAllocated = qtyAvailAlloc;
//Changed By Pragyan 09/11/12 To make the stock to dock if avilable quantity less then or equal to required quantity(only reserve locatio).start
invStat = invStat != null?invStat.trim():"";
if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated > packSizeActive) && "Y".equalsIgnoreCase(isStockToDockChecked))
{
isStockToDock = true;
}
//Changed By Pragyan 09/11/12 To make the stock to dock if avilable quantity less then or equal to required quantity(only reserve locatio).end
} }
else else
{ {
...@@ -2826,7 +2834,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2826,7 +2834,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT"); double itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT");
double caseCount = lotQtyToBeAllocated /packSize; double caseCount = lotQtyToBeAllocated /packSize;
// //
System.out.println("CASE VOLUME----->["+caseVolume+"]"); /*System.out.println("CASE VOLUME----->["+caseVolume+"]");
System.out.println("CASE caseCount----->["+caseCount+"]"); System.out.println("CASE caseCount----->["+caseCount+"]");
System.out.println("(caseCount * caseVolume)----->["+(caseCount * caseVolume)+"]"); System.out.println("(caseCount * caseVolume)----->["+(caseCount * caseVolume)+"]");
System.out.println("((palletVolume - (caseCount * caseVolume))----->["+((palletVolume - (caseCount * caseVolume)))+"]"); System.out.println("((palletVolume - (caseCount * caseVolume))----->["+((palletVolume - (caseCount * caseVolume)))+"]");
...@@ -2835,8 +2843,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2835,8 +2843,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("to check with Round["+Math.round((palletVolume / caseVolume))+"]"); System.out.println("to check with Round["+Math.round((palletVolume / caseVolume))+"]");
System.out.println("to check with ceil["+Math.ceil((palletVolume / caseVolume))+"]"); System.out.println("to check with ceil["+Math.ceil((palletVolume / caseVolume))+"]");
System.out.println("to check with ["+(palletVolume / caseVolume)+"]"); System.out.println("to check with ["+(palletVolume / caseVolume)+"]");
*/
if(caseCount > 0 && (caseCount * caseVolume) <= palletVolume && ((palletVolume - (caseCount * caseVolume)) < caseVolume)) //Changed By Pragyan 09/11/12 To make the stock to dock avilable quantity less then or equal to required quantity(only reserve locatio).start
/*if(caseCount > 0 && (caseCount * caseVolume) <= palletVolume && ((palletVolume - (caseCount * caseVolume)) < caseVolume))
{ {
System.out.println("STOCK TO DOCK TRUE==============================="); System.out.println("STOCK TO DOCK TRUE===============================");
isStockToDock = true; isStockToDock = true;
...@@ -2845,8 +2855,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2845,8 +2855,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
System.out.println("STOCK TO DOCK TRUE----->"); System.out.println("STOCK TO DOCK TRUE----->");
isStockToDock = true; isStockToDock = true;
} }*/
//Changed By Pragyan 09/11/12 To make the stock to dock avilable quantity less then or equal to required quantity(only reserve locatio).end
//Changed By Pragyan.start //Changed By Pragyan.start
...@@ -3326,7 +3336,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3326,7 +3336,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
double totalWeightCurrentshipment = 0.0; double totalWeightCurrentshipment = 0.0;
double totActVolume = 0.0,totCaseVolume = 0.0,totCaseWeight = 0.0, totActWeight = 0.0; double totActVolume = 0.0,totCaseVolume = 0.0,totCaseWeight = 0.0, totActWeight = 0.0,totCaseCount = 0.0;
//String sorderKey = (String)it.next();; //String sorderKey = (String)it.next();;
String sorderKey = (String)it.next(); String sorderKey = (String)it.next();
ArrayList itemMapList = (ArrayList)saleOrderWiseMap.get(sorderKey); ArrayList itemMapList = (ArrayList)saleOrderWiseMap.get(sorderKey);
...@@ -3392,6 +3402,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3392,6 +3402,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
actCount = quantity % packSize; actCount = quantity % packSize;
caseCount = quantity / packSize; caseCount = quantity / packSize;
totCaseCount = totCaseCount + caseCount;
} }
totActWeight = totActWeight + ( actCount * itemWeight ); totActWeight = totActWeight + ( actCount * itemWeight );
totActVolume = totActVolume + ( actCount * itemVolume ); totActVolume = totActVolume + ( actCount * itemVolume );
...@@ -3425,7 +3436,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3425,7 +3436,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt = null; pstmt = null;
} }
errString = updatePickOrdPartII(headerDom, detailDom,waveId, siteCode,saleOrder ,xtraParams, itemMapList,ptcnID,transPorterInfoMap,totActVolume,totActWeight,totCaseVolume,totCaseWeight, conn); errString = updatePickOrdPartII(headerDom, detailDom,waveId, siteCode,saleOrder ,xtraParams, itemMapList,ptcnID,transPorterInfoMap,totActVolume,totActWeight,totCaseVolume,totCaseWeight,totCaseCount, conn);
//System.out.println("replListPSO.size() ["+replListPSO.size()+"] replListDSO.size() ["+replListDSO.size()+"] pickList.size()"+pickList.size()); //System.out.println("replListPSO.size() ["+replListPSO.size()+"] replListDSO.size() ["+replListDSO.size()+"] pickList.size()"+pickList.size());
...@@ -10428,7 +10439,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10428,7 +10439,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
//Changed by sumit sarkar on 26/08/2011 [ WM1ESUN006 ] update pick_ord_hrd & pick_ord_det table end. //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,double totCaseVolume,double totCaseWeight, Connection conn )throws Exception 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,double totCaseVolume,double totCaseWeight,double totCaseCount, Connection conn )throws Exception
{ {
String errString = ""; String errString = "";
String sql = ""; String sql = "";
...@@ -10684,7 +10695,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10684,7 +10695,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("POSSIBLE MASTER PACK COUNT["+mPackCounter+"]"); System.out.println("POSSIBLE MASTER PACK COUNT["+mPackCounter+"]");
System.out.println("MASTER PACK STARTING COUNT["+totalCaseOnPallet+"]"); System.out.println("MASTER PACK STARTING COUNT["+totalCaseOnPallet+"]");
if(cashCount >= 2) //if(cashCount >= 2)
if(totCaseCount >= 2)
{ {
if("Y".equalsIgnoreCase(isSinglePickMasterPack)) if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{ {
......
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