modify for alternate item and alloc_flag is not Y

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

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

@@ -8041,10 +8041,14 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
 											System.out.println("@@@@8035:originalOrAltitem["+originalOrAltitem+"]itemCode["+itemCode+"]stkKey[1]["+stkKey[1]+"]itemCodeParent["+itemCodeParent+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");	
 											if("A".equalsIgnoreCase(originalOrAltitem))
 											{
-												String prevItemValue = parentItemMap.get(itemCode)==null?"":parentItemMap.get(itemCode).toString(); 
-												valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + itemCodeParent + "]]>").append("</previous_item>\r\n");
+												String prevItemValue = parentItemMap.get(itemCodeParent)==null?"":parentItemMap.get(itemCodeParent).toString(); 
+												valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + prevItemValue + "]]>").append("</previous_item>\r\n");
+												
+												//String prevItemValue = parentItemMap.get(itemCode)==null?"":parentItemMap.get(itemCode).toString(); 
+												//valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + itemCodeParent + "]]>").append("</previous_item>\r\n");
 												
 											    String itemCodeParentBom = parentItemMap.get(itemCodeParent)==null?"":parentItemMap.get(itemCodeParent).toString();	
+											    
 												String prevItemWorder = itemWorkOrderMap.get(itemCodeParentBom)==null?"":itemWorkOrderMap.get(itemCodeParentBom).toString();	
 												valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[" + prevItemWorder + "]]>").append("</prev_item_worder>\r\n");
 												System.out.println("@@@@8047:prevItemValue["+prevItemValue+"]itemCodeParentBom["+itemCodeParentBom+"]prevItemWorder["+prevItemWorder+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");	

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

@@ -405,7 +405,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 item.mfg_type = 'O' "
-							+" and    (sorder.cust_code = customer.cust_code )";
+							+" 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  sorditem.sale_order as sale_order,sorditem.line_no as line_no," +
 							"sorditem.site_code as site_code," +