Request Id:[W15JSUN017] update sql for inv_stat.

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

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

@@ -554,7 +554,8 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 						else 
 						{
 							//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017 
-							sql = "SELECT COUNT(1) FROM STOCK S ,LOCATION L WHERE L.INV_STAT IN(?,?) AND S.LOC_CODE IN(?,?,?,?,?,?,?,?) AND L.SITE_CODE=? AND S.ITEM_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 ";
+							//sql = "SELECT COUNT(1) FROM STOCK S ,LOCATION L WHERE L.INV_STAT IN(?,?) AND S.LOC_CODE IN(?,?,?,?,?,?,?,?) AND L.SITE_CODE=? AND S.ITEM_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 ";
+							sql = "SELECT COUNT(1) FROM STOCK S ,LOCATION L WHERE S.INV_STAT IN(?,?) AND S.LOC_CODE IN(?,?,?,?,?,?,?,?) AND S.SITE_CODE=? AND S.ITEM_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 ";
 							
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, "AWMS");
@@ -751,8 +752,12 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 							//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017 
 							//site_code is not consider for location table
-							sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+							/*sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
 							"WHERE L.INV_STAT IN (?,?) AND L.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE= ? " +
+							"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.LOT_SL = ?";*/
+							
+							sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+							"WHERE S.INV_STAT IN (?,?) AND S.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE= ? " +
 							"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE = ? AND S.LOT_NO = ? AND S.LOT_SL = ?";
 
 							pstmt = conn.prepareStatement(sql);
@@ -835,8 +840,12 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 							//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017 
 							//site_code is not consider for location table
-							sql = "SELECT S.QUANTITY FROM STOCK S ,LOCATION L WHERE L.INV_STAT IN (?,?) " +
+							/*sql = "SELECT S.QUANTITY FROM STOCK S ,LOCATION L WHERE L.INV_STAT IN (?,?) " +
 							"AND L.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  " +
+							"AND  S.ITEM_CODE=? AND S.LOT_NO=? AND  S.LOT_SL=? ";*/
+							
+							sql = "SELECT S.QUANTITY FROM STOCK S ,LOCATION L WHERE S.INV_STAT IN (?,?) " +
+							"AND S.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  " +
 							"AND  S.ITEM_CODE=? AND S.LOT_NO=? AND  S.LOT_SL=? ";
 
 							pstmt = conn.prepareStatement(sql);
@@ -1218,9 +1227,14 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 					//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017 
 					//site_code is not consider for location table
-					sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+					/*sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
 					"WHERE L.INV_STAT IN (?,?)AND L.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? " +
+					"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";*/
+					
+					sql = "SELECT S.QUANTITY, S.QTY_PER_ART FROM STOCK S ,LOCATION L " +
+					"WHERE S.INV_STAT IN (?,?)AND S.LOC_CODE IN (?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? " +
 					"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND S.LOT_NO=? AND S.LOT_SL=?";
+					
 					PreparedStatement pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "AWMS");
 					pstmt.setString(2, "AWMSQ");
@@ -1375,9 +1389,14 @@ public class PalletReqIC extends ValidatorEJB implements PalletReqICLocal, Palle
 
 						//Change by Jagruti Shinde for Exempted /BSR Location Request Id:W15JSUN017 
 						//site_code is not consider for location table
-						sql = "SELECT S.QTY_PER_ART FROM STOCK S ,LOCATION L" +
+						/*sql = "SELECT S.QTY_PER_ART FROM STOCK S ,LOCATION L" +
 						" WHERE L.INV_STAT IN(?,?) AND L.LOC_CODE IN(?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? AND" +
 						" S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND " +
+						"S.LOT_NO=? AND S.LOT_SL=? ";*/
+						
+						sql = "SELECT S.QTY_PER_ART FROM STOCK S ,LOCATION L" +
+						" WHERE S.INV_STAT IN(?,?) AND S.LOC_CODE IN(?,?,?,?,?,?,?,?) AND  S.SITE_CODE=? AND" +
+						" S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0  AND  S.ITEM_CODE=? AND " +
 						"S.LOT_NO=? AND S.LOT_SL=? ";
 						
 						PreparedStatement pstmt = conn.prepareStatement(sql);