Skip to content

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

bug found in wave generation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92701 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1ded0177
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 14 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ d46086cb
...@@ -3657,6 +3657,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3657,6 +3657,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String invStatLoc= ""; String invStatLoc= "";
//Changed By Pragyan Demo4 //Changed By Pragyan Demo4
String invDeepStatLoc = ""; String invDeepStatLoc = "";
String activePickInvstat = "";
boolean isDeepStoreLoc = false; boolean isDeepStoreLoc = false;
String invStat = ""; String invStat = "";
//java.sql.Date currdate = new java.sql.Date( System.currentTimeMillis() ); //Commented by Chandni 01-june-2012 //java.sql.Date currdate = new java.sql.Date( System.currentTimeMillis() ); //Commented by Chandni 01-june-2012
...@@ -3746,6 +3747,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3746,6 +3747,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
invStatLoc = discommon.getDisparams("999999","RESERV_LOCATION",conn); invStatLoc = discommon.getDisparams("999999","RESERV_LOCATION",conn);
invDeepStatLoc = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn); invDeepStatLoc = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
activePickInvstat = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
Set sordList = saleOrderWiseMap.keySet(); Set sordList = saleOrderWiseMap.keySet();
Iterator it = sordList.iterator(); Iterator it = sordList.iterator();
...@@ -3791,9 +3794,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3791,9 +3794,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
caseWeight = (Double)dataTempMap.get("PACK_WEIGHT"); caseWeight = (Double)dataTempMap.get("PACK_WEIGHT");
caseVolume = (Double)dataTempMap.get("LOT_SIZE"); caseVolume = (Double)dataTempMap.get("LOT_SIZE");
System.out.println("current item code"+itemCode+"]quantity["+quantity+"]itemWeight["+itemWeight+"]caseWeight"+caseWeight+"]caseVolume["+caseVolume+"]Loc Code["+locCode+"]"); invStat = (String)loadMap.get("inv_stat");
invStat = invStat.trim();
System.out.println("current item code"+itemCode+"]quantity["+quantity+"]itemWeight["+itemWeight+"]caseWeight"+caseWeight+"]caseVolume["+caseVolume+"]Loc Code["+locCode+"]invStat["+invStat+"]");
locSet.add(suggLoc); locSet.add(suggLoc);
if(quantity < packSize) //Changed By Pragyan 17-feb-13 to set quanity if active plocation and greater the packsize
if(quantity < packSize || invStat.equalsIgnoreCase(activePickInvstat))
//if(quantity < packSize)
{ {
actCount = quantity; actCount = quantity;
} }
...@@ -11251,9 +11259,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11251,9 +11259,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pPickAllow =(String)dataMap.get("parcel_pick");*/ pPickAllow =(String)dataMap.get("parcel_pick");*/
expLevel = (String)dataMap.get("exp_lev"); expLevel = (String)dataMap.get("exp_lev");
String sugCode = (String)dataMap.get("sugg_loc"); String sugCode = (String)dataMap.get("sugg_loc");
invStat = (String)dataMap.get("inv_stat");
invStat = invStat.trim();
System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]"); System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]");
System.out.println("SITE_CODE["+siteCode+"]\n LOCCODE["+locCode+"]\n Suggested Loc" +sugCode+ System.out.println("SITE_CODE["+siteCode+"]\n LOCCODE["+locCode+"]\n Suggested Loc" +sugCode+
"]ITEM CODE["+itemCode+"]\n LOTNO["+lotNo+"]\n LOT SL["+lotSl+"]\n ALLOC QUANTITY["+quantity+"]\n Exp Level["+expLevel+"]"); "]ITEM CODE["+itemCode+"]\n LOTNO["+lotNo+"]\n LOT SL["+lotSl+"]\n ALLOC QUANTITY["+quantity+"]\n Exp Level["+expLevel+"]INVSTAT["+invStat+"]");
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
...@@ -11297,9 +11308,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11297,9 +11308,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("GOING --INSIDE MASTER PACK BLOCK--"); System.out.println("GOING --INSIDE MASTER PACK BLOCK--");
//Changed By Pragyan 31/12/12 for Parcel Pick //Changed By Pragyan 17-feb-12 not to generate case/master pick from active location
//Changed By Pragyan 31/12/12 for Parcel Pick invStat.equalsIgnoreCase(activePickInv) &&
//if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc))) //if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
if(("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc))) //if(("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
{ {
System.out.println("--INSIDE MASTER PACK BLOCK--"); System.out.println("--INSIDE MASTER PACK BLOCK--");
cashCount = Math.floor(quantity /packSize) ; cashCount = Math.floor(quantity /packSize) ;
...@@ -11432,9 +11445,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -11432,9 +11445,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap caseTempMap1 = (HashMap)dataMap.clone(); HashMap caseTempMap1 = (HashMap)dataMap.clone();
quantityToBeStore = Math.floor(requiredVolumeToStore / caseVolume);
System.out.println("avilable quantityToBeStore["+quantityToBeStore+"]"); System.out.println("avilable quantityToBeStore["+quantityToBeStore+"]");
//Changed By Pragyan 17-Feb-13 to round the value up to decimal calculation
//quantityToBeStore = Math.floor(requiredVolumeToStore / caseVolume);
quantityToBeStore = Math.round(requiredVolumeToStore / caseVolume);
System.out.println("Avilable requiredVolumeToStore["+requiredVolumeToStore+"]"); System.out.println("Avilable requiredVolumeToStore["+requiredVolumeToStore+"]");
System.out.println("Last Volume To be stored["+requiredVolumeToStore+"]"); System.out.println("Last Volume To be stored["+requiredVolumeToStore+"]");
caseTempMap1.put("no_art", ""+quantityToBeStore); caseTempMap1.put("no_art", ""+quantityToBeStore);
...@@ -12174,11 +12189,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12174,11 +12189,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 4-12-11 [WMIESUN006] for Master Packing //Changed by Rohan on 4-12-11 [WMIESUN006] for Master Packing
//if(quantity >= packSize) //if(quantity >= packSize)
System.out.println("masterPackAllow"+masterPackAllow+"quantity"+quantity+"packSize"+packSize+"stockToDock"+stockToDock); System.out.println("masterPackAllow"+masterPackAllow+"quantity"+quantity+"packSize"+packSize+"stockToDock"+stockToDock);
//Changed By Pragyan 02/12/12 For //Changed By Pragyan 17-feb-12 not to generate case/master pick from active location
//Changed by rohan on 14/08/12 to generate task depending upon wave type info //Changed by rohan on 14/08/12 to generate task depending upon wave type info
//if(!masterPackAllow && quantity >= packSize && stockToDock.equalsIgnoreCase("N")) //if(!masterPackAllow && quantity >= packSize && stockToDock.equalsIgnoreCase("N"))
//if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc))) //if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
if(("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc))) //if(("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
if(!invStat.equalsIgnoreCase(activePickInv) && ("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
{ {
System.out.println("--INSIDE CASE PACK BLOCK--"); System.out.println("--INSIDE CASE PACK BLOCK--");
...@@ -12296,10 +12312,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12296,10 +12312,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
caseTempPickList = new ArrayList(); caseTempPickList = new ArrayList();
HashMap caseTempMap1 = (HashMap)dataMap.clone(); HashMap caseTempMap1 = (HashMap)dataMap.clone();
quantityToBeStore = Math.floor(requiredVolumeToStore / caseVolume);
System.out.println("avilable quantityToBeStore["+quantityToBeStore+"]");
System.out.println("Avilable requiredVolumeToStore["+requiredVolumeToStore+"]"); System.out.println("Avilable requiredVolumeToStore["+requiredVolumeToStore+"]");
//Changed By Pragyan 17-Feb-13 to round the value up to decimal calculation
//quantityToBeStore = Math.floor(requiredVolumeToStore / caseVolume);
quantityToBeStore = Math.round(requiredVolumeToStore / caseVolume);
System.out.println("avilable quantityToBeStore["+quantityToBeStore+"]");
System.out.println("Last Volume To be stored["+requiredVolumeToStore+"]"); System.out.println("Last Volume To be stored["+requiredVolumeToStore+"]");
caseTempMap1.put("no_art", ""+quantityToBeStore); caseTempMap1.put("no_art", ""+quantityToBeStore);
caseTempMap1.put("alloc_qty", quantityToBeStore*packSize); caseTempMap1.put("alloc_qty", quantityToBeStore*packSize);
...@@ -12392,7 +12410,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -12392,7 +12410,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
}//if(quantity >= packSize) }//if(quantity >= packSize)
//Changed By Pragyan 17-feb-12 not to generate case/master pick from active location .Start
if(invStat.equalsIgnoreCase(activePickInv) && quantity >= packSize && activeCount <= 0 && "Y".equalsIgnoreCase(aPickAllow))
{
System.out.println("--INSIDE ACTIVE*************************** PICK BLOCK--");
activeCount = quantity;
}
//Changed By Pragyan 17-feb-12 not to generate case/master pick from active location .end
//Storing data for activ pick order list //Storing data for activ pick order list
System.out.println("--INSIDE ACTIVE*************************** PICK BLOCK--"); System.out.println("--INSIDE ACTIVE*************************** PICK BLOCK--");
//Changed by Rohan on 14/08/12 to create master Pack depending upon wave_task //Changed by Rohan on 14/08/12 to create master Pack depending upon wave_task
......
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