Due_date condition added for display mps records in second screen

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

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

@@ -144,7 +144,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 
 		String winName = ""; // Added by sachin on 26/6/13
 		double batchReq = 0d;
-		
+		String dbDateFrom="",fromDate="",toDate="",dbDateTo="";
 
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		try
@@ -199,12 +199,37 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 					 */
 
 					/* Change By Sachin on 26/6/2013 */
+					Calendar cal = Calendar.getInstance();
+					Date d = new Date();
+					String runDate = simpleDateFormat.format(d);
+					cal.setTime(d);
+					cal.set(Calendar.DATE, 1);
+					d = cal.getTime();
+					fromDate = simpleDateFormat.format(d);
+					System.out.println("fromDate>>>>>"+fromDate);
+					dbDateFrom = genericUtility.getValidDateString(fromDate, genericUtility.getApplDateFormat(), "dd-MMM-yyyy");
+					System.out.println("dbDateFrom>>>>"+dbDateFrom);
 					
-					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 " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
+					cal.setTime(d);
+					cal.add(Calendar.MONTH, 3);
+					cal.set(Calendar.DATE, 0);
+					d = cal.getTime();
+					toDate = simpleDateFormat.format(d);
+					dbDateTo = genericUtility.getValidDateString(toDate, genericUtility.getApplDateFormat(), "dd-MMM-yyyy");
+					System.out.println("dbDateTo>>>>"+dbDateTo);
+					
+					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";
 
 					pstmt = conn.prepareStatement(selectSql);
 					pstmt.setString(1, siteCodeFr);
 					pstmt.setString(2, siteCodeTo);
+					pstmt.setString(3, dbDateFrom);
+					pstmt.setString(4, dbDateTo);
 					rs = pstmt.executeQuery();
 					while (rs.next())
 					{
@@ -533,12 +558,12 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
 					cal.setTime(d);
 					cal.set(Calendar.DATE, 1);
 					d = cal.getTime();
-					String fromDate = simpleDateFormat.format(d);
+					fromDate = simpleDateFormat.format(d);
 					cal.setTime(d);
 					cal.add(Calendar.MONTH, 3);
 					cal.set(Calendar.DATE, 0);
 					d = cal.getTime();
-					String toDate = simpleDateFormat.format(d);
+					toDate = simpleDateFormat.format(d);
 					System.out.println("From Date :" + fromDate + " To Date :" + toDate);
 					System.out.println("siteCodeFr:"+siteCodeFr+"siteCodeTo"+siteCodeTo);
 					System.out.println("itemCodeFr:"+itemCodeFr+"itemCodeTo"+itemCodeTo);