change sql

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

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

@@ -17887,12 +17887,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
 					+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y'  AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? "
 					+ "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N')  "
-					+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S'  and nvl((SELECT sum(quantity) "
-					+ "FROM STOCK WHERE  SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0  "
-					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  (ITEM_CODE <> ? OR LOT_NO <> ?) " //5
-					+ "and SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT =0),0) = 0  "
-					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  ITEM_CODE <> ? and  SITE_CODE = ? "
-					+ "AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT =0),0) = 0  ";
+					+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S'  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  ITEM_CODE <> ? and  SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),1) = 0  ";
 			
 			
 			/*@@orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O  WHERE O.LOC_CODE__TO = ? " 
@@ -18437,12 +18435,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
 					+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y'  AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? "
 					+ "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N')  "
-					+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S'  and nvl((SELECT sum(quantity) "
-					+ "FROM STOCK WHERE  SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0  "
-					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  (ITEM_CODE <> ? OR LOT_NO <> ?) " //5
-					+ "and SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT =0),0) = 0  "
-					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  ITEM_CODE <> ? and  SITE_CODE = ? "//8
-					+ "AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT =0),0) = 0 ";
+					+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S'  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0  "
+					+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE  ITEM_CODE <> ? and  SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND  stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),1) = 0  ";
 			// ORDER BY ABS(A.LOC_ZONE - ? ),A.LOC_CODE";
 			
 			if ( "A".equalsIgnoreCase(pickType.trim()) )