request Id:[W16DSUN008]

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

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

@@ -205,11 +205,11 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 						+" AND S.LOT_NO = D.LOT_NO"
 						+" AND S.LOT_SL = D.LOT_SL"
 						+" AND S.LOC_CODE = D.LOC_CODE"
-						+" AND S.SITE_CODE = H.SITE_CODE"
+						//+" AND S.SITE_CODE = H.SITE_CODE"
+						+" AND S.SITE_CODE = H.SITE_CODE__SHIP" //Changed by wasim on 14-07-2016 as per manoharan sir
 						+" 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
-						//Changed by wasim on 11-07-2016 to add inv_stat AWMS AND AWMSQ validation
-						//+" AND L.INV_STAT = 'AWMS'" 
+						//+" 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.DIST_ORDER = ?";
@@ -337,7 +337,6 @@ 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
-							//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