Request ID:W15HSUN003 ,pallet request with stock details ,for expire and near expire button.

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

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

+/**
+ *  Purpose:Create transaction  screen Pallet Request, Request ID:  W15GSUN001
+ *  Purpose:Create Pallet Request with stock details ,Request ID: W15HSUN003
+ */
+
 package ibase.webitm.ejb.wms;
 
 import ibase.system.config.ConnDriver;
@@ -130,7 +135,7 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
 			" FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S ,SWMS_TO_AWMS A WHERE  S.ITEM_CODE = D.ITEM_CODE " +
 			" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL AND S.SITE_CODE = D.SITE_CODE " +
 			"AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID  AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ? " +
-			" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=TRIM(S.LOC_CODE) AND " +
+			" AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1) AND " +
 			"A.ITEM_CODE=S.ITEM_CODE AND A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
 			" FN_CHK_PRS(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1),?) = 0 AND S.QUANTITY>0 AND S.NO_ART >0 AND S.QTY_PER_ART >0";
 
@@ -263,7 +268,7 @@ implements PalletReqExpiryActLocal, PalletReqExpiryActRemote
 			" S.ITEM_CODE = D.ITEM_CODE  AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL " +
 			"AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID  AND " +
 			"L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ? AND L.INV_STAT= ? AND" +
-			" S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=TRIM(S.LOC_CODE) AND A.ITEM_CODE=S.ITEM_CODE AND " +
+			" S.SITE_CODE= ? AND A.IN_OUT= ? AND A.PALLET_NO=SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1) AND A.ITEM_CODE=S.ITEM_CODE AND " +
 			"A.LOT_NO=S.LOT_NO AND A.LOT_SL=S.LOT_SL AND A.PALLET_STATUS= ? AND " +
 			" FN_CHK_PRS(SUBSTR(S.LOC_CODE,1,INSTR(S.LOC_CODE,'Q')-1),?) = 0 AND S.QUANTITY>0 " +
 			"AND S.NO_ART >0 AND S.QTY_PER_ART >0";