Commit cdacf625 authored by ppatro's avatar ppatro

wave gen


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92177 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f702c321
...@@ -10542,8 +10542,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10542,8 +10542,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 4-12-11 [WM1ESUN006] For master pack allow.start //Changed by Rohan on 4-12-11 [WM1ESUN006] For master pack allow.start
masterPackCount = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_CASE_COUNT",conn)); masterPackCount = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_CASE_COUNT",conn));
masterPackWeight = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT",conn)); 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); isSinglePickMasterPack = discommon.getDisparams("999999","MASTER_PACK_SINGLE_PICK",conn);
mPackAllow = genericUtility.getColumnValue("master_pack_allow",detailDom);
mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N";
aPickAllow = genericUtility.getColumnValue("active_pick_allow",detailDom);
aPickAllow = (aPickAllow != null && aPickAllow.length() > 0)?aPickAllow:"Y";
stockToDoc = genericUtility.getColumnValue("stock_to_dock_allow",detailDom);
stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";
if(totActWeight > 0 && totActVolume > 0) if(totActWeight > 0 && totActVolume > 0)
{ {
String[] itmWeightVol = new String[3]; String[] itmWeightVol = new String[3];
...@@ -10562,7 +10570,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10562,7 +10570,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
if(totCaseVolume > 0 && totCaseWeight > 0) //if(totCaseVolume > 0 && totCaseWeight > 0)
if(totCaseVolume > 0 && totCaseWeight > 0 && totCaseWeight <= masterPackWeightPerOrder && "Y".equalsIgnoreCase(mPackAllow))
{ {
if(totCaseWeight < masterPackWeight) if(totCaseWeight < masterPackWeight)
...@@ -10584,18 +10593,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10584,18 +10593,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
masterPackVolume = Double.parseDouble(itmWeightVol[1]); masterPackVolume = Double.parseDouble(itmWeightVol[1]);
} }
} }
else
{
mPackAllow = "N";
}
mPackAllow = genericUtility.getColumnValue("master_pack_allow",detailDom); /*mPackAllow = genericUtility.getColumnValue("master_pack_allow",detailDom);
mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N"; mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N";
aPickAllow = genericUtility.getColumnValue("active_pick_allow",detailDom); aPickAllow = genericUtility.getColumnValue("active_pick_allow",detailDom);
aPickAllow = (aPickAllow != null && aPickAllow.length() > 0)?aPickAllow:"Y"; aPickAllow = (aPickAllow != null && aPickAllow.length() > 0)?aPickAllow:"Y";
stockToDoc = genericUtility.getColumnValue("stock_to_dock_allow",detailDom); stockToDoc = genericUtility.getColumnValue("stock_to_dock_allow",detailDom);
stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y"; stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";*/
//Changed by Rohan on 14/08/12 to get wave type info.end //Changed by Rohan on 14/08/12 to get wave type info.end
System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc); System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc);
masterPackWeightPerOrder = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT_PER_ORDER",conn)); //masterPackWeightPerOrder = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT_PER_ORDER",conn));
if (maxWeight != null && maxWeight.length()> 0) if (maxWeight != null && maxWeight.length()> 0)
{ {
masterPackWeightPerOrder = Double.parseDouble(maxWeight); masterPackWeightPerOrder = Double.parseDouble(maxWeight);
...@@ -10629,10 +10642,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10629,10 +10642,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn); HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
masterPackAllow = isMasterPackAllow; masterPackAllow = isMasterPackAllow;
double packSize = (Double)itmVolumeMap.get("PACK_SIZE");//How many item contains in the Case double packSize = (Double)itmVolumeMap.get("PACK_SIZE");//How many item contains in the Case
double perItemVolume = Math.floor((Double)itmVolumeMap.get("ITEM_SIZE"));//Each Item Volume //Changed By Pragyan 22/11/12 remove the floor as we need to get actual volume.start
/*
double perItemVolume = Math.floor((Double)itmVolumeMap.get("ITEM_SIZE"));
double caseVolume = Math.floor((Double)itmVolumeMap.get("LOT_SIZE"));//Items Case Volume double caseVolume = Math.floor((Double)itmVolumeMap.get("LOT_SIZE"));//Items Case Volume
double caseWeight = Math.floor((Double)itmVolumeMap.get("PACK_WEIGHT")); double caseWeight = Math.floor((Double)itmVolumeMap.get("PACK_WEIGHT"));
double itemWeight = Math.floor((Double)itmVolumeMap.get("ITEM_WEIGHT")); double itemWeight = Math.floor((Double)itmVolumeMap.get("ITEM_WEIGHT"));*/
double perItemVolume = (Double)itmVolumeMap.get("ITEM_SIZE");
double caseVolume = (Double)itmVolumeMap.get("LOT_SIZE");//Items Case Volume
double caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
double itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT");
//Changed By Pragyan 22/11/12 remove the floor as we need to get actual volume.end
double activeCount = 0.0; double activeCount = 0.0;
double cashCount = 0.0; double cashCount = 0.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