[W15HSUN013]Changes in SQL for optimise Expire and Near expire stock retrieving query.

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

webitm-wms/ibase/webitm/utility/wms/NearExpirySchedule.java

@@ -247,7 +247,8 @@ public class NearExpirySchedule implements Schedule
 			
 			//SQL For expiry process 
 			System.out.println(" Calling expiry process *************$$$$$$$$**********************");
-			selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
+			//Changed By Samadhan on 20/11/2015 for Optimise SQL Start
+			/*selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
 						"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
 						"A.REMARKS, D.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE," +
 						"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE,"+
@@ -265,7 +266,23 @@ public class NearExpirySchedule implements Schedule
 						" AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL "+
 						//Changed by sumit sarkar on 03/07/12 
 						" AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
-						" AND A.EXP_DATE <= SYSDATE ";
+						" AND A.EXP_DATE <= SYSDATE ";*/
+			
+			selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
+						"A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE, "+
+						"A.REMARKS, A.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE, " +
+						"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE, "+
+						"A.CONV__QTY_STDUOM, A.UNIT__ALT, A.BATCH_NO, A.ACCT_CODE__INV,A.CCTR_CODE__INV "+
+						"FROM STOCK A, INVSTAT B "+
+						"WHERE A.INV_STAT = B.INV_STAT "+
+						"AND CASE WHEN B.AVAILABLE IS NULL THEN 'N' ELSE B.AVAILABLE END  IN('Y','N') "+
+						"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+						"AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 "+
+						"AND A.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL "+
+						"AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
+						"AND A.EXP_DATE <= SYSDATE ";
+			//Changed By Samadhan on 20/11/2015 for Optimise SQL End
+			
 			if( "YES".equalsIgnoreCase(siteCodeFromDisPa))
 			{
 				//taking site as a login site code 
@@ -529,7 +546,9 @@ public class NearExpirySchedule implements Schedule
 			//Changed by sumit sarkar on 03/06/12  SQL For near expiry process start.
 			System.out.println(" Calling near expiry *******************************");
 			selectSql = "";
-			selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
+			
+			//Changed By Samadhan on 20/11/2015 for Optimise SQL Start
+			/*selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
 						"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
 						"A.REMARKS, D.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE," +
 						"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE,"+
@@ -547,7 +566,24 @@ public class NearExpirySchedule implements Schedule
 						" AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL AND A.EXP_DATE > SYSDATE"+
 						//Changed by sumit sarkar on 03/07/12  start
 						" AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
-						" AND A.EXP_DATE <= ADD_MONTHS(SYSDATE,C.MIN_SHELF_LIFE) ";
+						" AND A.EXP_DATE <= ADD_MONTHS(SYSDATE,C.MIN_SHELF_LIFE) ";*/
+			
+			selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
+						"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE, "+
+						"A.REMARKS, A.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE, " +
+						"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE, "+
+						"A.CONV__QTY_STDUOM, A.UNIT__ALT, A.BATCH_NO, A.ACCT_CODE__INV,A.CCTR_CODE__INV "+
+						"FROM STOCK A, INVSTAT B, ITEM C "+
+						"WHERE A.INV_STAT = B.INV_STAT "+
+						"AND A.ITEM_CODE = C.ITEM_CODE AND CASE WHEN B.AVAILABLE IS NULL THEN 'N' ELSE B.AVAILABLE END  IN('Y','N') "+
+						"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+						"AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 "+
+						"AND A.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL AND A.EXP_DATE > SYSDATE "+
+						"AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
+						"AND A.EXP_DATE <= ADD_MONTHS(SYSDATE,C.MIN_SHELF_LIFE) ";
+
+			//Changed By Samadhan on 20/11/2015 for Optimise SQL End
+			
 			if( "YES".equalsIgnoreCase(siteCodeFromDisPa))
 			{
 				//taking site as a login site code