Commit 779ab8df authored by manohar's avatar manohar

Changes done at Supreme merged


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95267 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 07aee8a3
...@@ -329,7 +329,10 @@ class ADPElement ...@@ -329,7 +329,10 @@ class ADPElement
public void setBomCodeParent(String bomCodeParent) public void setBomCodeParent(String bomCodeParent)
{ {
this.bomCodeParent = bomCodeParent; if (this.bomCodeParent == null || "null".equals(this.bomCodeParent) || this.bomCodeParent.trim().length() == 0)
{
this.bomCodeParent = bomCodeParent;
}
} }
public String getBomCodeParent() // setBomCodeParent public String getBomCodeParent() // setBomCodeParent
{ {
...@@ -675,6 +678,7 @@ class ADPElement ...@@ -675,6 +678,7 @@ class ADPElement
System.out.println("618---timeMRPArr.size() "+timeMRPArr.size() +"----"+dueDate+"---"+demand+"----"+supply+"----"+stockQty); System.out.println("618---timeMRPArr.size() "+timeMRPArr.size() +"----"+dueDate+"---"+demand+"----"+supply+"----"+stockQty);
try try
{ {
timeEle = -1;
if (timeMRPArr.size() > 0) if (timeMRPArr.size() > 0)
{ {
for (ctr = 0; ctr < timeMRPArr.size(); ctr++) for (ctr = 0; ctr < timeMRPArr.size(); ctr++)
...@@ -712,9 +716,11 @@ class ADPElement ...@@ -712,9 +716,11 @@ class ADPElement
timeMRP = (TimeMRP)this.timeMRPArr.get(timeEle); timeMRP = (TimeMRP)this.timeMRPArr.get(timeEle);
//added by sabyasachi 29.03.2011 //added by sabyasachi 29.03.2011
//timeMRP.setDemand(demand,saleOrder,lineNo); //timeMRP.setDemand(demand,saleOrder,lineNo);
System.out.println("before setDemand() [" + demand + "] supply [" + supply + "]" );
timeMRP.setDemand(demand); timeMRP.setDemand(demand);
//end added by sabyasachi 29.03.2011 //end added by sabyasachi 29.03.2011
timeMRP.setSupply(supply); timeMRP.setSupply(supply);
System.out.println("after setSupply()" );
// 12/04/10 manoharan MF90BHU001 // 12/04/10 manoharan MF90BHU001
timeMRP.setStockQty(stockQty); timeMRP.setStockQty(stockQty);
timeMRP.setOthSupply(othSupply); timeMRP.setOthSupply(othSupply);
...@@ -723,7 +729,9 @@ class ADPElement ...@@ -723,7 +729,9 @@ class ADPElement
//timeMRP.setLineNo(lineNo); //timeMRP.setLineNo(lineNo);
this.timeMRPArr.set(timeEle,timeMRP); this.timeMRPArr.set(timeEle,timeMRP);
} }
System.out.println("before updateRunningDemandSupply()" );
updateRunningDemandSupply(dueDate); updateRunningDemandSupply(dueDate);
System.out.println("after updateRunningDemandSupply()" );
} }
catch(Exception e) catch(Exception e)
{ {
......
...@@ -194,11 +194,12 @@ public class ExplodeBom ...@@ -194,11 +194,12 @@ public class ExplodeBom
considerLotNoIssue = rs.getString(18); considerLotNoIssue = rs.getString(18);
// 11-08-2007 manoharan // 11-08-2007 manoharan
itemActive = rs.getString("ACTIVE"); itemActive = rs.getString("ACTIVE");
if (itemActive == null) System.out.println("12/06/14 itemActive before[ " +itemActive + "]");
if (itemActive == null || "null".equals(itemActive))
{ {
itemActive = "Y"; itemActive = "Y";
} }
System.out.println("12/06/14 itemActive after[ " +itemActive + "]");
sqlInner = "SELECT SUPP_SOUR, BOM_CODE ,UNIT,NET_WEIGHT,item_type,item_ser " //added unit,NET_WEIGHT by rajendra sqlInner = "SELECT SUPP_SOUR, BOM_CODE ,UNIT,NET_WEIGHT,item_type,item_ser " //added unit,NET_WEIGHT by rajendra
+ "FROM ITEM " + "FROM ITEM "
+ "WHERE ITEM_CODE = ?"; + "WHERE ITEM_CODE = ?";
...@@ -250,12 +251,12 @@ public class ExplodeBom ...@@ -250,12 +251,12 @@ public class ExplodeBom
rsInner = null;//Added by Jiten 13/11/06 - rsInner = null;//Added by Jiten 13/11/06 -
pstmtInner.close(); pstmtInner.close();
pstmtInner = null;//Added by Jiten 13/11/06 - pstmtInner = null;//Added by Jiten 13/11/06 -
System.out.println("12/06/14 siteItemActive [ " +siteItemActive + "]");
if (siteItemActive == null) if (siteItemActive == null || "null".equals(siteItemActive))
{ {
siteItemActive = "Y"; siteItemActive = "Y";
} }
System.out.println("12/06/14 siteItemActive after[ " +siteItemActive + "]");
if ("N".equalsIgnoreCase(itemActive) || "N".equalsIgnoreCase(siteItemActive) ) if ("N".equalsIgnoreCase(itemActive) || "N".equalsIgnoreCase(siteItemActive) )
{ {
continue; continue;
...@@ -404,7 +405,7 @@ public class ExplodeBom ...@@ -404,7 +405,7 @@ public class ExplodeBom
{ {
pstmtInner.close(); pstmtInner.close();
pstmtInner = null;//Added by Jiten 13/11/06 - pstmtInner = null;//Added by Jiten 13/11/06 -
sqlInner = "SELECT ITEM_STRU FROM ITEM WHERE ITEM_CODE = ?"; sqlInner = "SELECT case when ITEM_STRU is null then 'S' else ITEM_STRU end FROM ITEM WHERE ITEM_CODE = ?";
pstmtInner = conn.prepareStatement(sqlInner); pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,itemCode); pstmtInner.setString(1,itemCode);
rsInner = pstmtInner.executeQuery(); rsInner = pstmtInner.executeQuery();
......
...@@ -321,9 +321,13 @@ public class MRPWizardXmlDataBean ...@@ -321,9 +321,13 @@ public class MRPWizardXmlDataBean
for (int cntr = 0; cntr < orderDtlList.getLength(); cntr++) for (int cntr = 0; cntr < orderDtlList.getLength(); cntr++)
{ {
Node detail2Node = orderDtlList.item(cntr); Node detail2Node = orderDtlList.item(cntr);
//System.out.println("@@@@@@@@@ node name[" + detail2Node.getNodeName()+"]"); //System.out.println("13/06/14 supreme node name[" + detail2Node.getNodeName()+"] detail2Node.getTextContent() [" + detail2Node.getTextContent() + "]");
{ {
if("supp_sour".equalsIgnoreCase( detail2Node.getNodeName()))
{
suppSour = detail2Node.getTextContent();
}
if("sale_order".equalsIgnoreCase( detail2Node.getNodeName())) if("sale_order".equalsIgnoreCase( detail2Node.getNodeName()))
{ {
saleOrder = detail2Node.getTextContent(); saleOrder = detail2Node.getTextContent();
...@@ -392,19 +396,21 @@ public class MRPWizardXmlDataBean ...@@ -392,19 +396,21 @@ public class MRPWizardXmlDataBean
{ {
itemCodeDetailMapStr = bomCodeParent; itemCodeDetailMapStr = bomCodeParent;
} }
System.out.println("@@@@@ itemCodeDetailMap in bean deleteBomList["+deleteBomList+"]deleteSaleOrderList["+deleteSaleOrderList+"]");
if( !(( deleteBomList.contains(bomCodeParent) ) && deleteSaleOrderList.contains(saleOrder+"@"+lineNo))) if( !(deleteBomList.contains(bomCodeParent) && deleteSaleOrderList.contains(saleOrder+"@"+lineNo)))
{ {
System.out.println("14/06/14 supreme 1 inside itemCode ["+itemCode+"]bomCodeRef["+bomCodeRef+"] suppSour [" + suppSour);
ArrayList tempdetail4OuterList = new ArrayList(); ArrayList tempdetail4OuterList = new ArrayList();
ArrayList tempdetail4List = new ArrayList(); ArrayList tempdetail4List = new ArrayList();
//System.out.println("@@@@ inside first if...."); //System.out.println("@@@@ inside first if....");
if( bomCodeRef != null && ! (bomCodeParent.equalsIgnoreCase(bomCodeRef)) && bomCodeRef.trim().length() >0 && itemCodeDetailMapStr.contains(bomCodeParent)) if (( (bomCodeRef != null && bomCodeRef.trim().length() > 0 ) ) && ( (itemCodeDetailMapStr.contains(bomCodeParent)) && ( !bomCodeOrg.equalsIgnoreCase(bomCodeRef)) ))
{ {
System.out.println("14/06/14 supreme 2 inside itemCode ["+itemCode+"]bomCodeRef["+bomCodeRef+"] suppSour [" + suppSour);
System.out.println("14/06/14 Before recalculate itemCode {" + itemCode +"] bomCodeRef [" + bomCodeRef + "] bomCodeParent [" + bomCodeParent+ "]" );
//System.out.println("@@@@ inside second if...."); //System.out.println("@@@@ inside second if....");
// for creating existing row // for creating existing row
domCnt++; /* 13/06/14 manoharan domCnt++;
// valueXmlString = // valueXmlString =
valueXmlString.append("<Detail2 domID='" + domCnt + "' >\r\n"); valueXmlString.append("<Detail2 domID='" + domCnt + "' >\r\n");
valueXmlString.append("<reference protect = '1'>"); valueXmlString.append("<reference protect = '1'>");
...@@ -470,7 +476,7 @@ public class MRPWizardXmlDataBean ...@@ -470,7 +476,7 @@ public class MRPWizardXmlDataBean
} }
} }
//end detail4 //end detail4
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n"); *//// 13/06/14 manoharan
//System.out.println("@@@@@@@@@ 326 xmldata============[["+xmldata+"]]"); //System.out.println("@@@@@@@@@ 326 xmldata============[["+xmldata+"]]");
...@@ -512,12 +518,13 @@ public class MRPWizardXmlDataBean ...@@ -512,12 +518,13 @@ public class MRPWizardXmlDataBean
argData.append("<saleOrderReplaceBom>").append(saleOrder).append("</saleOrderReplaceBom>\r\n"); // added by cpatil on 17/05/14 for BomReplace argData.append("<saleOrderReplaceBom>").append(saleOrder).append("</saleOrderReplaceBom>\r\n"); // added by cpatil on 17/05/14 for BomReplace
argData.append("<lineNoReplaceBom>").append(lineNo).append("</lineNoReplaceBom>\r\n"); // added by cpatil on 17/05/14 for BomReplace argData.append("<lineNoReplaceBom>").append(lineNo).append("</lineNoReplaceBom>\r\n"); // added by cpatil on 17/05/14 for BomReplace
argData.append("<bom_code_parent>").append(bomCodeParent).append("</bom_code_parent>\r\n"); // added by cpatil on 17/05/14 for BomReplace
argData.append("<site_code__from>").append(siteCode).append("</site_code__from>\r\n"); argData.append("<site_code__from>").append(siteCode).append("</site_code__from>\r\n");
argData.append("<site_code__to>").append(siteCode).append("</site_code__to>\r\n"); argData.append("<site_code__to>").append(siteCode).append("</site_code__to>\r\n");
argData.append("<item_code__from>").append("00").append("</item_code__from>\r\n"); argData.append("<item_code__from>").append(itemCode).append("</item_code__from>\r\n");
argData.append("<item_code__to>").append("ZZ").append("</item_code__to>\r\n"); argData.append("<item_code__to>").append(itemCode).append("</item_code__to>\r\n");
argData.append("<item_ser__from>").append("0").append("</item_ser__from>\r\n"); argData.append("<item_ser__from>").append("0").append("</item_ser__from>\r\n");
argData.append("<item_ser__to>").append("ZZ").append("</item_ser__to>\r\n"); argData.append("<item_ser__to>").append("ZZ").append("</item_ser__to>\r\n");
...@@ -526,26 +533,35 @@ public class MRPWizardXmlDataBean ...@@ -526,26 +533,35 @@ public class MRPWizardXmlDataBean
System.out.println("argData=="+argData); System.out.println("argData=="+argData);
argDom = genericUtility.parseString(argData.toString()); argDom = genericUtility.parseString(argData.toString());
// 13/06/14 manoharan delete line for which bom_code changed
errString = runMRPObj.validateFilterParams( argDom );
if (errString != null && errString.trim().length() > 0)
{
System.out.println("Error validating filter parameters:..." + errString);
return errString;
}
errString = runMRPObj.deleteOldPlan (siteCode,itemCode);
if (errString != null && errString.trim().length() > 0)
{
System.out.println("Error validating filter parameters:..." + errString);
return errString;
}
// end 13/06/14 manoharan
sql = "select bomdet.item_code from bomdet bomdet, bom bom " + sql = "select bomdet.item_code from bomdet bomdet, bom bom " +
" where bom.bom_code = bomdet.bom_code " + " where bom.bom_code = bomdet.bom_code " +
" and bom.bom_code = ? " + " and bom.bom_code = ? " +
" and bom.site_code = ? "; " and bom.site_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bomCodeRef); //pstmt.setString(1, bomCodeRef); // 13/06/14 manoharan
pstmt.setString(1, bomCodeOrg);
pstmt.setString(2, siteCode); pstmt.setString(2, siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
replaceBomItemList.add(rs.getString(1)); replaceBomItemList.add(rs.getString(1));
errString = runMRPObj.validateFilterParams( argDom );
if (errString != null && errString.trim().length() > 0)
{
System.out.println("Error validating filter parameters:..." + errString);
return errString;
}
errString = runMRPObj.deleteOldPlan (siteCode,rs.getString(1)); errString = runMRPObj.deleteOldPlan (siteCode,rs.getString(1));
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
...@@ -571,7 +587,6 @@ public class MRPWizardXmlDataBean ...@@ -571,7 +587,6 @@ public class MRPWizardXmlDataBean
NodeList hdrDommList2 = mrpGetDataDom.getElementsByTagName("Detail2"); NodeList hdrDommList2 = mrpGetDataDom.getElementsByTagName("Detail2");
System.out.println("len1===["+hdrDommList2.getLength()+"]"); System.out.println("len1===["+hdrDommList2.getLength()+"]");
for (int dtlCtr2 = 0; dtlCtr2 < hdrDommList2.getLength(); dtlCtr2++) for (int dtlCtr2 = 0; dtlCtr2 < hdrDommList2.getLength(); dtlCtr2++)
{ {
Node detailListNode2 = hdrDommList2.item(dtlCtr2); Node detailListNode2 = hdrDommList2.item(dtlCtr2);
...@@ -579,16 +594,39 @@ public class MRPWizardXmlDataBean ...@@ -579,16 +594,39 @@ public class MRPWizardXmlDataBean
if( detailListNode2.hasChildNodes() == true ) if( detailListNode2.hasChildNodes() == true )
{ {
System.out.println("@@@@@@@@for_test detailListNode2.hasChildNodes()["+detailListNode2.hasChildNodes()+"]dtlCtr2["+dtlCtr2+"]"); System.out.println("@@@@@@@@for_test detailListNode2.hasChildNodes()["+detailListNode2.hasChildNodes()+"]dtlCtr2["+dtlCtr2+"]");
qtyReqdStr = "0";
sourceSupply = "";
siteCodeSupp = "";
itemCodeSupp = "";
itemCodeDescr = "";
lotNo = "";
lotSl = "";
locCode = "";
unit = "";
parentItem = "";
tranSer = "";
demand = "";
supply = "";
planSupply = "0";
runningDemand = "0";
runningSupplyStr = "0";
runningPlanSupply = "0";
independentDemand = "0";
stockQty = "0";
othSupply = "0";
pendingPo = "0";
pendingDo = "0";
pendingIndent = "0";
pendingDr = "0";
itemCodeParent = "";
originalOrAltitem = "";
domCnt++; domCnt++;
valueXmlString.append("<Detail2 domID='" + domCnt + "' >\r\n"); valueXmlString.append("<Detail2 domID='" + domCnt + "' >\r\n");
System.out.println("@@@@@ node name1 ["+detailListNode2.getNodeName()+"]"); System.out.println("@@@@@ node name1 ["+detailListNode2.getNodeName()+"]");
NodeList refrenceList2= detailListNode2.getChildNodes(); NodeList refrenceList2= detailListNode2.getChildNodes();
if( refrenceList2 != null ) if( refrenceList2 != null )
{ {
System.out.println("refrenceList2.getLength()["+refrenceList2.getLength()+"]"); System.out.println("refrenceList2.getLength()["+refrenceList2.getLength()+"]");
for (int cntr2 = 0; cntr2 < refrenceList2.getLength(); cntr2++) for (int cntr2 = 0; cntr2 < refrenceList2.getLength(); cntr2++)
{ {
...@@ -601,12 +639,37 @@ public class MRPWizardXmlDataBean ...@@ -601,12 +639,37 @@ public class MRPWizardXmlDataBean
if("Detail4".equalsIgnoreCase(refrenceNode2.getNodeName())) if("Detail4".equalsIgnoreCase(refrenceNode2.getNodeName()))
{ {
//detail4Flag = true; //detail4Flag = true;
orderList1 = refrenceNode2.getChildNodes(); NodeList orderList2 = refrenceNode2.getChildNodes();
sourceSupply = ""; sourceSupply = "";
siteCodeSupp = "";
for (int nodCtr1 = 0; nodCtr1 < orderList1.getLength(); nodCtr1++) itemCodeSupp = "";
itemCodeDescr = "";
lotNo = "";
lotSl = "";
locCode = "";
unit = "";
parentItem = "";
tranSer = "";
demand = "";
supply = "";
planSupply = "0";
runningDemand = "0";
runningSupplyStr = "0";
runningPlanSupply = "0";
independentDemand = "0";
stockQty = "0";
othSupply = "0";
pendingPo = "0";
pendingDo = "0";
pendingIndent = "0";
pendingDr = "0";
itemCodeParent = "";
originalOrAltitem = "";
for (int nodCtr1 = 0; nodCtr1 < orderList2.getLength(); nodCtr1++)
{ {
Node detail4Node=orderList1.item(nodCtr1);
Node detail4Node=orderList2.item(nodCtr1);
//NodeList suppDetailList=detail4Node.getChildNodes(); //NodeList suppDetailList=detail4Node.getChildNodes();
//System.out.println("@@@@@@@@@orderNode node name[" + detail4Node.getNodeName()+"]"); //System.out.println("@@@@@@@@@orderNode node name[" + detail4Node.getNodeName()+"]");
//if("supp_detail".equalsIgnoreCase(detail4Node.getNodeName())) //if("supp_detail".equalsIgnoreCase(detail4Node.getNodeName()))
...@@ -759,303 +822,143 @@ public class MRPWizardXmlDataBean ...@@ -759,303 +822,143 @@ public class MRPWizardXmlDataBean
valueXmlString.append("<originalOrAltitem protect = '1'>").append("<![CDATA[" + originalOrAltitem + "]]>").append("</originalOrAltitem>\r\n"); valueXmlString.append("<originalOrAltitem protect = '1'>").append("<![CDATA[" + originalOrAltitem + "]]>").append("</originalOrAltitem>\r\n");
valueXmlString.append("</Detail4>\r\n"); valueXmlString.append("</Detail4>\r\n");
} }
//from detail2 //////////////////////////////////////////////////////////
if("reference".equalsIgnoreCase(refrenceNode2.getNodeName()))
if( refrenceNode2.getFirstChild() != null) {
{ orderList = refrenceNode2.getChildNodes();
if("site_code".equalsIgnoreCase(refrenceNode2.getNodeName())) for (int nodCtr1 = 0; nodCtr1 < orderList .getLength(); nodCtr1++)
{
siteCode = refrenceNode2.getFirstChild().getNodeValue();
}
if("item_code".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
itemCode = refrenceNode2.getFirstChild().getNodeValue();
}
if("supp_sour".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
suppSour = refrenceNode2.getFirstChild().getNodeValue();
}
if("demand".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
demand = refrenceNode2.getFirstChild().getNodeValue();
}
if("supply".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
supply = refrenceNode2.getFirstChild().getNodeValue();
}
if("due_date".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
dueDate = refrenceNode2.getFirstChild().getNodeValue();
}
if("plan_supply".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
planSupply = refrenceNode2.getFirstChild().getNodeValue();
}
if("running_demand".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
runningDemand = refrenceNode2.getFirstChild().getNodeValue();
}
if("running_supply".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
runningSupplyStr = refrenceNode2.getFirstChild().getNodeValue();
}
if("running_plan_supply".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
runningPlanSupply = refrenceNode2.getFirstChild().getNodeValue();
}
if("independent_demand".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
independentDemand = refrenceNode2.getFirstChild().getNodeValue();
}
if("bom_code".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
bomCode = refrenceNode2.getFirstChild().getNodeValue();
}
if("order_opt".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
orderOpt = refrenceNode2.getFirstChild().getNodeValue();
}
if("batch_qty_type".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
batchQtyType = refrenceNode2.getFirstChild().getNodeValue();
}
if("unit".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
unit = refrenceNode2.getFirstChild().getNodeValue();
}
if("min_order_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
minOrderQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("integral_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
integralQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("max_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
maxQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("min_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
minQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("reorder_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
reorderQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("yield_perc".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
yieldPerc = refrenceNode2.getFirstChild().getNodeValue();
}
if("min_plan_perc".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
minPlanPerc = refrenceNode2.getFirstChild().getNodeValue();
}
if("batch_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
batchQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("pur_lead_time".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
purLeadTime = refrenceNode2.getFirstChild().getNodeValue();
}
if("qc_lead_time".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
qcLeadTime = refrenceNode2.getFirstChild().getNodeValue();
}
if("mfg_lead_time".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
mfgLeadTime = refrenceNode2.getFirstChild().getNodeValue();
}
if("description".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
description = refrenceNode2.getFirstChild().getNodeValue();
}
if("stock_qty".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
stockQty = refrenceNode2.getFirstChild().getNodeValue();
}
if("oth_supply".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
othSupply = refrenceNode2.getFirstChild().getNodeValue();
}
if("pending_po".equalsIgnoreCase(refrenceNode2.getNodeName()))
{
pendingPo = refrenceNode2.getFirstChild().getNodeValue();
}
if("pending_do".equalsIgnoreCase(refrenceNode2.getNodeName()))
{ {
pendingDo = refrenceNode2.getFirstChild().getNodeValue(); orderNode=orderList.item(nodCtr1);
orderDtlList=orderNode.getChildNodes();
if("order".equalsIgnoreCase(orderNode.getNodeName()))
{
saleOrder = "";
lineNo = "";
bomCodeParent= "";
bomCodeOrg = "";
bomCodeRef = "";
itemCode= "";
itemCodeDescr = "";
qtyReqdStr = "0";
unit = "";
sourceSupply = "";
sourceSupplyRef = "";
suppSour = "";
for (int cntr = 0; cntr < orderDtlList.getLength(); cntr++)
{
Node detail2Node = orderDtlList.item(cntr);
if("sale_order".equalsIgnoreCase( detail2Node.getNodeName()))
{
saleOrder = detail2Node.getTextContent();
}
if("line_no".equalsIgnoreCase( detail2Node.getNodeName()))
{
lineNo = detail2Node.getTextContent();
}
if("site_code".equalsIgnoreCase( detail2Node.getNodeName()))
{
siteCode = detail2Node.getTextContent();
}
if("bom_code_parent".equalsIgnoreCase( detail2Node.getNodeName()))
{
bomCodeParent = detail2Node.getTextContent();
}
if("bom_code_org".equalsIgnoreCase( detail2Node.getNodeName()))
{
bomCodeOrg = detail2Node.getTextContent();
}
if("bom_code_ref".equalsIgnoreCase( detail2Node.getNodeName()))
{
bomCodeRef = detail2Node.getTextContent();
}
if("item_code".equalsIgnoreCase( detail2Node.getNodeName()))
{
itemCode = detail2Node.getTextContent();
}
if("item_code_descr".equalsIgnoreCase( detail2Node.getNodeName()))
{
itemCodeDescr = detail2Node.getTextContent();
}
if("qty_reqd".equalsIgnoreCase( detail2Node.getNodeName()))
{
qtyReqdStr = detail2Node.getTextContent();
}
if("unit".equalsIgnoreCase( detail2Node.getNodeName()))
{
unit = detail2Node.getTextContent();
}
if("source_supply".equalsIgnoreCase( detail2Node.getNodeName()))
{
sourceSupply = detail2Node.getTextContent();
}
if("source_supply_ref".equalsIgnoreCase( detail2Node.getNodeName()))
{
sourceSupplyRef = detail2Node.getTextContent();
}
if("supp_sour".equalsIgnoreCase( detail2Node.getNodeName()))
{
suppSour = detail2Node.getTextContent();
}
if("itemCodeDetailMap".equalsIgnoreCase( detail2Node.getNodeName()))
{
itemCodeDetailMapStr = detail2Node.getTextContent();
System.out.println("@@@@@@ itemCodeDetailMapStr["+itemCodeDetailMapStr+"]");
}
}
System.out.println("14/06/14 After recalculate itemCode {" + itemCode +"] bomCodeRef [" + bomCodeRef + "] bomCodeParent [" + bomCodeParent+ "]" );
}
} }
if("pending_indent".equalsIgnoreCase(refrenceNode2.getNodeName())) ////////////////////////////////////////////////////////
System.out.println("13/06/14 reference qtyReqdStr before["+qtyReqdStr+"]");
if (qtyReqdStr == null || "null".equals(qtyReqdStr) )
{ {
pendingIndent = refrenceNode2.getFirstChild().getNodeValue(); qtyReqdStr = "0";
} }
if("pending_dr".equalsIgnoreCase(refrenceNode2.getNodeName())) qtyReqd = Double.parseDouble(qtyReqdStr);
System.out.println("13/06/14 reference qtyReqd before["+qtyReqd+"]");
if(qtyReqd > 0)
{ {
pendingDr = refrenceNode2.getFirstChild().getNodeValue(); valueXmlString.append("<reference protect = '1'>\r\n");
valueXmlString.append("<order protect = '1' domID='" + domCnt + "'>\r\n");
valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + saleOrder + "]]>").append("</sale_order>\r\n");
valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>\r\n");
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<qty_reqd protect = '1'>").append("<![CDATA[" + qtyReqdStr + "]]>").append("</qty_reqd>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
valueXmlString.append("<item_code_descr protect = '1'>").append("<![CDATA[" + itemCodeDescr + "]]>").append("</item_code_descr>\r\n");
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<running_supply protect = '1'>").append("<![CDATA[" + runningSupplyStr + "]]>").append("</running_supply>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unit + "]]>").append("</unit>\r\n");
valueXmlString.append("<originalOrAltitem protect = '1'>").append("<![CDATA[" + originalOrAltitem + "]]>").append("</originalOrAltitem>\r\n");
valueXmlString.append("<bom_code_parent protect = '1'>").append("<![CDATA[" + bomCodeParent + "]]>").append("</bom_code_parent>\r\n"); //bomCodeParent
valueXmlString.append("<bom_code_org protect = '1'>").append("<![CDATA[" + bomCodeRef + "]]>").append("</bom_code_org>\r\n");
if( "P".equalsIgnoreCase(suppSour))
{
valueXmlString.append("<bom_code_ref protect = '1'>").append(" ").append("</bom_code_ref>\r\n");
}
else
{
valueXmlString.append("<bom_code_ref protect = '1'>").append("<![CDATA[" + bomCodeRef + "]]>").append("</bom_code_ref>\r\n");
}
valueXmlString.append("<source_supply protect = '1'>").append("<![CDATA[" + sourceSupply + "]]>").append("</source_supply>\r\n");
valueXmlString.append("<source_supply_ref protect = '1'>").append("<![CDATA[" + sourceSupplyRef + "]]>").append("</source_supply_ref>\r\n");
valueXmlString.append("</order>\r\n");
valueXmlString.append("</reference>\r\n");
} }
////////////////////////////////////////////////////////
} }
} ///////////////////////////////////////////////////////////
}
}
//for detail2 tag
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<demand protect = '1'>").append("<![CDATA[" + demand + "]]>").append("</demand>\r\n");
valueXmlString.append("<supply protect = '1'>").append("<![CDATA[" + supply + "]]>").append("</supply>\r\n");
valueXmlString.append("<due_date protect = '1'>").append("<![CDATA[" + dueDate + "]]>").append("</due_date>\r\n");
valueXmlString.append("<plan_supply protect = '1'>").append("<![CDATA[" + planSupply + "]]>").append("</plan_supply>\r\n");
valueXmlString.append("<running_demand protect = '1'>").append("<![CDATA[" + runningDemand + "]]>").append("</running_demand>\r\n");
valueXmlString.append("<running_supply protect = '1'>").append("<![CDATA[" + runningSupply + "]]>").append("</running_supply>\r\n");
valueXmlString.append("<running_plan_supply protect = '1'>").append("<![CDATA[" + runningPlanSupply + "]]>").append("</running_plan_supply>\r\n");
valueXmlString.append("<independent_demand protect = '1'>").append("<![CDATA[" + independentDemand + "]]>").append("</independent_demand>\r\n");
valueXmlString.append("<bom_code protect = '1'>").append("<![CDATA[" + bomCode + "]]>").append("</bom_code>\r\n");
valueXmlString.append("<order_opt protect = '1'>").append("<![CDATA[" + orderOpt + "]]>").append("</order_opt>\r\n");
valueXmlString.append("<batch_qty_type protect = '1'>").append("<![CDATA[" + batchQtyType + "]]>").append("</batch_qty_type>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unit + "]]>").append("</unit>\r\n");
valueXmlString.append("<min_order_qty protect = '1'>").append("<![CDATA[" + minOrderQty + "]]>").append("</min_order_qty>\r\n");
valueXmlString.append("<integral_qty protect = '1'>").append("<![CDATA[" + integralQty + "]]>").append("</integral_qty>\r\n");
valueXmlString.append("<max_qty protect = '1'>").append("<![CDATA[" + maxQty + "]]>").append("</max_qty>\r\n");
valueXmlString.append("<min_qty protect = '1'>").append("<![CDATA[" + minQty + "]]>").append("</min_qty>\r\n");
valueXmlString.append("<reorder_qty protect = '1'>").append("<![CDATA[" + reorderQty + "]]>").append("</reorder_qty>\r\n");
valueXmlString.append("<yield_perc protect = '1'>").append("<![CDATA[" + yieldPerc + "]]>").append("</yield_perc>\r\n");
valueXmlString.append("<min_plan_perc protect = '1'>").append("<![CDATA[" + minPlanPerc + "]]>").append("</min_plan_perc>\r\n");
valueXmlString.append("<batch_qty protect = '1'>").append("<![CDATA[" + batchQty + "]]>").append("</batch_qty>\r\n");
valueXmlString.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + purLeadTime + "]]>").append("</pur_lead_time>\r\n");
valueXmlString.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + qcLeadTime + "]]>").append("</qc_lead_time>\r\n");
valueXmlString.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + mfgLeadTime + "]]>").append("</mfg_lead_time>\r\n");
valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + description + "]]>").append("</description>\r\n");
valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + stockQty + "]]>").append("</stock_qty>\r\n");
valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + othSupply + "]]>").append("</oth_supply>\r\n");
valueXmlString.append("<pending_po protect = '1'>").append("<![CDATA[" + pendingPo + "]]>").append("</pending_po>\r\n");
valueXmlString.append("<pending_do protect = '1'>").append("<![CDATA[" + pendingDo + "]]>").append("</pending_do>\r\n");
valueXmlString.append("<pending_indent protect = '1'>").append("<![CDATA[" + pendingIndent + "]]>").append("</pending_indent>\r\n");
valueXmlString.append("<pending_dr protect = '1'>").append("<![CDATA[" + pendingDr + "]]>").append("</pending_dr>\r\n");
// for reference tag
valueXmlString.append("<reference protect = '1'>");
valueXmlString.append("<order protect = '1' domID='" + domCnt + "'>\r\n");
valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + saleOrder + "]]>").append("</sale_order>\r\n");
valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + lineNo + "]]>").append("</line_no>\r\n");
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<qty_reqd protect = '1'>").append("<![CDATA[" + qtyReqdStr + "]]>").append("</qty_reqd>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
valueXmlString.append("<item_code_descr protect = '1'>").append("<![CDATA[" + itemCodeDescr + "]]>").append("</item_code_descr>\r\n");
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<running_supply protect = '1'>").append("<![CDATA[" + runningSupplyStr + "]]>").append("</running_supply>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unit + "]]>").append("</unit>\r\n");
valueXmlString.append("<originalOrAltitem protect = '1'>").append("<![CDATA[" + originalOrAltitem + "]]>").append("</originalOrAltitem>\r\n");
valueXmlString.append("<bom_code_parent protect = '1'>").append("<![CDATA[" + bomCodeRef + "]]>").append("</bom_code_parent>\r\n"); //bomCodeParent
valueXmlString.append("<bom_code_org protect = '1'>").append("<![CDATA[" + bomCodeRef + "]]>").append("</bom_code_org>\r\n");
if( "P".equalsIgnoreCase(suppSour))
{
valueXmlString.append("<bom_code_ref protect = '1'>").append(" ").append("</bom_code_ref>\r\n");
}
else
{
valueXmlString.append("<bom_code_ref protect = '1'>").append("<![CDATA[" + bomCodeRef + "]]>").append("</bom_code_ref>\r\n");
} }
valueXmlString.append("<source_supply protect = '1'>").append("<![CDATA[" + sourceSupply + "]]>").append("</source_supply>\r\n");
valueXmlString.append("<source_supply_ref protect = '1'>").append("<![CDATA[" + sourceSupplyRef + "]]>").append("</source_supply_ref>\r\n");
valueXmlString.append("</order>\r\n");
valueXmlString.append("</reference>\r\n");
System.out.println("detail2 close : dtlCtr2["+dtlCtr2+"]");
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
} }
}
/*
if (mrpGetData.contains("<Detail2>"))
{
String replaceStr="";
i++;
String[] mrpGetDataParts = mrpGetData.split("<Detail2>");
System.out.println("mrpGetDataParts length["+mrpGetDataParts.length+"]");
for( i=0 ; i < mrpGetDataParts.length ; i++ )
{
String tempMrpGetDataParts = mrpGetDataParts[i];
if( tempMrpGetDataParts != null && tempMrpGetDataParts.trim().length() > 0 )
{
tempMrpGetDataParts = "<Detail2>" + tempMrpGetDataParts;
mrpGetDataParts[i] = tempMrpGetDataParts;
System.out.println("tempMrpGetDataParts"+i+"]::["+tempMrpGetDataParts+"]");
int itemCodeIndexFrom=0,itemCodeIndexTo=0;
itemCode="";
itemCodeDescr = "";
if( tempMrpGetDataParts.indexOf("<item_code") != -1 )
{
itemCodeIndexFrom = tempMrpGetDataParts.indexOf("<item_code");
System.out.println("itemCodeIndexFrom["+itemCodeIndexFrom+"]");
itemCodeIndexTo = tempMrpGetDataParts.indexOf("</item_code");
System.out.println("itemCodeIndexTo["+itemCodeIndexTo+"]");
itemCode = tempMrpGetDataParts.substring(itemCodeIndexFrom+34, itemCodeIndexTo-3);
itemCodeDescr = setDescription("descr", "item", "item_code", itemCode , conn);
int suppSourIndexFrom = tempMrpGetDataParts.indexOf("<supp_sour");
System.out.println("suppSourIndexFrom["+suppSourIndexFrom+"]");
int suppSourIndexTo = tempMrpGetDataParts.indexOf("</supp_sour");
System.out.println("suppSourIndexTo["+suppSourIndexTo+"]");
suppSour = tempMrpGetDataParts.substring(suppSourIndexFrom+34, suppSourIndexTo-3);
if( "P".equalsIgnoreCase(suppSour))
{
bomCodeParent = bomCodeRef;
bomCodeRef = "";
}
System.out.println("itemCode["+itemCode+"]suppSour["+suppSour+"]");
replaceStr = "<reference><order>" +
"<sale_order>"+saleOrder+"</sale_order>" +
"<line_no>"+lineNo+"1</line_no>" +
"<qty_reqd>"+qtyReqdStr+"</qty_reqd>" +
"<site_code>"+siteCode+"</site_code>" +
"<item_code>"+itemCode+"</item_code>" +
"<item_code_descr>"+itemCodeDescr+"</item_code_descr>" +
"<supp_sour>"+suppSour+"</supp_sour>" +
"<running_supply>"+runningSupply+"</running_supply>" +
"<unit>"+unit+"</unit>" +
"<originalOrAltitem>"+originalOrAltitem+"</originalOrAltitem>" +
"<bom_code_parent>"+bomCodeParent+"</bom_code_parent>" +
"<bom_code_org>"+bomCodeRef+"</bom_code_org>" +
"<bom_code_ref>"+bomCodeRef+"</bom_code_ref>" +
"<source_supply>"+suppSour+"</source_supply>" +
"</order>" +
"</reference>";
System.out.println("@@@@mrpGetData replaceStr::["+replaceStr+"]");
mrpGetDataParts[i] = tempMrpGetDataParts.replace("<Detail2>", replaceStr);
System.out.println("@@@@mrpGetDataParts[i]::["+i+"]mrpGetDataParts[i]"+mrpGetDataParts[i]+"]");
}
}
}
//System.out.println("@@@@mrpGetData after merging return string in bean::["+mrpGetData+"]");
//<?xml version = "1.0"?>
String tempXmldata="";
for( i=0 ; i < mrpGetDataParts.length ; i++ )
{
tempXmldata = tempXmldata + mrpGetDataParts[i] ;
}
xmldata = xmldata + tempXmldata ;
} }
System.out.println("@@@@@@@@@ 309 xmldata============[["+xmldata+"]]");
*/
} }
else else
......
...@@ -7,7 +7,7 @@ import ibase.webitm.ejb.ValidatorEJB; ...@@ -7,7 +7,7 @@ import ibase.webitm.ejb.ValidatorEJB;
//import ibase.webitm.ejb.bmr.util.Utils; //import ibase.webitm.ejb.bmr.util.Utils;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.bmr.util.*; //import ibase.webitm.ejb.bmr.util.*;
import java.util.*; import java.util.*;
import java.rmi.RemoteException; import java.rmi.RemoteException;
......
...@@ -243,7 +243,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -243,7 +243,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
public String getData(Document dom, Document dom1, String windowName, String xtraParams) throws RemoteException, ITMException public String getData(Document dom, Document dom1, String windowName, String xtraParams) throws RemoteException, ITMException
{ {
errString = ""; errString = "";
String resultString = "",windowName1=""; String resultString = "",windowName1="",bomCodeParent= "";
ResultSet rs = null; ResultSet rs = null;
this.wnName=windowName; this.wnName=windowName;
...@@ -295,6 +295,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -295,6 +295,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
siteItemList = genericUtility.getColumnValue("site_item_list", dom); //added by chandrashekar siteItemList = genericUtility.getColumnValue("site_item_list", dom); //added by chandrashekar
String isBomReplaceStr = genericUtility.getColumnValue("isBomReplace", dom); // added by cpatil on 17/05/14 String isBomReplaceStr = genericUtility.getColumnValue("isBomReplace", dom); // added by cpatil on 17/05/14
if (isBomReplaceStr == null || isBomReplaceStr.trim().length() == 0)
{
isBomReplaceStr = "N";
}
if("N".equalsIgnoreCase(isBomReplaceStr)) if("N".equalsIgnoreCase(isBomReplaceStr))
{ {
isBomReplace = false; isBomReplace = false;
...@@ -305,6 +309,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -305,6 +309,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
bomCode1 = genericUtility.getColumnValue("bom_code", dom); // added by cpatil on 17/05/14 bomCode1 = genericUtility.getColumnValue("bom_code", dom); // added by cpatil on 17/05/14
siteCode1 = genericUtility.getColumnValue("site_code", dom); // added by cpatil on 17/05/14 siteCode1 = genericUtility.getColumnValue("site_code", dom); // added by cpatil on 17/05/14
bomReplaceDemand = Double.parseDouble( genericUtility.getColumnValue("bomReplaceDemand", dom)==null ? "0" : genericUtility.getColumnValue("bomReplaceDemand", dom)); bomReplaceDemand = Double.parseDouble( genericUtility.getColumnValue("bomReplaceDemand", dom)==null ? "0" : genericUtility.getColumnValue("bomReplaceDemand", dom));
bomCodeParent = genericUtility.getColumnValue("bom_code_parent", dom);
saleOrderReplaceBom = genericUtility.getColumnValue("saleOrderReplaceBom", dom); // added by cpatil on 17/05/14 saleOrderReplaceBom = genericUtility.getColumnValue("saleOrderReplaceBom", dom); // added by cpatil on 17/05/14
lineNoReplaceBom = genericUtility.getColumnValue("lineNoReplaceBom", dom); // added by cpatil on 17/05/14 lineNoReplaceBom = genericUtility.getColumnValue("lineNoReplaceBom", dom); // added by cpatil on 17/05/14
...@@ -381,15 +386,15 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -381,15 +386,15 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// Populating Site Code Map....... // Populating Site Code Map.......
if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace
{ {
System.out.println("Populating Site Code Map......."); System.out.println("Populating Site Code Map.......");
siteCodeTo = siteCodeTo.trim() + " "; siteCodeTo = siteCodeTo.trim() + " ";
siteCodeTo = siteCodeTo.substring(0, 5);// + "z"; siteCodeTo = siteCodeTo.substring(0, 5);// + "z";
errString = populateSiteMap(); errString = populateSiteMap();
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
System.out.println("Error While Populating Site:..." + errString); System.out.println("Error While Populating Site:..." + errString);
return errString; return errString;
} }
} }
else else
{ {
...@@ -406,22 +411,28 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -406,22 +411,28 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace
{ {
// Populating Item Code Map....... // Populating Item Code Map.......
itemCodeTo = itemCodeTo.trim() + " "; itemCodeTo = itemCodeTo.trim() + " ";
itemCodeTo = itemCodeTo.substring(0, 10);// + "z"; itemCodeTo = itemCodeTo.substring(0, 10);// + "z";
itemSerTo = itemSerTo.trim() + " "; itemSerTo = itemSerTo.trim() + " ";
itemSerTo = itemSerTo.substring(0, 5);// + "z"; itemSerTo = itemSerTo.substring(0, 5);// + "z";
System.out.println("Populating Item Code Map......."); System.out.println("Populating Item Code Map.......");
errString = populateItemMap(); errString = populateItemMap();
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
System.out.println("Error While Populating Item code:..." + errString); System.out.println("Error While Populating Item code:..." + errString);
return errString; return errString;
}
} }
else
{
System.out.println("Else 12/06/14 itemCodeTo [" + itemCodeTo + "] itemCodeMap [" + itemCodeMap +"]");
itemCodeMap.put(itemCodeTo, new Integer(itemCodeMap.size() + 1));
} }
// Populating All Items........... // Populating All Items...........
...@@ -429,32 +440,47 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -429,32 +440,47 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace if(!( isBomReplace)) // added by cpatil on 17/05/14 for BomReplace
{ {
if (matPlan.equals("Y")) if (matPlan.equals("Y"))
{
System.out.println("Populating All Items...........");
errString = populateAllItem();
if (errString != null && errString.trim().length() > 0)
{ {
System.out.println("Error While Populating All Items:..." + errString); System.out.println("Populating All Items...........");
return errString; errString = populateAllItem();
}
// 19-01-2007 manoharan if (errString != null && errString.trim().length() > 0)
if (verifier != null && verifier.equalsIgnoreCase("Y"))
{
if (invaldBomExists)
{ {
errString = itmDBAccessEJB.getErrorString("", "VTBOMUCON", "", "", conn); System.out.println("Error While Populating All Items:..." + errString);
return errString; return errString;
} }
// 19-01-2007 manoharan
if (verifier != null && verifier.equalsIgnoreCase("Y"))
{
if (invaldBomExists)
{
errString = itmDBAccessEJB.getErrorString("", "VTBOMUCON", "", "", conn);
return errString;
}
}
// end 19-01-2007 manoharan
} }
// end 19-01-2007 manoharan
}
} }
if( isBomReplace ) // added by cpatil on 19/05/14 if( isBomReplace ) // added by cpatil on 19/05/14
{ {
System.out.println("@@@@@@ bomExplode is calling into condtion of isBomReplace...."); System.out.println("13/06/14 adpeList.size() before[" + adpeList.size() + "]");
adpeList.clear();
ADPElement adpElement = new ADPElement();
adpElement.setSiteCode(siteCode1);
adpElement.setItemCode(itemCodeTo);
adpElement = setAdpeValues(adpElement);
adpElement.setSaleOrder(saleOrderReplaceBom);
adpElement.setLineNo(lineNoReplaceBom);
adpElement.setBomCodeParent(bomCodeParent);
adpElement.setBomCode(bomCode1);
adpElement.setDemand(dateFrom,bomReplaceDemand , saleOrderReplaceBom, lineNoReplaceBom );
itemBomMap.put(itemCodeTo, bomCodeParent);
itemCodeMap.put(itemCodeTo, new Integer(itemCodeMap.size() + 1));
//adpElement.setDemand(dateFrom,bomReplaceDemand , " ", " " );
adpeList.add(adpElement);
System.out.println("13/06/14 adpeList.size() after 1 [" + adpeList.size() + "] itemBomMap [" + itemBomMap + "]");
errString = bomExplode( siteCode1, bomCode1); errString = bomExplode( siteCode1, bomCode1);
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
...@@ -462,12 +488,18 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -462,12 +488,18 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("@@@ cpatil --- Error While Calling method bomExplode(String, String):..." + errString); System.out.println("@@@ cpatil --- Error While Calling method bomExplode(String, String):..." + errString);
return errString; return errString;
} }
String parentBom = itemCodeDetailMap.get(bomCode1) == null ? "":itemCodeDetailMap.get(bomCode1).toString();
itemCodeDetailMap.put(itemCodeTo, parentBom+"@"+bomCode1);
System.out.println("13/06/14 adpeList.size() after 2 [" + adpeList.size() + "] itemBomMap [" + itemBomMap + "]");
} }
//else
//{
errString = populateADPElementList();
//}
// generate the ADPElement array here.. // generate the ADPElement array here..
errString = populateADPElementList();
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
System.out.println("Error While Populating ADPEList:..." + errString); System.out.println("Error While Populating ADPEList:..." + errString);
...@@ -686,45 +718,46 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -686,45 +718,46 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if( !(isBomReplace)) // added by cpatil on 19/05/14 for bom replacement if( !(isBomReplace)) // added by cpatil on 19/05/14 for bom replacement
{ {
siteCodeFrom = genericUtility.getColumnValue("site_code__from", dom); siteCodeFrom = genericUtility.getColumnValue("site_code__from", dom);
if (siteCodeFrom == null || siteCodeFrom.trim().length() == 0) if (siteCodeFrom == null || siteCodeFrom.trim().length() == 0)
{ {
siteCodeFrom = ""; siteCodeFrom = "";
System.out.println("Site Code From is Null..."); System.out.println("Site Code From is Null...");
errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn);
return errString; return errString;
} }
System.out.println("Site Code From............." + siteCodeFrom); System.out.println("Site Code From............." + siteCodeFrom);
// Fetching SiteCodeTo from Entered by User in GUI // Fetching SiteCodeTo from Entered by User in GUI
siteCodeTo = genericUtility.getColumnValue("site_code__to", dom); siteCodeTo = genericUtility.getColumnValue("site_code__to", dom);
if (siteCodeTo == null || siteCodeTo.trim().length() == 0) if (siteCodeTo == null || siteCodeTo.trim().length() == 0)
{ {
siteCodeTo = ""; siteCodeTo = "";
System.out.println("Site Code To is Null..."); System.out.println("Site Code To is Null...");
errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn);
return errString; return errString;
} }
System.out.println("Site Code To..............." + siteCodeTo); System.out.println("Site Code To..............." + siteCodeTo);
// Fetching ItemCodeFrom from Entered by User in GUI // Fetching ItemCodeFrom from Entered by User in GUI
itemCodeFrom = genericUtility.getColumnValue("item_code__from", dom); itemCodeFrom = genericUtility.getColumnValue("item_code__from", dom);
if (itemCodeFrom == null || itemCodeFrom.trim().length() == 0) if (itemCodeFrom == null || itemCodeFrom.trim().length() == 0)
{ {
itemCodeFrom = ""; itemCodeFrom = "";
System.out.println("Item Code From is Null..."); System.out.println("Item Code From is Null...");
errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn);
return errString; return errString;
} }
System.out.println("Item Code From............." + itemCodeFrom); System.out.println("Item Code From............." + itemCodeFrom);
// Fetching ItemCodeTo from Entered by User in GUI // Fetching ItemCodeTo from Entered by User in GUI
itemCodeTo = genericUtility.getColumnValue("item_code__to", dom); itemCodeTo = genericUtility.getColumnValue("item_code__to", dom);
if (itemCodeTo == null || itemCodeTo.trim().length() == 0) if (itemCodeTo == null || itemCodeTo.trim().length() == 0)
{ {
itemCodeTo = ""; itemCodeTo = "";
System.out.println("Item Code To is Null..."); System.out.println("Item Code To is Null...");
errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn); errString = itmDBAccessEJB.getErrorString("", "VTMRPPARM", "", "", conn);
return errString; return errString;
}
System.out.println("Item Code To............." + itemCodeTo);
} }
System.out.println("Item Code To............." + itemCodeTo);
// Fetching DateFrom from Entered by User in GUI // Fetching DateFrom from Entered by User in GUI
sDateFrom = genericUtility.getColumnValue("date_from", dom); sDateFrom = genericUtility.getColumnValue("date_from", dom);
if (sDateFrom == null || sDateFrom.trim().length() == 0) if (sDateFrom == null || sDateFrom.trim().length() == 0)
...@@ -768,7 +801,6 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -768,7 +801,6 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
return errString; return errString;
} }
System.out.println("To Item Series............." + itemSerTo); System.out.println("To Item Series............." + itemSerTo);
}
// Fetching DisPlan from Entered by User in GUI // Fetching DisPlan from Entered by User in GUI
disPlan = genericUtility.getColumnValue("dis_plan", dom); disPlan = genericUtility.getColumnValue("dis_plan", dom);
...@@ -863,25 +895,25 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -863,25 +895,25 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
if( !(isBomReplace)) // added by cpatil on 19/05/14 for bomreplacement if( !(isBomReplace)) // added by cpatil on 19/05/14 for bomreplacement
{ {
dbDateFrom = sDateFrom; dbDateFrom = sDateFrom;
dbDateTo = sDateTo; dbDateTo = sDateTo;
sDateFrom = genericUtility.getValidDateString(sDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); sDateFrom = genericUtility.getValidDateString(sDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
dbDateFrom = genericUtility.getValidDateString(dbDateFrom, genericUtility.getApplDateFormat(), "dd-MMM-yyyy"); dbDateFrom = genericUtility.getValidDateString(dbDateFrom, genericUtility.getApplDateFormat(), "dd-MMM-yyyy");
System.out.println("sDateFrom : " + sDateFrom); System.out.println("sDateFrom : " + sDateFrom);
// System.out.println(); // System.out.println();
dateFrom = java.sql.Timestamp.valueOf(sDateFrom + " 00:00:00"); dateFrom = java.sql.Timestamp.valueOf(sDateFrom + " 00:00:00");
sDateTo = genericUtility.getValidDateString(sDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); sDateTo = genericUtility.getValidDateString(sDateTo, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
dbDateTo = genericUtility.getValidDateString(dbDateTo, genericUtility.getApplDateFormat(), "dd-MMM-yyyy"); dbDateTo = genericUtility.getValidDateString(dbDateTo, genericUtility.getApplDateFormat(), "dd-MMM-yyyy");
dateTo = java.sql.Timestamp.valueOf(sDateTo + " 00:00:00"); dateTo = java.sql.Timestamp.valueOf(sDateTo + " 00:00:00");
System.out.println("Db Date from :" + dbDateFrom); System.out.println("Db Date from :" + dbDateFrom);
System.out.println("Db Date to :" + dbDateTo); System.out.println("Db Date to :" + dbDateTo);
//SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat()); //SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
dateFromString = simpleDateFormat.format(dateFrom); dateFromString = simpleDateFormat.format(dateFrom);
dateToString = simpleDateFormat.format(dateTo); dateToString = simpleDateFormat.format(dateTo);
System.out.println("Db Date from [Timestamp]:" + dateFrom); System.out.println("Db Date from [Timestamp]:" + dateFrom);
System.out.println("Db Date to [Timestamp]:" + dateTo); System.out.println("Db Date to [Timestamp]:" + dateTo);
System.out.println("Db Date from [Timestamp : yyyy-MM-dd]:" + dateFromString); System.out.println("Db Date from [Timestamp : yyyy-MM-dd]:" + dateFromString);
System.out.println("Db Date to [Timestamp : yyyy-MM-dd]:" + dateToString); System.out.println("Db Date to [Timestamp : yyyy-MM-dd]:" + dateToString);
} }
else else
{ {
...@@ -1133,8 +1165,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1133,8 +1165,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
else else
{ {
pstmt.setString(1, siteCode1); pstmt.setString(1, siteCode1);
pstmt.setString(2, siteCode1); pstmt.setString(2, siteCode1);
} }
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1343,7 +1375,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1343,7 +1375,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
while (itrSite.hasNext()) while (itrSite.hasNext())
{ {
Map.Entry siteMapEntry = (Map.Entry) itrSite.next(); Map.Entry siteMapEntry = (Map.Entry) itrSite.next();
// System.out.println("All items for site : " + if (isBomReplace)
{
System.out.println("12/06/14 manohar itemArr.size() [" + itemArr.size() + "]");
}
// (String)siteMapEntry.getKey()); // (String)siteMapEntry.getKey());
int ctr; int ctr;
for (ctr = 0; ctr < itemArr.size(); ctr++) for (ctr = 0; ctr < itemArr.size(); ctr++)
...@@ -1499,7 +1534,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1499,7 +1534,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("1374---itemBomMap.size()----"+itemBomMap.size()+"---itemBomMap---"+itemBomMap); System.out.println("1374---itemBomMap.size()----"+itemBomMap.size()+"---itemBomMap---"+itemBomMap);
//al.clear(); //al.clear();
String parentBom = itemCodeDetailMap.get(bomCode) == null ? "":itemCodeDetailMap.get(bomCode).toString(); String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode); itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
System.out.println("@@@@ itemCodeDetailMap 1492["+itemCodeDetailMap+"]"); System.out.println("@@@@ itemCodeDetailMap 1492["+itemCodeDetailMap+"]");
...@@ -1530,7 +1565,22 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1530,7 +1565,22 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{ {
// System.out.println("Item Code : "+rs.getString(1)); // System.out.println("Item Code : "+rs.getString(1));
// 14/06/14 manoharan in case of changing bom_code itemCodeMap is not populated so populate the same
//if( isBomReplace )
//{
if (itemCodeMap.containsKey(rs.getString(1)))
{
System.out.println("14/06/14 supreme isBomReplace [" + isBomReplace + "] itemCodeMap already contains [" + rs.getString(1) + "]");
}
else
{
itemCodeMap.put(rs.getString(1), new Integer(itemCodeMap.size() + 1));
itemBomMap.put(rs.getString(1), bomCode);
String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
System.out.println("14/06/14 supreme isBomReplace [" + isBomReplace + "] itemCodeMap added with [" + rs.getString(1) + "] itemCodeDetailMap [" + itemCodeDetailMap + "]");
}
//}
sqlInner1 = "SELECT COUNT(1) FROM ITEM WHERE ITEM_CODE = ?"; sqlInner1 = "SELECT COUNT(1) FROM ITEM WHERE ITEM_CODE = ?";
pstmtInner1 = conn.prepareStatement(sqlInner1); pstmtInner1 = conn.prepareStatement(sqlInner1);
pstmtInner1.setString(1, rs.getString(1)); pstmtInner1.setString(1, rs.getString(1));
...@@ -1584,7 +1634,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1584,7 +1634,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itemCodeMap.put(rs.getString(1), new Integer(itemCodeMap.size() + 1)); itemCodeMap.put(rs.getString(1), new Integer(itemCodeMap.size() + 1));
itemBomMap.put(rs.getString(1), bomCode); itemBomMap.put(rs.getString(1), bomCode);
String parentBom = itemCodeDetailMap.get(bomCode) == null ? "":itemCodeDetailMap.get(bomCode).toString(); String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode); itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
System.out.println("@@@@ itemCodeDetailMap 1575["+itemCodeDetailMap+"]"); System.out.println("@@@@ itemCodeDetailMap 1575["+itemCodeDetailMap+"]");
} else } else
...@@ -1602,7 +1652,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1602,7 +1652,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itemCodeMap.put(rs.getString(1), new Integer(itemCodeMap.size() + 1)); itemCodeMap.put(rs.getString(1), new Integer(itemCodeMap.size() + 1));
itemBomMap.put(rs.getString(1), bomCode); itemBomMap.put(rs.getString(1), bomCode);
String parentBom = itemCodeDetailMap.get(bomCode) == null ? "":itemCodeDetailMap.get(bomCode).toString(); String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).toString();
itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode); itemCodeDetailMap.put(rs.getString(1), parentBom+"@"+bomCode);
System.out.println("@@@@ itemCodeDetailMap 1592["+itemCodeDetailMap+"]"); System.out.println("@@@@ itemCodeDetailMap 1592["+itemCodeDetailMap+"]");
...@@ -2185,19 +2235,27 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -2185,19 +2235,27 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itrItem = setItem.iterator(); itrItem = setItem.iterator();
while (itrItem.hasNext()) while (itrItem.hasNext())
{ {
adpElement = new ADPElement();
Map.Entry itemMapEntry = (Map.Entry) itrItem.next(); Map.Entry itemMapEntry = (Map.Entry) itrItem.next();
adpElement.setbomSet( itemCodeDetailMap );
System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+siteMapEntry+"]::::itemMapEntry["+itemMapEntry+"]itemCodeDetailMap["+itemCodeDetailMap+"]"); System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+siteMapEntry+"]::::itemMapEntry["+itemMapEntry+"]itemCodeDetailMap["+itemCodeDetailMap+"]");
if( !(isBomReplace )) // added by cpatil on 22/05/14 for bom replacement
{
siteCode = (String) siteMapEntry.getKey(); siteCode = (String) siteMapEntry.getKey();
itemCode = (String) itemMapEntry.getKey(); itemCode = (String) itemMapEntry.getKey();
if( isBomReplace )
{
int ctr = indexOfADPElement(siteCode, itemCode, saleOrderReplaceBom, lineNoReplaceBom);
if (ctr > -1)
{
continue;
}
}
adpElement = new ADPElement();
adpElement.setbomSet( itemCodeDetailMap );
//Manoj dtd 30/04/2014 to set Original/Alternate item flag //Manoj dtd 30/04/2014 to set Original/Alternate item flag
adpElement.setOriginalOrAltitem("O"); adpElement.setOriginalOrAltitem("O");
adpElement.setItemCodeParent(itemCode); //added by cpatil on 03/05/14 adpElement.setItemCodeParent(itemCode); //added by cpatil on 03/05/14
...@@ -2217,56 +2275,38 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -2217,56 +2275,38 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
adpElement.setSiteCode((String) siteMapEntry.getKey()); adpElement.setSiteCode((String) siteMapEntry.getKey());
adpElement.setItemCode((String) itemMapEntry.getKey()); adpElement.setItemCode((String) itemMapEntry.getKey());
adpElement = setAdpeValues(adpElement); adpElement = setAdpeValues(adpElement);
// System.out.println("Site Code :: "+adpElement.getSiteCode()+"Item Code :: "+adpElement.getItemCode());//Jiten if( (isBomReplace ))
// 01/11/06
// System.out.println("adpElement.getSuppSour()"+adpElement.getSuppSour());
// System.out.println("Supply Source = " +
// adpElement.getSuppSour());
}
else
{ {
System.out.println("@@@@@@@@ in populateADPElementList else part bom code ["+bomCode1+"]itemCode["+itemCode+"]");
System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+siteMapEntry+"]::::itemMapEntry["+itemMapEntry+"]");
siteCode = (String) siteMapEntry.getKey();
itemCode = (String) itemMapEntry.getKey();
adpElement.setSiteCode((String) siteMapEntry.getKey());
adpElement.setItemCode((String) itemMapEntry.getKey());
System.out.println("bomReplaceDemand["+bomReplaceDemand+"]saleOrderReplaceBom["+saleOrderReplaceBom+"]lineNoReplaceBom["+lineNoReplaceBom+"]");
adpElement.setDetDemand( ""+bomReplaceDemand ); adpElement.setDetDemand( ""+bomReplaceDemand );
adpElement.setSaleOrder(saleOrderReplaceBom); adpElement.setSaleOrder(saleOrderReplaceBom);
adpElement.setLineNo(lineNoReplaceBom); adpElement.setLineNo(lineNoReplaceBom);
//adpElement.setBomCode(bomCode1);
System.out.println("@@@@@@@@@@@@bomcode:2223["+bomCode1+"]");
adpElement.setBomCode(bomCode1);
adpElement = setAdpeValues(adpElement);
} }
if( !(isBomReplace )) if( !(isBomReplace ))
{ {
if (adpElement.getSuppSour() != null) if (adpElement.getSuppSour() != null)
{
if (adpElement.getSuppSour().equals("D") && !disPlan.equals("Y"))
{ {
continue; if (adpElement.getSuppSour().equals("D") && !disPlan.equals("Y"))
} {
if (adpElement.getSuppSour().equals("M") && (!mfgPlan.equals("Y") && !matPlan.equals("Y"))) continue;
{ }
continue; if (adpElement.getSuppSour().equals("M") && (!mfgPlan.equals("Y") && !matPlan.equals("Y")))
} {
if (adpElement.getSuppSour().equals("P") && !matPlan.equals("Y")) continue;
}
if (adpElement.getSuppSour().equals("P") && !matPlan.equals("Y"))
{
continue;
}
}
else
{ {
continue; System.out.println("NULL : SiteCode : [" + siteMapEntry.getKey() + "] ItemCode : [" + itemMapEntry.getKey() + "]");
errString = "Supply source is null...";
return errString;
} }
} else
{
System.out.println("NULL : SiteCode : [" + siteMapEntry.getKey() + "] ItemCode : [" + itemMapEntry.getKey() + "]");
errString = "Supply source is null...";
return errString;
}
} }
// Code for adding Demand (i.e. getDemand()) in adpElement // Code for adding Demand (i.e. getDemand()) in adpElement
// // adpElement.setDemand(adpElement.getDemand(demand)); // // adpElement.setDemand(adpElement.getDemand(demand));
...@@ -2933,7 +2973,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -2933,7 +2973,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
tempList.clear(); tempList.clear();
tempList = null; tempList = null;
} }
System.out.println("01/04/11 populateADPList madeToOrder [" + madeToOrder + "] adpeList.size() [" + adpeList.size() + "]"); System.out.println("12/06/14 populateADPList madeToOrder [" + madeToOrder + "] adpeList.size() [" + adpeList.size() + "]");
for (int ctr = 0; ctr < adpeList.size(); ctr++) for (int ctr = 0; ctr < adpeList.size(); ctr++)
{ {
...@@ -3649,6 +3689,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -3649,6 +3689,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
ADPElement adpElement = null; ADPElement adpElement = null;
try try
{ {
System.out.println("12/06/14 adpeList.size() [" + adpeList.size() + "]");
for (int ctr = 0; ctr < adpeList.size(); ctr++) for (int ctr = 0; ctr < adpeList.size(); ctr++)
{ {
adpElement = (ADPElement) adpeList.get(ctr); adpElement = (ADPElement) adpeList.get(ctr);
...@@ -3657,7 +3700,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -3657,7 +3700,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
for (int cycle = 1; cycle <= processCycle; cycle++) for (int cycle = 1; cycle <= processCycle; cycle++)
{ {
System.out.println("Processing level no : " + cycle + " of " + processCycle); System.out.println("12/06/14 Processing level no : [" + cycle + "] of [" + processCycle + "] adpeList.size() ["+ adpeList.size() + "]" );
// System.out.println("Size of Adpe List : " + adpeList.size()); // System.out.println("Size of Adpe List : " + adpeList.size());
for (int adpeCtr = 0; adpeCtr < adpeList.size(); adpeCtr++) for (int adpeCtr = 0; adpeCtr < adpeList.size(); adpeCtr++)
{ {
...@@ -3739,10 +3782,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -3739,10 +3782,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
batchSizeLead = adpElement.getBatchSizeLead(); batchSizeLead = adpElement.getBatchSizeLead();
// end 22/06/10 manoharan // end 22/06/10 manoharan
if( isBomReplace ) //if( isBomReplace )
{ //{
demand = bomReplaceDemand; // demand = bomReplaceDemand;
} //}
System.out.println("14012009 Optimize site : " + siteCode + " Item : " + itemCode + " Demand : " + demand + " Supply : " + supply); System.out.println("14012009 Optimize site : " + siteCode + " Item : " + itemCode + " Demand : " + demand + " Supply : " + supply);
try try
...@@ -3899,6 +3942,11 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -3899,6 +3942,11 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
// conn).toString();//Commented by Jiiten as per // conn).toString();//Commented by Jiiten as per
// Kandarp Sir 13/11/06 - // Kandarp Sir 13/11/06 -
System.out.println("xmlString--------"+xmlString); System.out.println("xmlString--------"+xmlString);
if (isBomReplace)
{
System.out.println("12/06/14 manohar xmlString [" + xmlString + "]");
}
retXMLStr = explodeBomObj.explodeBom(xmlString.toString()).toString(); // Added retXMLStr = explodeBomObj.explodeBom(xmlString.toString()).toString(); // Added
// by // by
// Jiten // Jiten
...@@ -4470,6 +4518,8 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4470,6 +4518,8 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
while (valueNode != null) while (valueNode != null)
{ {
nodeName = valueNode.getNodeName(); nodeName = valueNode.getNodeName();
if( valueNode.getFirstChild() != null )
{
nodeValue = valueNode.getFirstChild().getNodeValue(); nodeValue = valueNode.getFirstChild().getNodeValue();
if (nodeName.equals("site_code")) if (nodeName.equals("site_code"))
{ {
...@@ -4492,7 +4542,13 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4492,7 +4542,13 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
dueDate = java.sql.Timestamp.valueOf(nodeValue + " 00:00:00"); dueDate = java.sql.Timestamp.valueOf(nodeValue + " 00:00:00");
sdate = nodeValue; sdate = nodeValue;
} }
}
valueNode = valueNode.getNextSibling(); valueNode = valueNode.getNextSibling();
}
if (isBomReplace)
{
System.out.println("12/06/14 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "]");
} }
sql = "SELECT CASE WHEN ITEM_CODE__PLAN IS NULL THEN ITEM_CODE ELSE ITEM_CODE__PLAN END " + " FROM ITEM WHERE ITEM_CODE = ?"; sql = "SELECT CASE WHEN ITEM_CODE__PLAN IS NULL THEN ITEM_CODE ELSE ITEM_CODE__PLAN END " + " FROM ITEM WHERE ITEM_CODE = ?";
...@@ -4518,7 +4574,25 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4518,7 +4574,25 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
{ {
index = indexOfADPElement(siteCode, itemCode, saleOrder,lineNo); index = indexOfADPElement(siteCode, itemCode, saleOrder,lineNo);
} }
System.out.println("4072----index---"+index); //System.out.println("4072----index---"+index);
if (isBomReplace)
{
System.out.println("12/06/14 index [" + index+ "] itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]");
if (index == -1)
{
ADPElement adpElementN = new ADPElement();
adpElementN.setSiteCode(siteCode);
adpElementN.setItemCode(itemCode);
adpElementN = setAdpeValues(adpElementN);
adpElementN.setSaleOrder(saleOrder);
adpElementN.setLineNo(lineNo);
//String parentBom = itemCodeDetailMap.get(itemCode) == null ? "":itemCodeDetailMap.get(itemCode).toString();
//itemCodeDetailMap.put(itemCode, parentBom+"@"+adpElementN.getBomCode());
adpElementN.setDemand(dueDate,quantity , saleOrder, lineNo );
adpElementN.setbomSet( itemCodeDetailMap );
adpeList.add(adpElementN);
}
}
if (index != -1) if (index != -1)
{ {
adpElement = (ADPElement) adpeList.get(index); adpElement = (ADPElement) adpeList.get(index);
...@@ -4527,6 +4601,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4527,6 +4601,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
System.out.println("adpElement.getItemCode()----"+adpElement.getItemCode()+"saleOrder----"+saleOrder+"---adpElement.getSuppSour()---"+adpElement.getSuppSour()); System.out.println("adpElement.getItemCode()----"+adpElement.getItemCode()+"saleOrder----"+saleOrder+"---adpElement.getSuppSour()---"+adpElement.getSuppSour());
if(isDetailReq) if(isDetailReq)
{ {
if (isBomReplace)
{
System.out.println("12/06/14 setting demand 1 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]");
}
adpElement.setDemand(dueDate, quantity, saleOrder, lineNo); adpElement.setDemand(dueDate, quantity, saleOrder, lineNo);
adpeList.set(index, adpElement); adpeList.set(index, adpElement);
...@@ -4553,6 +4631,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4553,6 +4631,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
{ {
// adpElement = (ADPElement)adpeList.get(index); // adpElement = (ADPElement)adpeList.get(index);
//adpElement.setDemand(dueDate, quantity, " ", " ");//Commented by Manoj dtd 19/11/2013 to set Sales order and line no //adpElement.setDemand(dueDate, quantity, " ", " ");//Commented by Manoj dtd 19/11/2013 to set Sales order and line no
if (isBomReplace)
{
System.out.println("12/06/14 setting demand 2 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]");
}
adpElement.setDemand(dueDate, quantity, saleOrder, lineNo); adpElement.setDemand(dueDate, quantity, saleOrder, lineNo);
adpeList.set(index, adpElement); adpeList.set(index, adpElement);
...@@ -4562,6 +4644,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4562,6 +4644,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
else else
{ {
if (isBomReplace)
{
System.out.println("12/06/14 adding demand 1 itemCode [" + itemCode + "] dueDate [" + dueDate + "] quantity [" + quantity + "] saleOrder [" + saleOrder + "] lineNo [" + lineNo +"]");
}
ADPElement newADPElement = new ADPElement(); ADPElement newADPElement = new ADPElement();
newADPElement.setSiteCode(siteCode); newADPElement.setSiteCode(siteCode);
newADPElement.setItemCode(itemCode); newADPElement.setItemCode(itemCode);
...@@ -4593,7 +4679,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -4593,7 +4679,10 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
} else } else
{ {
System.out.println("No index found for Site Code : " + siteCode + " & Item Code : " + itemCode); if (isBomReplace)
{
System.out.println("12/06/14 No index found for Site Code : " + siteCode + " & Item Code : " + itemCode);
}
} }
} }
...@@ -7120,7 +7209,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7120,7 +7209,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSerMap + "]]>").append("</tran_ser>\r\n"); valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSerMap + "]]>").append("</tran_ser>\r\n");
valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n"); valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n"); valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n");
valueXmlString.append("<source_supply protect = '1'>").append("P").append("</source_supply>\r\n"); valueXmlString.append("<source_supply protect = '1'>").append("M").append("</source_supply>\r\n");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
...@@ -7176,7 +7265,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7176,7 +7265,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSerMap + "]]>").append("</tran_ser>\r\n"); valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSerMap + "]]>").append("</tran_ser>\r\n");
valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n"); valueXmlString.append("<planned_quantity protect = '1'>").append("<![CDATA[" + quantityMap + "]]>").append("</planned_quantity>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n"); valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unitMap + "]]>").append("</unit>\r\n");
valueXmlString.append("<source_supply protect = '1'>").append("P").append("</source_supply>\r\n"); valueXmlString.append("<source_supply protect = '1'>").append("D").append("</source_supply>\r\n");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
...@@ -7272,6 +7361,11 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7272,6 +7361,11 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
} }
}*/ }*/
detList=adpElement.getDetList(); detList=adpElement.getDetList();
if( isBomReplace )
{
System.out.println("14/06/14 supreme Detail4List for itemCode [" + itemCode + "] detList.size() [" + detList.size() + "] detList [" + detList.toString() + "]");
}
for (int timeCtr = 0; timeCtr < timeMRParr.size(); timeCtr++) for (int timeCtr = 0; timeCtr < timeMRParr.size(); timeCtr++)
{ {
System.out.println("Printing timeCtr---" + timeCtr); System.out.println("Printing timeCtr---" + timeCtr);
...@@ -7348,7 +7442,14 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7348,7 +7442,14 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
//valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + adpElement.getSaleOrder() + "]]>").append("</sale_order>\r\n"); //valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + adpElement.getSaleOrder() + "]]>").append("</sale_order>\r\n");
//valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + adpElement.getLineNo() + "]]>").append("</line_no>\r\n"); //valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + adpElement.getLineNo() + "]]>").append("</line_no>\r\n");
String refId=adpElement.getRefId(); String refId=adpElement.getRefId();
System.out.println("@@@@@@@@@@@@refId["+refId+"]"); if (isBomReplace)
{
System.out.println("13/06/14 manoharan isBomReplace ["+ isBomReplace +"] refId["+refId+"]");
}
else
{
System.out.println("@@@@@@@@@@@@refId["+refId+"]");
}
if(refId!=null && refId.trim().length()>0) if(refId!=null && refId.trim().length()>0)
{ {
System.out.println("@@@@@@@@@ inside reference"); System.out.println("@@@@@@@@@ inside reference");
...@@ -7365,12 +7466,18 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7365,12 +7466,18 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
valueXmlString.append("<order protect = '1' domID='" + count2 + "'>\r\n"); valueXmlString.append("<order protect = '1' domID='" + count2 + "'>\r\n");
String refOrd=refArray[refcnt]; String refOrd=refArray[refcnt];
String refOrdArray[]=refOrd.split("@"); String refOrdArray[]=refOrd.split("@");
if(refOrdArray.length>0) double tmpQty = 0;
if (refOrdArray.length > 0 && refOrdArray[2] != null)
{
tmpQty = Double.parseDouble(refOrdArray[2]);
}
if(refOrdArray.length>0 && tmpQty > 0 )
{ {
valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + refOrdArray[0] + "]]>").append("</sale_order>\r\n"); valueXmlString.append("<sale_order protect = '1'>").append("<![CDATA[" + refOrdArray[0] + "]]>").append("</sale_order>\r\n");
valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + refOrdArray[1] + "]]>").append("</line_no>\r\n"); valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + refOrdArray[1] + "]]>").append("</line_no>\r\n");
valueXmlString.append("<qty_reqd protect = '1'>").append("<![CDATA[" + round( refOrdArray[2]==null?0:Double.parseDouble(refOrdArray[2]),3) + "]]>").append("</qty_reqd>\r\n"); valueXmlString.append("<qty_reqd protect = '1'>").append("<![CDATA[" + getRequiredDecimal( refOrdArray[2]==null?0:Double.parseDouble(refOrdArray[2]),3) + "]]>").append("</qty_reqd>\r\n");
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
...@@ -7404,7 +7511,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7404,7 +7511,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
if ( isDetailReq ) if ( isDetailReq )
{ {
String tempCode = adpElement.getBomCodeParent()==null ?"":adpElement.getBomCodeParent(); String tempCode = itemBomMap.get(itemCode);//adpElement.getBomCodeParent()==null ?"":adpElement.getBomCodeParent();
valueXmlString.append("<bom_code_parent protect = '1'>").append("<![CDATA[" + tempCode + "]]>").append("</bom_code_parent>\r\n"); valueXmlString.append("<bom_code_parent protect = '1'>").append("<![CDATA[" + tempCode + "]]>").append("</bom_code_parent>\r\n");
tempCode = adpElement.getBomCode()==null ?"":adpElement.getBomCode(); tempCode = adpElement.getBomCode()==null ?"":adpElement.getBomCode();
valueXmlString.append("<bom_code_org protect = '1'>").append("<![CDATA[" + tempCode + "]]>").append("</bom_code_org>\r\n"); valueXmlString.append("<bom_code_org protect = '1'>").append("<![CDATA[" + tempCode + "]]>").append("</bom_code_org>\r\n");
...@@ -7422,7 +7529,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7422,7 +7529,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
//valueXmlString.append("<Deatail4 protect = '1'>"); //valueXmlString.append("<Deatail4 protect = '1'>");
{ {
flag = false; //flag = false; /// 13/06/14 manoharan
//int count1=0; //int count1=0;
for(int k=0;k<detList.size();k++) for(int k=0;k<detList.size();k++)
...@@ -7530,7 +7637,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7530,7 +7637,7 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
sourceSupplyFlag = sourceSupplyFlag + "S"; sourceSupplyFlag = sourceSupplyFlag + "S";
//sourceSupplyMap.put("stock", "S"); //sourceSupplyMap.put("stock", "S");
} }
if("Work Order".equalsIgnoreCase(tranSer2) || "Dist Issue".equalsIgnoreCase(tranSer2) || "Dist Receipt".equalsIgnoreCase(tranSer2) || "Purchase Order".equalsIgnoreCase(tranSer2) || "Indent".equalsIgnoreCase(tranSer2)) if("Work Order".equalsIgnoreCase(tranSer2) || "Dist Order".equalsIgnoreCase(tranSer2) || "Dist Order".equalsIgnoreCase(tranSer2) || "Purchase Order".equalsIgnoreCase(tranSer2) || "Indent".equalsIgnoreCase(tranSer2))
{ {
sourceSupplyFlag = sourceSupplyFlag + "W"; sourceSupplyFlag = sourceSupplyFlag + "W";
//sourceSupplyMap.put("wip", "W"); //sourceSupplyMap.put("wip", "W");
...@@ -7558,38 +7665,15 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7558,38 +7665,15 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
{ {
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
// CHANGE BY RITESH ON 12/JUN/2014 START
if(flag)
{
valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + desc + "]]>").append("</description>\r\n");
}else
{
valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</description>\r\n");
}
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n"); valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
} else } else
{ {
valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</site_code>\r\n");
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</item_code>\r\n");
valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</description>\r\n");
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</supp_sour>\r\n"); valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</supp_sour>\r\n");
} }
valueXmlString.append("<demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(demand, 3) + "]]>").append("</demand>\r\n"); valueXmlString.append("<demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(demand, 3) + "]]>").append("</demand>\r\n");
valueXmlString.append("<supply protect = '1'>").append("<![CDATA[" + round(supply, 3) + "]]>").append("</supply>\r\n"); valueXmlString.append("<supply protect = '1'>").append("<![CDATA[" + round(supply, 3) + "]]>").append("</supply>\r\n");
if (flag)
{
valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n");
valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n");
}else
{
valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n");
valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n");
}
// CHANGE BY RITESH ON 12/JUN/2014 END
valueXmlString.append("<due_date protect = '1'>").append("<![CDATA[" + dueDateStr + "]]>").append("</due_date>\r\n"); valueXmlString.append("<due_date protect = '1'>").append("<![CDATA[" + dueDateStr + "]]>").append("</due_date>\r\n");
valueXmlString.append("<plan_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(planSupply, 3) + "]]>").append("</plan_supply>\r\n"); valueXmlString.append("<plan_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(planSupply, 3) + "]]>").append("</plan_supply>\r\n");
valueXmlString.append("<running_demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningDemand, 3) + "]]>").append("</running_demand>\r\n"); valueXmlString.append("<running_demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningDemand, 3) + "]]>").append("</running_demand>\r\n");
...@@ -7620,9 +7704,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7620,9 +7704,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
valueXmlString.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(purLeadTime, 2) + "]]>").append("</pur_lead_time>\r\n"); valueXmlString.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(purLeadTime, 2) + "]]>").append("</pur_lead_time>\r\n");
valueXmlString.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(qcLeadTime, 2) + "]]>").append("</qc_lead_time>\r\n"); valueXmlString.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(qcLeadTime, 2) + "]]>").append("</qc_lead_time>\r\n");
valueXmlString.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(mfgLeadTime, 2) + "]]>").append("</mfg_lead_time>\r\n"); valueXmlString.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(mfgLeadTime, 2) + "]]>").append("</mfg_lead_time>\r\n");
// valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + desc + "]]>").append("</description>\r\n"); valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + desc + "]]>").append("</description>\r\n");
// valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n"); valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n");
// valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n"); valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n");
valueXmlString.append("<pending_po protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendPOQty, 3) + "]]>").append("</pending_po>\r\n"); valueXmlString.append("<pending_po protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendPOQty, 3) + "]]>").append("</pending_po>\r\n");
valueXmlString.append("<pending_do protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDOQty, 3) + "]]>").append("</pending_do>\r\n"); valueXmlString.append("<pending_do protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDOQty, 3) + "]]>").append("</pending_do>\r\n");
valueXmlString.append("<pending_indent protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendIndQty, 3) + "]]>").append("</pending_indent>\r\n"); valueXmlString.append("<pending_indent protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendIndQty, 3) + "]]>").append("</pending_indent>\r\n");
...@@ -7645,9 +7729,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si ...@@ -7645,9 +7729,9 @@ System.out.println("@@@@@@@@ isBomReplace["+isBomReplace+"]::::siteMapEntry["+si
valueXmlString.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</pur_lead_time>\r\n"); valueXmlString.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</pur_lead_time>\r\n");
valueXmlString.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</qc_lead_time>\r\n"); valueXmlString.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</qc_lead_time>\r\n");
valueXmlString.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</mfg_lead_time>\r\n"); valueXmlString.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + 0.00 + "]]>").append("</mfg_lead_time>\r\n");
// valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</description>\r\n"); valueXmlString.append("<description protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</description>\r\n");
// valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n"); valueXmlString.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n");
// valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n"); valueXmlString.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n");
valueXmlString.append("<pending_po protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendPOQty, 3) + "]]>").append("</pending_po>\r\n"); valueXmlString.append("<pending_po protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendPOQty, 3) + "]]>").append("</pending_po>\r\n");
valueXmlString.append("<pending_do protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDOQty, 3) + "]]>").append("</pending_do>\r\n"); valueXmlString.append("<pending_do protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDOQty, 3) + "]]>").append("</pending_do>\r\n");
valueXmlString.append("<pending_indent protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendIndQty, 3) + "]]>").append("</pending_indent>\r\n"); valueXmlString.append("<pending_indent protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendIndQty, 3) + "]]>").append("</pending_indent>\r\n");
......
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