merge changes from branch version 40

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

webitm-dis/ibase/webitm/ejb/dis/StockAllocationPrc.java

@@ -1218,11 +1218,19 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					// ADDED BY RITESH ON 09/08/14 START
 					System.out.println("if calling...allocQty > 0.....");	
 					itemList  =  saleOrder+","+lineNo+","+itemCode+","+allocQty+","+expLev+","+holdFlag+","+holdFlag+","+activeAllow;
-					if(!sorderList.contains(saleOrder))
+					System.out.println("@@@@@@@@ sorderList["+sorderList+"]saleOrder+activeAllow["+saleOrder+activeAllow+"]");
+					if(!sorderList.contains(saleOrder+activeAllow))   // added activeAllow in if condition by cpatil on 20/08/14
 					{
-						lineNoMap = new HashMap<String,String>(); System.out.println(" lineNoMap cleared()");
+						lineNoMap = new HashMap<String,String>(); 
+						System.out.println(" lineNoMap cleared()");
 					}
-					sorderList.add(saleOrder);
+					else   // added else condition by cpatil for retriving previous value from map on 20/08/14
+					{
+						lineNoMap = map.get(saleOrder+activeAllow);
+						System.out.println(" lineNoMap exist -- lineNoMap["+lineNoMap+"]");
+					}
+					
+					sorderList.add(saleOrder+activeAllow);
 //					itemList.add(saleOrder);
 //					itemList.add(lineNo);
 //					itemList.add(itemCode);
@@ -1233,7 +1241,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					System.out.println("itemList::"+itemList);
 					lineNoMap.put(lineNo.trim()+"-"+saleOrder,itemList); System.out.println("lineNoMap for each row ::"+lineNoMap);
 					map.put(saleOrder+activeAllow,lineNoMap);
-					
+					System.out.println("@@@@@@ after added saleOrder["+saleOrder+activeAllow+"]:::lineNoMap:["+lineNoMap+"]");
 //					errString = sorderAllocate(saleOrder, lineNo, itemCode, allocQty, expLev ,holdFlag,activeAllow,xtraParams);
 //					System.out.println("@@@@@@ sorderAllocate return string["+errString+"]");
 //					if (errString != null && errString.trim().length() > 0)
@@ -1277,7 +1285,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 			//if (errString != null && errString.trim().length() > 0)
 			//errString = "PROCSUCC"; 
 			//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
-			System.out.println(" fINALLY map "+map);
+			System.out.println(" fINALLY map ::["+map+"]");
 			Set<String> set  = map.keySet();
 			Iterator<String> it  =  set.iterator();
 			while(it.hasNext())
@@ -1674,6 +1682,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 //			expLev = (String)solnValueList.get(4);
 //			holdFlag = (String)solnValueList.get(5);
 //			activeAllow =(String)solnValueList.get(6);
+			System.out.println("@@@@count["+count+"]");
 			System.out.println(" saleOrder::"+saleOrder);
 			System.out.println(" lineNo::"+lineNo);
 			System.out.println(" itemCode::"+itemCode);