stock sorting order added

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

webitm-mfg/ibase/webitm/ejb/mfg/adv/WOrderIssueAct.java

@@ -4,6 +4,7 @@ import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.mfg.MfgCommon;
+import ibase.utility.CommonConstants;
 // import ibase.webitm.ejb.mfg.adv.WOStock.woStockDtlParams;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -49,7 +50,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 
 	public void ejbPassivate() {
 	}*/
-
+	CommonConstants commonConstants = new CommonConstants();
 	public String actionHandler() throws RemoteException, ITMException {
 		return "";
 	}
@@ -984,6 +985,23 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 				sql = sql + " AND C.loc_group = '" + locGroup + "' ";
 			}
 			// end 26/03/12 manoharan
+			// 02/04/12 manoharan sorting to be doen as per PB logic
+			sql = sql + " order by partial_used, (case when '" + locUsageType + "' = 'P' then (case when rtrim(c.loc_group) = rtrim('" + locGroup + "') Then 'A' else 'B' end) else '0' end), " ;
+			if ("db2".equalsIgnoreCase(commonConstants.DB_NAME))
+			{
+				sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no ";
+			}
+			else
+			{
+				sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no, "
+				 + " decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), " 
+				+ " 1, '00' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) )) ,rtrim(a.lot_sl)), "        
+				+" decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), "
+				+ " 2, '0' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) )) ,rtrim(a.lot_sl)), "         
+				+" decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) )) ";
+			}
+			// end 02/04/12 manoharan
+			
 			
 			System.out.println("sqlSB converted ::: "+ sql);
 			StringTokenizer st = new StringTokenizer(sql, "?");
@@ -1676,7 +1694,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements  WOrderIssueActL
 					sqlSb1.append("A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, "); 
 					sqlSb1.append("A.PACK_CODE ");
 					sqlSb1.append("FROM STOCK A, INVSTAT B, LOCATION C ");
-					sqlSb1.append("WHERE A.LOC_CODE = b.LOC_CODE AND B.INV_STAT  = C.INV_STAT ");
+					sqlSb1.append("WHERE A.LOC_CODE = c.LOC_CODE AND B.INV_STAT  = C.INV_STAT ");
 					sqlSb1.append("AND A.ITEM_CODE = ? ");
 					sqlSb1.append("AND A.SITE_CODE = ? ");
 					sqlSb1.append(" AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - ");