src merged with revert data of Wavegeneration src

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

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

@@ -2116,18 +2116,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	    				itemInfoMapForRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd, tempListForRepl);
 	                }
 					//Change by rohan on 22/08/12 to check replanishment history.end
-					if(invSt != null && invSt.trim().equalsIgnoreCase(resvInvStat.trim()))
-					{
-						
-						double palletVolume  = Double.parseDouble(discommon.getDisparams("999999","PER_PALLET__VOLUME",conn));
-						//Changed by Rohan on 22/08/12 to define earlier in code
-						//HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
 					 packSize = (Double)itmVolumeMap.get("PACK_SIZE");//How many item contains in the Case
 				    double perItemVolume = (Double)itmVolumeMap.get("ITEM_SIZE");//Each Item Volume
 					double caseVolume = (Double)itmVolumeMap.get("LOT_SIZE");//Items Case Volume
 					double caseWeight = (Double)itmVolumeMap.get("PACK_WEIGHT");
 					double itemWeight = (Double)itmVolumeMap.get("ITEM_WEIGHT");
 					double caseCount = qtyAllocate /packSize;					
+					if(invSt != null && invSt.trim().equalsIgnoreCase(resvInvStat.trim()))
+					{
+						
+						double palletVolume  = Double.parseDouble(discommon.getDisparams("999999","PER_PALLET__VOLUME",conn));
+						//Changed by Rohan on 22/08/12 to define earlier in code
+						//HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
 					   	
 						if(caseCount > 0 &&  (caseCount * caseVolume) <= palletVolume && ((palletVolume - (caseCount * caseVolume)) < caseVolume))  
 						 {
@@ -2183,6 +2183,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
                     tempMap.put("loc_type", locType);
                     tempMap.put("loc_type_parent", locTypeParent);
                     tempMap.put("loc_zone_pref", locZonePref);
+                    tempMap.put("master_pack", isMasterPickChecked);
+                    tempMap.put("active_pick", isActivePickChecked);
+                    tempMap.put("parcel_pick", isParcelPickChecked);
+                    tempMap.put("exp_lev", expLev);
+                    //Changed By Pragyan add the pack_size in the map.
+                    tempMap.put("pack_size", packSize);
+                    tempMap.put("sord_lineNo", lineNo);
+                    tempMap.put("item_weight", itemWeight);
+                    
+                    locCodeTo = locCodeTo != null && locCodeTo.length() > 0 ?locCodeTo:locCode;
+                    tempMap.put("sugg_loc", locCodeTo);
                    
                     tempList.add(tempMap);          
                     saleOrderWiseMap.put(saleOrder+":"+locTypeParent,tempList);
@@ -3913,7 +3924,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					
 					totalWeightCurrentshipment = totActWeight + totCaseWeight;
 					tempMapOrd = new HashMap();
-					tempMapOrd.put("sale_order", saleOrder);
+					//Changed By Pragyan 28/02/13 To store the data as a Key for different loc type parent
+					//tempMapOrd.put("sale_order", saleOrder);
+					tempMapOrd.put("sale_order", sorderKey);
 					tempMapOrd.put("tot_weight_order", totalWeightCurrentshipment);
 					tempMapOrd.put("no_art_order", totCaseCount);
 					tempMapOrd.put("tot_case_weight", totCaseWeight);
@@ -3921,7 +3934,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					tempMapOrd.put("tot_act_weight", totActWeight);
 					tempMapOrd.put("tot_act_volume", totActVolume);
 					tempMapOrd.put("loc_set", locSet);
-					sorderConsigMap.put(saleOrder, currentShipConsGrp);
+					//Changed By Pragyan 28/02/13 To store the data as a Key for different loc type parent
+					//sorderConsigMap.put(saleOrder, currentShipConsGrp);
+					sorderConsigMap.put(sorderKey, currentShipConsGrp);
 					
 					if(currentShipConsGrp != null && currentShipConsGrp.length() > 0)
 					{
@@ -4031,7 +4046,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						System.out.println("current total weight "+totalWeightCurrentshipment+"]");
 					}*/
 					
-					String shipCons = (String)sorderConsigMap.get(saleOrder);
+					//Changed By Pragyan 28/02/13 To store the data as a Key for different loc type parent
+					//String shipCons = (String)sorderConsigMap.get(saleOrder);
+					String shipCons = (String)sorderConsigMap.get(sorderKey);
 					ArrayList dataList = (ArrayList)custConsigMap.get(shipCons);
 					int dataListlen = dataList.size();
 					
@@ -4060,7 +4077,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						System.out.println("totActWeight AFTER"+totActWeight+"]");
 						System.out.println("totCaseCount AFTER"+totCaseCount+"]");						
 						
-						if(((String)sordMap.get("sale_order")).equalsIgnoreCase(saleOrder))
+						//Changed By Pragyan 28/02/13 To store the data as a Key for different loc type parent
+						//if(((String)sordMap.get("sale_order")).equalsIgnoreCase(saleOrder))
+						if(((String)sordMap.get("sale_order")).equalsIgnoreCase(sorderKey))
 						{
 							locSet = (Set)sordMap.get("loc_set");
 						}