issues in master pack

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93312 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -7874,9 +7874,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								tempPickMap.put("case_weight", caseWeight);
 								tempPickMap.put("case_volume", caseVolume);
 								
-								if(mapItemPick.containsKey(itemCode))
+								if(mapItemPick.containsKey(itemCode + ":"+ lotSl))
 								{
-									allItemPickkList = (ArrayList)mapItemPick.get(itemCode);
+									allItemPickkList = (ArrayList)mapItemPick.get(itemCode+":"+lotSl);
 									allItemPickkList.add(tempPickMap);
 									mapItemPick.put(itemCode, allItemPickkList);
 								}
@@ -7884,7 +7884,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								{								
 									allItemPickkList = new ArrayList();
 									allItemPickkList.add(tempPickMap);
-									mapItemPick.put(itemCode, allItemPickkList);
+									mapItemPick.put(itemCode + ":"+ lotSl, allItemPickkList);
 								}
 							}
 							else
@@ -8085,7 +8085,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								itemCode = (String)tempMap.get("item_code");
 								lotNo = (String)tempMap.get("lot_no");
 								noArt = (String)tempMap.get("no_art");
+								lotSl = (String)tempMap.get("lot_sl");
 								System.out.println("Item Name["+itemCode+"]");
+								System.out.println("Lot Sl------------["+lotSl+"]------------");
 								System.out.println("No Of Art["+noArt+"]");
 								System.out.println("Alloc Qty["+tempMap.get("alloc_qty")+"]");
 								itmVolumeMap = getItemVoumeMap(itemCode,"",conn);
@@ -8104,7 +8106,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							
 								
 								unitValue = getRateStdoum(saleOrder, itemCode, conn);
-								ArrayList valList = (ArrayList)mapItemPick.get(itemCode);
+								ArrayList valList = (ArrayList)mapItemPick.get(itemCode + ":" + lotSl);
 								int valListLen = valList.size();
 								if("Y".equalsIgnoreCase(hazardous))
 								{
@@ -8145,10 +8147,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								comInfo.setExportNumberExpireDate(calendar);
 								comInfo.setUnitOfMeasure(EnumUnitOfMeasure.uomPCS);
 								infoCom[k] = comInfo;
+								int pickCtr =0;
 								for(int vCtr = 0; vCtr < valListLen;vCtr++)
 								{
 									HashMap vMap = (HashMap)valList.get(vCtr);
 									double currentnoArt = (Double)vMap.get("no_art");
+									System.out.println("Current No Of Article--["+currentnoArt+"]---["+vCtr+"]");
 									
 									if(currentnoArt <= 0.0)
 									{
@@ -8156,7 +8160,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									}
 									
 									pickRefId = (String)vMap.get("pick_order");
-									int pickCtr = (Integer)vMap.get("line_no_pick");
+									pickCtr = (Integer)vMap.get("line_no_pick");
 									
 									System.out.println("Pick Order["+pickRefId+"]");
 									System.out.println("Line No Pick["+vMap.get("line_no_pick")+"]");
@@ -8164,9 +8168,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									System.out.println("case Weight["+vMap.get("case_weight")+"]");
 									System.out.println("case Volume["+vMap.get("case_volume")+"]");
 									updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"M-PICK", xtraParams,masterCartonNo,itemCode, conn);
+									System.out.println("Setting back  the no art --["+(currentnoArt - Double.parseDouble(noArt))+"]---");
 									vMap.put("no_art", currentnoArt - Double.parseDouble(noArt));
 								}
 								
+								//updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"M-PICK", xtraParams,masterCartonNo,itemCode, conn);
+								
 								comodityInfoList.add(comInfo);
 							}
 							System.out.println("Commodity Info List"+infoCom.toString());