changed by sankara on 25/04/14 wavegenerationprc for wms live

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

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

@@ -4072,7 +4072,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										String lastReplenishmentID="",locCodeTo="";
 										int lineNoRepl=0;
 										System.out.println("Current Stock Qty ["+stkQuantity+"]");
-										if(((invSt.trim().equalsIgnoreCase(resrvLoc) || invSt.trim().equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate >= packSize)) || invSt.trim().equalsIgnoreCase(partialResrvLoc))
+										if(((invSt.trim().equalsIgnoreCase(resrvLoc) || invSt.trim().equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate >= itemPackSize)) || invSt.trim().equalsIgnoreCase(partialResrvLoc))
 										{
 											if(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))
 											{
@@ -4106,7 +4106,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										//Changed By Pragyan 16-APR-14 To store the active Repl Qty and  in same wave [taro live issue].start
 										else
 										{
-											if(((invSt.equalsIgnoreCase(resrvLoc) || invSt.equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate < packSize) && !(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))))
+											if(((invSt.equalsIgnoreCase(resrvLoc) || invSt.equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate < itemPackSize) && !(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))))
 											{
 												double totalCaseQty = 0.0,totalPickQty = 0.0,stkActReplQty = 0.0;
 												if(itemQtyMapForActiveRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))
@@ -4118,14 +4118,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 													
 													if((totalPickQty + qtyAllocate) > totalCaseQty)
 													{
-														totalCaseQty = totalCaseQty + packSize;
+														totalCaseQty = totalCaseQty + itemPackSize;
 													}
 													
 												}
 												else
 												{
 													tempMapActiveRepl = new HashMap();
-													totalCaseQty = packSize;
+													totalCaseQty = itemPackSize;
 													stkActReplQty = stkQuantity;
 												}
 												
@@ -4147,7 +4147,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										 caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
 										 hazardous = (String)itmVolumeMap.get("HAZARDOUS");
 										 itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT");
-										 caseCount = qtyAllocate /packSize;
+										// caseCount = qtyAllocate /packSize;
+										 caseCount = qtyAllocate /itemPackSize;
 										 
 										if(invSt != null && invSt.trim().equalsIgnoreCase(resvInvStat.trim()))
 										{
@@ -4208,7 +4209,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					                    tempMap.put("parcel_pick", isParcelPickChecked);
 					                    tempMap.put("ship_type", shipTypeLine);
 					                    tempMap.put("exp_lev", expLev);
-					                    tempMap.put("pack_size", packSize);
+					                    
+					                    System.out.println("CHECKING FOR THE WRONG PACK SIZE1["+packSize+"]itemCode ["+itemCode+"]locCode["+locCode+"]");
+					                    //tempMap.put("pack_size", packSize);
 					                    tempMap.put("sord_lineNo", lineNo);
 					                    tempMap.put("item_weight", itemWeight);
 					                    
@@ -5988,6 +5991,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
                     tempMap.put("active_pick", isActivePickChecked);
                     tempMap.put("parcel_pick", isParcelPickChecked);
                     tempMap.put("exp_lev", expLev);
+                    System.out.println("CHECKING FOR THE WRONG PACK SIZE2["+packSize+"]itemCode ["+itemCode+"]locCode["+locCode+"]");
                     //Changed By Pragyan add the pack_size in the map.
                     tempMap.put("pack_size", packSize);
                     tempMap.put("sord_lineNo", lineNo);
@@ -11421,7 +11425,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								itemWeight = Math.floor((Double)mapItemVolume.get("ITEM_WEIGHT"));
 								//itemWeight= Math.round((Double)mapItemVolume.get("ITEM_WEIGHT"));
 								packSizeCase = (Double)mapItemVolume.get("PACK_SIZE");
-								
+								System.out.println("CHECKING FOR THE WRONG PACK SIZE3 casePackSize["+casePackSize+"]packSizeCase["+packSizeCase+"]itemCode["+itemCode+"]locCode["+locCode+"]");
 								int refCtr = 1;
 							
 								pstmtRplDet.setString(1,replRefDeepId);
@@ -11442,6 +11446,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								}
 								else
 								{
+									System.out.println("CHECKING FOR THE WRONG PACK SIZE4 casePackSize["+casePackSize+"]packSizeCase["+packSizeCase+"]itemCode["+itemCode+"]locCode["+locCode+"]locInvStat["+locInvStat+"]");
 									errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
 									return errString;
 								}
@@ -21074,8 +21079,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				{
 					
 						
+					//Changed By Pragyan 24-APR-14 AS CASE PICK REPLENISHMENT IS PRESENT THEN IT SHOULD CHECK FOR CASE TO ACTIVE REPLENISHMENT
+					
+					if(locInvstat.equalsIgnoreCase(deepStoreInvstat) || locInvstat.equalsIgnoreCase(reserveInvstat))
+					{
+						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+									+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y'";
+					}
+					else
+					{
 						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+							 //+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
 								+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
+					}
 				
 				}
 				else