Changes done to include mps order

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

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

@@ -1239,12 +1239,15 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 			{
 				if ((CommonConstants.DB_NAME).equalsIgnoreCase("db2"))   /// added for db2 on 17/02/14
 				{
-					subQuery=" AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM SORDDET  WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN("+itemCodeList+") ) ";
+					//subQuery=" AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM SORDDET  WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN("+itemCodeList+") ) ";
+					subQuery=" AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM SORDDET  WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN("+itemCodeList+") " +
+							" UNION SELECT ITEM_CODE FROM MPS_ORDER  WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ";
 				}
 				else
 				{
 					//	subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDER WHERE SALE_ORDER IN("+sorderList+") ";
-					subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDDET WHERE SALE_ORDER||ITEM_CODE IN("+itemCodeList+") )";
+					subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDDET WHERE SALE_ORDER||ITEM_CODE IN("+itemCodeList+")" +
+							" UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE TRAN_ID||ITEM_CODE IN("+itemCodeList+") )";
 				}
 			}else if(isRequirement)
 			{

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

@@ -284,7 +284,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 		Boolean detail2Flag = false, detail4Flag=false;
 		
 		String custCode="",custName="",quantity="",unit="",loginSiteCode="";
-		
+		String orderType="";
 		
 		try
 		{   
@@ -406,11 +406,45 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 							+" and ( case when sorder.status is null then 'P' else sorder.status end = 'P')" 
 							//+" and item.mfg_type = 'O' "
 							+" and    (sorder.cust_code = customer.cust_code )";
+					
+					sql=" SELECT  sorditem.sale_order as sale_order,sorditem.line_no as line_no," +
+							"sorditem.site_code as site_code," +
+							" item.item_code__plan  as item_code,sorditem.due_date as due_date," +
+							" sorder.cust_code as cust_code, customer.cust_name as cust_name ," +
+							"   sorditem.quantity quantity,sorditem.unit unit,'SORD' as type " +
+							"  FROM sorder,sorditem, item ,customer" +
+							"  WHERE ( sorditem.item_code = item.item_code ) and" +
+							"(sorder.sale_order = sorditem.sale_order )" +
+							" and  (case when sorder.confirmed is null then 'N' else sorder.confirmed" +
+							" end         = 'Y' )" +
+							" and  (case when sorditem.consume_fc is null then 'Y' else" +
+							" sorditem.consume_fc end = 'N' )" +
+							" and  sorditem.site_code  >=  ?  AND sorditem.site_code  <= ?" +
+							"  and (sorditem.due_date >= ?  ) and      (sorditem.due_date <= ?  )" +
+							"  and ( case when sorder.status is null then 'P' else sorder.status end = 'P')" +
+							" and    (sorder.cust_code = customer.cust_code )" +
+							" UNION ALL" +
+							" select mps_order.tran_id as sale_order,'1' as" +
+							" line_no,mps_order.site_code as site_code," +
+							" item.item_code__plan as item_code,mps_order.due_date due_date,'' as " +
+							" cust_code,'' as cust_name, " +
+							"  mps_order.quantity as quantity,item.unit,'MPS' as type from mps_order,item where" +
+							" mps_order.item_code=item.item_code " +
+							"  and  ( case when mps_order.status is null then 'P' else " +
+							" mps_order.status end in ('P','T','M')) " +
+							"  and mps_order.site_code  >=  ?  AND mps_order.site_code  <= ? " +
+							"  and  (mps_order.due_date >= ?  ) and      (mps_order.due_date " +
+							" <= ?  )" ;
+							
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,siteCodeFr);
 					pstmt.setString(2,siteCodeTo);
 					pstmt.setTimestamp(3,dateFr);
 					pstmt.setTimestamp(4,dateTo);
+					pstmt.setString(5,siteCodeFr);
+					pstmt.setString(6,siteCodeTo);
+					pstmt.setTimestamp(7,dateFr);
+					pstmt.setTimestamp(8,dateTo);
 					rs = pstmt.executeQuery();
 					while(rs.next())
 					{					
@@ -422,6 +456,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 						custName = checkNull(rs.getString("cust_name"));
 						quantity = checkNull(rs.getString("quantity"));
 						unit = checkNull(rs.getString("unit"));
+						orderType = checkNull(rs.getString("type"));
 						System.out.println(saleOrder+"@"+lineNo+"@"+itemCode);
 						domID ++;
 						valueXmlString.append( "<Detail2 domID='"+ domID +"' selected = 'N'>\r\n" );
@@ -434,6 +469,7 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 						valueXmlString.append( "<cust_name><![CDATA[" ).append(custName).append("]]></cust_name>\r\n" );
 						valueXmlString.append( "<quantity><![CDATA[" ).append(quantity).append("]]></quantity>\r\n" );
 						valueXmlString.append( "<unit><![CDATA[" ).append(unit).append("]]></unit>\r\n" );
+						valueXmlString.append( "<orderType><![CDATA[" ).append(orderType).append("]]></orderType>\r\n" );
 						valueXmlString.append( "</Detail2>\r\n" );  
 
 					}