Skip to content

B
business-java
Commit e75b1cae authored by cpatil's avatar cpatil
Browse files
Options

merge changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97339 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2dcb2ef4
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ e75b1cae
...@@ -9445,9 +9445,16 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -9445,9 +9445,16 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//adpElement = (ADPElement) adpeList1.get(adpeCount); //adpElement = (ADPElement) adpeList1.get(adpeCount);
adpElement = (ADPElement) (adpeList).get(adpeCount); adpElement = (ADPElement) (adpeList).get(adpeCount);
//cpatil-25/08/14-System.out.println("Printing adpeCount---" + adpeCount); //cpatil-25/08/14-System.out.println("Printing adpeCount---" + adpeCount);
prevItemValue=adpElement.getItemCodeParent(); //prevItemValue=adpElement.getItemCodeParent();
siteCode = adpElement.getSiteCode(); siteCode = adpElement.getSiteCode();
itemCode = adpElement.getItemCode(); itemCode = adpElement.getItemCode();
if(parentItemMap.size()>0)
{
if(parentItemMap.containsKey(itemCode))
{
prevItemValue=(String) parentItemMap.get(itemCode);
}
}
maxQty = adpElement.getMaxQty(); maxQty = adpElement.getMaxQty();
minQty = adpElement.getMinQty(); minQty = adpElement.getMinQty();
suppSour = adpElement.getSuppSour(); suppSour = adpElement.getSuppSour();
...@@ -10195,7 +10202,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -10195,7 +10202,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String itemCodeParentBom = parentItemMap.get(itemCodeParent)==null?"":parentItemMap.get(itemCodeParent).toString(); String itemCodeParentBom = parentItemMap.get(itemCodeParent)==null?"":parentItemMap.get(itemCodeParent).toString();
String prevItemWorder = itemWorkOrderMap.get(itemCodeParentBom)==null?"":itemWorkOrderMap.get(itemCodeParentBom).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"); //valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[" + prevItemWorder + "]]>").append("</prev_item_worder>\r\n");
valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[]]>").append("</prev_item_worder>\r\n");
//cpatil-25/08/14-System.out.println("@@@@8047:prevItemValue["+prevItemValue+"]itemCodeParentBom["+itemCodeParentBom+"]prevItemWorder["+prevItemWorder+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]"); //cpatil-25/08/14-System.out.println("@@@@8047:prevItemValue["+prevItemValue+"]itemCodeParentBom["+itemCodeParentBom+"]prevItemWorder["+prevItemWorder+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");
} }
else else
...@@ -10203,7 +10211,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -10203,7 +10211,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("@@@@@@@@9874:::parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]"); System.out.println("@@@@@@@@9874:::parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");
//String prevItemValue = parentItemMap.get(stkKey[1])==null?"":parentItemMap.get(stkKey[1]).toString(); //String prevItemValue = parentItemMap.get(stkKey[1])==null?"":parentItemMap.get(stkKey[1]).toString();
valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + prevItemValue + "]]>").append("</previous_item>\r\n"); valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + prevItemValue + "]]>").append("</previous_item>\r\n");
valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[" + (itemWorkOrderMap.get(prevItemValue)==null?"":itemWorkOrderMap.get(prevItemValue).toString()) + "]]>").append("</prev_item_worder>\r\n"); //valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[" + (itemWorkOrderMap.get(prevItemValue)==null?"":itemWorkOrderMap.get(prevItemValue).toString()) + "]]>").append("</prev_item_worder>\r\n");
valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[]]>").append("</prev_item_worder>\r\n");
//cpatil-25/08/14-System.out.println("@@@@8054:prevItemValue["+prevItemValue+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]"); //cpatil-25/08/14-System.out.println("@@@@8054:prevItemValue["+prevItemValue+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment