Added inventory status AWMSQ while requesting pallet from Distribution Order.

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

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

@@ -208,7 +208,9 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						+" AND S.SITE_CODE = H.SITE_CODE"
 						+" AND H.DIST_ORDER = D.DIST_ORDER"
 						+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
-						+" AND L.INV_STAT = 'AWMS'" //Changed by wasim on 20-08-2015 to add inv_stat validation
+						//Changed by wasim on 11-07-2016 to add inv_stat AWMS AND AWMSQ validation
+						//+" AND L.INV_STAT = 'AWMS'" 
+						+" AND L.INV_STAT IN ('AWMS','AWMSQ')" 
 						+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
 						+" AND D.DIST_ORDER = ?";
 					pstmt = conn.prepareStatement(sql);
@@ -283,7 +285,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						palletNo = (palletNo.charAt(palletNo.trim().length()-1)=='Q') || (palletNo.charAt(palletNo.trim().length()-1)=='M') || 
 						(palletNo.charAt(palletNo.trim().length()-1)=='S') || (palletNo.charAt(palletNo.trim().length()-1)=='B') ||
 						(palletNo.charAt(palletNo.trim().length()-1)=='X') || (palletNo.charAt(palletNo.trim().length()-1)=='U') || 
-						(palletNo.charAt(palletNo.trim().length()-1)=='P') ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
+						(palletNo.charAt(palletNo.trim().length()-1)=='P') || (palletNo.charAt(palletNo.trim().length()-1)=='R')
+						 ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
 						System.out.println("Pallet No After removing suffix: "+palletNo);	
 
 						interfaceHmap.put("TRAN_ID", "");
@@ -334,7 +337,9 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							+" AND D.TRAN_ID = H.TRAN_ID"
 							+" AND H.CONFIRMED = 'N'"
 							+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
-							+" AND L.INV_STAT = 'AWMS'"
+							//Changed by wasim on 11-07-2016 to add inv_stat AWMS AND AWMSQ validation
+							//+" AND L.INV_STAT = 'AWMS'" 
+							+" AND L.INV_STAT IN ('AWMS','AWMSQ')" 
 							+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
 							+" AND D.DIST_ORDER = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -385,7 +390,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							palletNo = (palletNo.charAt(palletNo.trim().length()-1)=='Q') || (palletNo.charAt(palletNo.trim().length()-1)=='M') || 
 							(palletNo.charAt(palletNo.trim().length()-1)=='S') || (palletNo.charAt(palletNo.trim().length()-1)=='B') ||
 							(palletNo.charAt(palletNo.trim().length()-1)=='X') || (palletNo.charAt(palletNo.trim().length()-1)=='U') || 
-							(palletNo.charAt(palletNo.trim().length()-1)=='P') ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
+							(palletNo.charAt(palletNo.trim().length()-1)=='P') || (palletNo.charAt(palletNo.trim().length()-1)=='R')
+							 ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
 							System.out.println("Pallet No After removing suffix: "+palletNo);	
 
 							HashMap interfaceHmap = new HashMap();
@@ -547,7 +553,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						+" AND S.LOC_CODE = D.LOC_CODE"
 						+" AND S.SITE_CODE = D.SITE_CODE"
 						+" AND L.LOC_CODE = D.LOC_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
-						+" AND L.INV_STAT = 'AWMS'" //Changed by wasim on 20-08-2015 to add inv_stat validation
+						+" AND L.INV_STAT IN ('AWMS','AWMSQ')" 
 						+" AND I.ITEM_CODE = D.ITEM_CODE" //Changed by wasim on 20-08-2015 to add inv_stat validation
 						+" AND D.SALE_ORDER = ?";
 					pstmt = conn.prepareStatement(sql);
@@ -618,7 +624,8 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						palletNo = (palletNo.charAt(palletNo.trim().length()-1)=='Q') || (palletNo.charAt(palletNo.trim().length()-1)=='M') || 
 						(palletNo.charAt(palletNo.trim().length()-1)=='S') || (palletNo.charAt(palletNo.trim().length()-1)=='B') ||
 						(palletNo.charAt(palletNo.trim().length()-1)=='X') || (palletNo.charAt(palletNo.trim().length()-1)=='U') || 
-						(palletNo.charAt(palletNo.trim().length()-1)=='P') ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
+						(palletNo.charAt(palletNo.trim().length()-1)=='P') || (palletNo.charAt(palletNo.trim().length()-1)=='R')
+						 ? palletNo.substring(0,palletNo.trim().length()-1):palletNo;
 						System.out.println("Pallet No After removing suffix: "+palletNo);	
 
 						HashMap interfaceHmap = new HashMap();