Changed by Rohan on 08-07-13

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

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

@@ -2497,6 +2497,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
                     tempMap.put("hazard", hazardous);
                     tempList.add(tempMap);          
                     saleOrderWiseMap.put(saleOrder+":"+locTypeParent,tempList);
+                    
+                    
 				}
 	
 				if(manualStock)
@@ -4251,6 +4253,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		//Changed By Pragyan 12/03/13
 		String hazardous = "";
 		double totActHazVolume = 0.0,totCaseHazVolume = 0.0,totCaseHazWeight = 0.0, totActHazWeight = 0.0,totHazCaseCount = 0.0;
+		ArrayList sordkeyList = new ArrayList();
+		
 		
 		try
 		{
@@ -4324,6 +4328,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				Set sordList = saleOrderWiseMap.keySet();
 				Iterator it = sordList.iterator();
 				
+		
 				
 				//Issue Tracker Point No  96.start
 				HashMap sorderConsigMap = new HashMap();
@@ -4350,6 +4355,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					//Changed By Pragyan 12/03/13.end
 					locSet = new TreeSet();
 					String sorderKey = (String)it.next();
+					sordkeyList.add(sorderKey);
 					ArrayList itemMapList = (ArrayList)saleOrderWiseMap.get(sorderKey);
 					saleOrder = sorderKey.substring(0,sorderKey.indexOf(":"));
 					sordMapInfoMap = getSordInfo(saleOrder, conn);
@@ -4464,8 +4470,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					}
 				}
 				//Issue Tracker Point No  96.end
-				it = sordList.iterator();
-				while(it.hasNext())
+				//it = sordList.iterator();
+				//while(it.hasNext())
+				
+				
+				Collections.sort(sordkeyList);
+				int sordKeyLen = sordkeyList.size();
+				
+				for(int srCtrr = 0 ; srCtrr < sordKeyLen; srCtrr ++)
 				{
 						
 					totalWeightCurrentshipment = 0.0;
@@ -4482,7 +4494,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					totHazCaseCount = 0.0;
 					//Changed By Pragyan 12/03/13.end
 					//String sorderKey = (String)it.next();;
-					String sorderKey = (String)it.next();
+					String sorderKey =  (String)sordkeyList.get(srCtrr);//(String)it.next();
+					System.out.println("EACH Sale Order Key for repl-------------------["+sorderKey+"]");
+					
 					ArrayList itemMapList = (ArrayList)saleOrderWiseMap.get(sorderKey);
 					ArrayList itemSortList = new ArrayList();
 					ArrayList itemHazSortList = new ArrayList();
@@ -8779,7 +8793,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 													{		
 														
 														System.out.println("Inside tempReplList.. Block quantity avilable in suggested case pick Location...");
-														pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
+														//pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
 														if(!isReplHdr)
 														{
 															replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","E",ptcn,conn);