confirmed bom,active item,active bom condition added

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

webitm-mfg/ibase/webitm/ejb/mfg/RequirementIC.java

@@ -224,13 +224,26 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 					
 					dbDateToTime = java.sql.Timestamp.valueOf(sdf1.format(d)+" 00:00:00.0");
 					System.out.println("dbDateToTime>>>>>>>>"+dbDateToTime);
+					//Chaned by Manoj dtd 11/03/2016 to consider active and confirmed bom and check from siteitem insetead of item
+					selectSql="SELECT  A.SITE_CODE, A.ITEM_CODE, D.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY, "
+							+ " C.BOM_CODE ,'MPS' AS MPSORDER "
+							+ " FROM MPS_ORDER A, SITEITEM B ,BOM C,ITEM D WHERE "
+							+ "( A.ITEM_CODE = B.ITEM_CODE AND B.ITEM_CODE =C.ITEM_CODE AND C.ITEM_CODE=D.ITEM_CODE "
+							//+ " AND CASE WHEN D.ACTIVE IS NULL THEN 'N' ELSE D.ACTIVE END='Y' "
+							+ "  AND A.SITE_CODE=B.SITE_CODE ) "
+							+ " AND A.SITE_CODE >= ? AND A.SITE_CODE <=?  AND A.STATUS IN ('P','T','M') "
+							+ " AND A.BOM_CODE=C.BOM_CODE "
+							+ " AND A.DUE_DATE >= ? and A.DUE_DATE <= ? "
+							+ " AND CASE WHEN C.CONFIRMED IS NULL THEN 'N' ELSE C.CONFIRMED END = 'Y' "
+							+ "  AND CASE WHEN C.ACTIVE IS NULL THEN 'N' ELSE C.ACTIVE END = 'Y' "
+							+ " GROUP BY A.SITE_CODE, A.ITEM_CODE, D.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
 					
-					selectSql = "SELECT  A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY, C.BOM_CODE ,'MPS' AS MPSORDER " 
+					/*selectSql = "SELECT  A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY, C.BOM_CODE ,'MPS' AS MPSORDER " 
 								+ "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) "
 								+ "AND A.SITE_CODE >= ? AND A.SITE_CODE <=? " + "AND A.STATUS IN ('P','T','M') "
 								+ "AND A.BOM_CODE=C.BOM_CODE "
 								+ "AND A.DUE_DATE >= ? and A.DUE_DATE <= ? "
-								+ "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
+								+ "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";*/
 
 					pstmt = conn.prepareStatement(selectSql);
 					pstmt.setString(1, siteCodeFr);
@@ -494,12 +507,26 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 							}
 							else
 							{
-								selectSql = "SELECT  A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY," +
+								//Chaned by Manoj dtd 11/03/2016 to consider active and confirmed bom and check from siteitem insetead of item
+								selectSql="SELECT  A.SITE_CODE, A.ITEM_CODE, D.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY, "
+										+ " C.BOM_CODE ,'MPS' AS MPSORDER "
+										+ " FROM MPS_ORDER A, SITEITEM B ,BOM C,ITEM D WHERE "
+										+ "( A.ITEM_CODE = B.ITEM_CODE AND B.ITEM_CODE =C.ITEM_CODE AND C.ITEM_CODE=D.ITEM_CODE "
+										//+ " AND CASE WHEN D.ACTIVE IS NULL THEN 'N' ELSE D.ACTIVE END='Y' "
+										+ "  AND A.SITE_CODE=B.SITE_CODE ) "
+										+ " AND A.SITE_CODE = ? AND A.ITEM_CODE=? AND A.STATUS IN ('P','T','M') "
+										+ " AND A.BOM_CODE=C.BOM_CODE "
+										+ " AND A.DUE_DATE >= ? and A.DUE_DATE <= ? "
+										+ " AND CASE WHEN C.CONFIRMED IS NULL THEN 'N' ELSE C.CONFIRMED END = 'Y' "
+										+ "  AND CASE WHEN C.ACTIVE IS NULL THEN 'N' ELSE C.ACTIVE END = 'Y' "
+										+ " GROUP BY A.SITE_CODE, A.ITEM_CODE, D.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
+								
+								/*selectSql = "SELECT  A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY," +
 										" C.BOM_CODE ,'MPS' AS MPSORDER " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " 
 										+ "AND A.SITE_CODE = ? AND A.ITEM_CODE = ? " 
 										+ "AND A.DUE_DATE >= ? and A.DUE_DATE <= ? "
 										+ "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " 
-										+ "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
+										+ "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";*/
 
 								pstmt = conn.prepareStatement(selectSql);
 								pstmt.setString(1, siteCodeFr);
@@ -1118,10 +1145,13 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 			conn = connDriver.getConnectDB("DriverITM");
 			if(search != null && search.trim().length() > 0)
 			{	
-				//sql = " SELECT ITEM_CODE,DESCR,UNIT,BOM_CODE FROM ITEM  WHERE ITEM_CODE LIKE  ? ";
+				
 				sql = "SELECT S.ITEM_CODE,I.DESCR,I.UNIT,S.BOM_CODE FROM SITEITEM S,ITEM I,BOM B " +
 						"WHERE S.ITEM_CODE=I.ITEM_CODE AND B.ITEM_CODE=I.ITEM_CODE AND " +
-						"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? AND S.ITEM_CODE LIKE ? ";
+						"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? "
+						+ " AND CASE WHEN I.ACTIVE IS NULL THEN 'N' ELSE I.ACTIVE END='Y' "
+						+ " AND CASE WHEN B.CONFIRMED IS NULL THEN 'N' ELSE B.CONFIRMED END = 'Y' "
+						+ " AND CASE WHEN B.ACTIVE IS NULL THEN 'N' ELSE B.ACTIVE END = 'Y' AND S.ITEM_CODE LIKE ? ";
 				System.out.println("sql:::"+sql);
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, siteCode);
@@ -1171,7 +1201,11 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 				//selectSql = " SELECT ITEM_CODE,DESCR,UNIT,BOM_CODE FROM ITEM WHERE SITE_CODE = ? ORDER BY ITEM_CODE  ";
 				selectSql = "SELECT S.ITEM_CODE,I.DESCR,I.UNIT,S.BOM_CODE FROM SITEITEM S,ITEM I,BOM B " +
 							"WHERE S.ITEM_CODE=I.ITEM_CODE AND B.ITEM_CODE=I.ITEM_CODE AND " +
-							"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? ORDER BY S.ITEM_CODE";
+							"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? " 
+							+ " AND CASE WHEN I.ACTIVE IS NULL THEN 'N' ELSE I.ACTIVE END='Y' "
+							+ " AND CASE WHEN B.CONFIRMED IS NULL THEN 'N' ELSE B.CONFIRMED END = 'Y' "
+							+ " AND CASE WHEN B.ACTIVE IS NULL THEN 'N' ELSE B.ACTIVE END = 'Y' "
+							+ " ORDER BY S.ITEM_CODE";
 				pstmt = conn.prepareStatement(selectSql);
 				pstmt.setString(1, siteCode);
 				rs = pstmt.executeQuery();
@@ -1219,7 +1253,11 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 				//selectSql = " SELECT ITEM_CODE,DESCR,UNIT,BOM_CODE FROM ITEM  WHERE ITEM_CODE LIKE  ? ";
 				selectSql = "SELECT S.ITEM_CODE,I.DESCR,I.UNIT,S.BOM_CODE FROM SITEITEM S,ITEM I,BOM B " +
 							"WHERE S.ITEM_CODE=I.ITEM_CODE AND B.ITEM_CODE=I.ITEM_CODE AND " +
-							"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? AND S.ITEM_CODE LIKE ? ";
+							"S.BOM_CODE = B.BOM_CODE AND S.SITE_CODE = ? " 
+							+ " AND CASE WHEN I.ACTIVE IS NULL THEN 'N' ELSE I.ACTIVE END='Y' "
+							+ " AND CASE WHEN B.CONFIRMED IS NULL THEN 'N' ELSE B.CONFIRMED END = 'Y' "
+							+ " AND CASE WHEN B.ACTIVE IS NULL THEN 'N' ELSE B.ACTIVE END = 'Y' "
+							+ " AND S.ITEM_CODE LIKE ? ";
 				pstmt = conn.prepareStatement(selectSql);
 				pstmt.setString(1, siteCode);
 				pstmt.setString(2, itemCode+"%");