Order by Alloc preference during stock allocation

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

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

@@ -1065,6 +1065,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					lineNoSord = checkNull(genericUtility.getColumnValue("line_no__sord", dom));
 					itemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
 					System.out.println(" saleOrder ["+saleOrder+"] lot no ["+lotNo+"] itemCode["+itemCode+"]");
+					activePickAllow=genericUtility.getColumnValue("active_pick_allow", dom1);
+					activePickAllow=activePickAllow==null?"Y":activePickAllow;
 					
 					String getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
 						       +"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
@@ -1135,7 +1137,11 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					 deepStoreLoc = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
 					 partialResrvLoc = discommon.getDisparams("999999","PRSRV_INVSTAT",conn);			
 					 System.out.println("CASE_PICK_INVSTAT"+casePickLoc+"ACTIVE_PICK_INVSTAT"+activePickLoc+"RESERV_LOCATION"+resrvLoc+"PARTIAL RESERVE LOC["+partialResrvLoc+"]");
-					
+					 if("N".equalsIgnoreCase(activePickAllow))
+						{
+							activePickLoc="";
+							partialResrvLoc="";
+						}
 					 /*sSQL =	"SELECT STOCK.LOT_NO,STOCK.LOT_SL,"
 							   +"STOCK.LOC_CODE, "
 							   +"STOCK.UNIT,  "
@@ -1193,12 +1199,12 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					 if((pendingQty % packSize) > 0)
 					{
 						isActives = true;
-						orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY STOCK.EXP_DATE,LOCATION.INV_STAT, STOCK.LOC_CODE ";
+						orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 					}
 					else
 					{
 						isActives = false;
-						orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE, STOCK.LOC_CODE ";
+						orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 					}
 					 
 					/*if ( singleLot.trim().length() > 0 && singleLot.trim().equalsIgnoreCase("Y") )
@@ -1788,12 +1794,12 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 			 if((pendingQty % packSize) > 0)
 			 {
 				isActives = true;
-				orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,LOCATION.INV_STAT, STOCK.LOC_CODE ";
+				orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 			 }
 			 else
 			 {
 				isActives = false;
-				orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END, STOCK.LOC_CODE ";
+				orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 			 }
 			 
 			

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

@@ -1049,7 +1049,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 			}
 			//Added by manoj dtd 09/08/2013 to implement FEFO concept  
 			getDataSql=getDataSql+"AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
-			getDataSql=getDataSql+"  ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END ASC";
+			getDataSql=getDataSql+"  ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
 			pstmtStock = conn.prepareStatement(getDataSql);
 			pstmtStock.setString(1,itemCode);
 			pstmtStock.setString(2,siteCode);