modify for mfg type

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

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

@@ -417,6 +417,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 							+" and (sorder.cust_code = customer.cust_code ) " 
 							+" and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' ";
 					 */
+					
+		
 					sql=" select  a.sale_order,a.line_no,a.site_code,a.item_code,a.due_date,a.cust_code,a.cust_name," +
 							"a.quantity,a.unit,a.type,a.order_due_date  , a.order_date ,a.mfg_type  " +
 							"  from  ( " +
@@ -427,8 +429,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 							//"  sorditem.quantity quantity," +
 							"   ((case when sorditem.quantity is null then 0 else sorditem.quantity end - case when sorditem.qty_alloc is null then 0 else sorditem.qty_alloc end - case when sorditem.qty_desp is null then 0 else sorditem.qty_desp end )  * case when sorditem.conv__qty_stdqty is null then 1 else sorditem.conv__qty_stdqty end ) as quantity , " +
 							"  sorditem.unit unit,'SORD' as type  " +
-							"  ,sorder.due_date as order_due_date   , sorder.order_date ,item.mfg_type  " +
-							"  FROM sorder,sorditem, item ,customer" +
+							"  ,sorder.due_date as order_due_date   , sorder.order_date ,  siteitem.mfg_type  " +
+							"  FROM sorder,sorditem, item ,customer , siteitem " +
 							"  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" +
@@ -439,7 +441,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 							//"  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 )" +
-							"  and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y' " ;
+							"  and case when sorder.alloc_flag is null then 'N' else sorder.alloc_flag end <> 'Y'  " +
+							"  and ( siteitem.item_code = item.item_code ) and ( siteitem.site_code = sorditem.site_code )  " ;
 				
 					if("order_date".equalsIgnoreCase(viewByDate))
 					{
@@ -459,11 +462,13 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 							"  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 " +
-							"  ,mps_order.due_date as order_due_date  , mps_order.ord_date as order_date ,item.mfg_type  " +
-							"  from mps_order,item where  mps_order.item_code=item.item_code " +
+							"  ,mps_order.due_date as order_due_date  , mps_order.ord_date as order_date ,siteitem.mfg_type  " +
+							"  from mps_order,item , siteitem " +
+							"  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','N')) " +           // added N in condition on 26/06/14
-							"  and mps_order.site_code  >=  ?  AND mps_order.site_code  <= ? "  ;
+							"  and mps_order.site_code  >=  ?  AND mps_order.site_code  <= ?  " +
+							"  and ( siteitem.item_code = item.item_code )  and ( siteitem.site_code = mps_order.site_code )  "  ;
 					//	"  and  (mps_order.due_date >= ?  ) and      (mps_order.due_date  <= ?  )" ;
 
 					if("order_date".equalsIgnoreCase(viewByDate))
@@ -683,8 +688,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
 					//	orderType= genericUtility.getColumnValue("order_type",dom)==null?"":genericUtility.getColumnValue("order_type",dom);
 					argData.append("<order_type>").append(orderType).append("</order_type>\r\n");   // added by cpatil on 17/05/14 for BomReplace
 					System.out.println("@@@@@@@@:: order_type["+orderType+"]");
-
-					argData.append("<locGroupList>").append(locGroupList).append("</locGroupList>\r\n"); 
+//					xmlString.append("<site_code>").append("<![CDATA[").append(siteCode).append("]]>").append("</site_code>");
+					argData.append("<locGroupList>").append("<![CDATA[").append(locGroupList).append("]]>").append("</locGroupList>\r\n"); 
 					
 					argData.append("</Detail>");
 					argData.append("</Root>");