Skip to content

B
business-java
Commit e5aec23a authored by prane's avatar prane
Browse files
Options

changes done for D-ISS & S-DSP and added suppSite in 2nd sheet if SuppSour is D 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@193506 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9df8892a
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 16 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ e5aec23a
......@@ -4646,7 +4646,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double stockQty = 0;
double othSupply = 0;
// end 12/04/10 manoharan MF90BHU001
int indxCnt = 0; //pavan R on 28nov18
// Variables declared by gulzar on 4/18/2012
double pendPOQty = 0;
double pendDOQty = 0;
......@@ -5210,7 +5210,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, qtStkdet);
demandSupplyMap.put(14, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(15, adpEle.getSiteCodeSupp());
}else{
demandSupplyMap.put(15, " ");
}
System.out.println("5221 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
} else
......@@ -5277,7 +5287,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(11, tranIdDet);
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(14, adpEle.getSiteCodeSupp());
}else{
demandSupplyMap.put(14, " ");
}
System.out.println("5295 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
} else
{
......@@ -5309,7 +5329,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(11, tranIdDet);
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(14, adpEle.getSiteCodeSupp());
}else{
demandSupplyMap.put(14, " ");
}
System.out.println("5334 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
}
}
......@@ -5874,7 +5904,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double pendIndQty = 0;
double pendDRQty = 0;
// End changes by gulzar on 4/18/2012
int indxCnt = 0;//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
Statement stmt = null;
ResultSet rs = null;
errString = "";
......@@ -6395,6 +6425,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, qtStkDet);
demandSupplyMap.put(14, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(15, checkNull(adpEle.getSiteCodeSupp()));
}else{
demandSupplyMap.put(15, " ");
}
System.out.println("6427 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
}
else
......@@ -6461,6 +6502,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(11, tranIdDet);
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(14, checkNull(adpEle.getSiteCodeSupp()));
}else{
demandSupplyMap.put(14, " ");
}
System.out.println("6502 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
}
......@@ -6494,6 +6546,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
demandSupplyMap.put(11, tranIdDet);
demandSupplyMap.put(12, tranSerDet);
demandSupplyMap.put(13, siteCodeDEt);
//pavan R on 28nov18 [to get siteCodeSupplier if suppSour is D]
indxCnt = indexOfADPElement(siteCodeDEt, itemCodeDet);
ADPElement adpEle = (ADPElement) adpeList.get(indxCnt);
if("D".equals(checkNull(adpEle.getSuppSour())))
{
demandSupplyMap.put(14, checkNull(adpEle.getSiteCodeSupp()));
}else{
demandSupplyMap.put(14, " ");
}
System.out.println("6544 indxCnt["+indxCnt+"]adpeList["+adpeList.size()+"]adpEle.getSuppSour()["+adpEle.getSuppSour()+"]adpEle.getSiteCodeSupp()["+adpEle.getSiteCodeSupp()+"]");
//pavan R on 28nov18
demandSupplyList.add(demandSupplyMap);
}
......@@ -11205,6 +11268,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
StringBuffer retTabSepStrBuff = new StringBuffer();
StringBuffer valueXmlString = new StringBuffer();
StringBuffer reqValueXmlString = new StringBuffer();
StringBuffer valueXmlStringDet = new StringBuffer();
String siteCode = "0";
String itemCode = "0";
String bomCode = "0";
......@@ -11282,7 +11346,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
int count = 0,reqCount = 0;
reqValueXmlString = new StringBuffer("<?xml version = \"1.0\"?><Root>\r\n");//added by chandrashekar 0n 12-08-14
valueXmlStringDet = new StringBuffer("<?xml version = \"1.0\"?><Root>\r\n");
Set sorderItemSet=new TreeSet();
//test
......@@ -11555,6 +11619,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("8850 key2["+key2+"]");
//ArrayList<ADPElement> adpeList1=finalMap.get(key2);
System.out.println("finalMap.get(key2).size()["+finalMap.get(key2).size()+"]");*/
int browCnt = 1;
for (int adpeCount = 0; adpeCount < adpeList.size(); adpeCount++)
{
//System.out.println("BASE9321");
......@@ -11695,6 +11760,54 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pendIndQty = timeMrp.getPendingIndent();
pendIndQtySum = pendIndQtySum+pendIndQty;
pendDRQty = timeMrp.getPendingDR();
// pavan R on 28nov18 [to get return string in xml]
valueXmlStringDet.append("<Detail2 domID='" + browCnt + "' >\r\n");
valueXmlStringDet.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
valueXmlStringDet.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
valueXmlStringDet.append("<description protect = '1'>").append("<![CDATA[" + desc + "]]>").append("</description>\r\n");
valueXmlStringDet.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlStringDet.append("<demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(demandSum, 3) + "]]>").append("</demand>\r\n");
valueXmlStringDet.append("<supply protect = '1'>").append("<![CDATA[" + round(supplySum, 3) + "]]>").append("</supply>\r\n");
valueXmlStringDet.append("<stock_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(stockQty, 3) + "]]>").append("</stock_qty>\r\n");
valueXmlStringDet.append("<oth_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(othSupply, 3) + "]]>").append("</oth_supply>\r\n");
valueXmlStringDet.append("<pending_po protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendPOQty, 3) + "]]>").append("</pending_po>\r\n");
valueXmlStringDet.append("<pending_do protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDOQty, 3) + "]]>").append("</pending_do>\r\n");
valueXmlStringDet.append("<pending_indent protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendIndQty, 3) + "]]>").append("</pending_indent>\r\n");
valueXmlStringDet.append("<pending_dr protect = '1'>").append("<![CDATA[" + getRequiredDecimal(pendDRQty, 3) + "]]>").append("</pending_dr>\r\n");
valueXmlStringDet.append("<due_date protect = '1'>").append("<![CDATA[" + dueDateStr + "]]>").append("</due_date>\r\n");
valueXmlStringDet.append("<plan_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(planSupplySum, 3) + "]]>").append("</plan_supply>\r\n");
valueXmlStringDet.append("<running_demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningDemandSum, 3) + "]]>").append("</running_demand>\r\n");
valueXmlStringDet.append("<running_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningSupplySum, 3) + "]]>").append("</running_supply>\r\n");
valueXmlStringDet.append("<running_plan_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningPlanSupplySum, 3) + "]]>").append("</running_plan_supply>\r\n");
valueXmlStringDet.append("<independent_demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(independentDemand, 3) + "]]>").append("</independent_demand>\r\n");
if (bomCode != null)
{
valueXmlStringDet.append("<bom_code protect = '1'>").append("<![CDATA[" + bomCode + "]]>").append("</bom_code>\r\n");
} else
{
valueXmlStringDet.append("<bom_code protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</bom_code>\r\n");
}
valueXmlStringDet.append("<order_opt protect = '1'>").append("<![CDATA[" + orderOpt + "]]>").append("</order_opt>\r\n");
valueXmlStringDet.append("<batch_qty_type protect = '1'>").append("<![CDATA[" + batchQtyType + "]]>").append("</batch_qty_type>\r\n");
valueXmlStringDet.append("<unit protect = '1'>").append("<![CDATA[" + unit + "]]>").append("</unit>\r\n");
valueXmlStringDet.append("<min_order_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(minOrderQty, 3) + "]]>").append("</min_order_qty>\r\n");
valueXmlStringDet.append("<integral_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(integralQty, 3) + "]]>").append("</integral_qty>\r\n");
valueXmlStringDet.append("<max_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(maxQty, 3) + "]]>").append("</max_qty>\r\n");
valueXmlStringDet.append("<min_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(minQty, 3) + "]]>").append("</min_qty>\r\n");
valueXmlStringDet.append("<reorder_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(reorderQty, 3) + "]]>").append("</reorder_qty>\r\n");
valueXmlStringDet.append("<yield_perc protect = '1'>").append("<![CDATA[" + getRequiredDecimal(yieldPerc, 2) + "]]>").append("</yield_perc>\r\n");
valueXmlStringDet.append("<min_plan_perc protect = '1'>").append("<![CDATA[" + getRequiredDecimal(minPlanPerc, 2) + "]]>").append("</min_plan_perc>\r\n");
valueXmlStringDet.append("<batch_qty protect = '1'>").append("<![CDATA[" + getRequiredDecimal(batchQty, 3) + "]]>").append("</batch_qty>\r\n");
valueXmlStringDet.append("<purc_rate protect = '1'>").append("<![CDATA[" + getRequiredDecimal(purcRate, 3) + "]]>").append("</purc_rate>\r\n");
valueXmlStringDet.append("<pur_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(purLeadTime, 2) + "]]>").append("</pur_lead_time>\r\n");
valueXmlStringDet.append("<qc_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(qcLeadTime, 2) + "]]>").append("</qc_lead_time>\r\n");
valueXmlStringDet.append("<mfg_lead_time protect = '1'>").append("<![CDATA[" + getRequiredDecimal(mfgLeadTime, 2) + "]]>").append("</mfg_lead_time>\r\n");
valueXmlStringDet.append("</Detail2>");
browCnt++;
//pavan R on 28nov18 end
//Added by manoj dtd 05/01/15
/*if(isDetailReq)
{
......@@ -12522,7 +12635,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//}
valueXmlStringDet.append("</Root>");
valueXmlString.append("</Root>");
reqValueXmlString.append("</Root>");
//System.out.println("Printing reqValueXmlString----" + reqValueXmlString);//commented By Pavan R on 26/OCT/17
......@@ -12570,7 +12683,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
}
}
return resultString;
return resultString = valueXmlStringDet.toString();
}
......@@ -12799,7 +12912,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
HSSFRow row = null;
HSSFCellStyle cellStyle = null;
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
String suppSiteCode = "";
final String[] titles =
{ "Site Code","Item Type", "Item Code", "Item Description", "Supply Source", "Demand", "Supply", "Stock Qty", "Other Supply", "Pending PO", "Pending DO", "Pending Indent", "Pending DR", "Due Date", "Plan Supply", "Running Demand", "Running Supply", "Running Plan Supply", "Independent Demand", "Bom Code", "Order Opt", "Batch Qty Type", "Unit", "Min Order Qty", "Integral Qty", "Max Qty", "Min Qty", "Reorder Qty", "Yield Perc", "Min Plan %", "Batch Qty", "Purc Rate", "Pur Lead Time", "QC Lead Time", "MFG Lead Time" };
// 30
......@@ -13086,7 +13199,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
"Demand", "Supply", "Stock Qty", "Other Supply",
"Pending PO", "Pending DO", "Pending Indent",
"Pending DR", "Tran Id", "Tran Series",
"Qt Stock ", "Site Code" };
"Qt Stock ", "Site Code" ,"Supplier Site Code"};
HSSFSheet sheetDet = wb.createSheet("MRPRun Input Data Detail");
HSSFRow titleRowDet = sheetDet.createRow(0);
......@@ -13137,6 +13250,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
tranSerDet = (String) demandSupplyMap.get(12);
qtstock = (Double) demandSupplyMap.get(13);
siteCodeDet = (String) demandSupplyMap.get(14);
suppSiteCode = (String) demandSupplyMap.get(15);
insertRowDet++;
rowDet = sheetDet.createRow(insertRowDet);
......@@ -13164,6 +13278,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rowDet.getCell(11).setCellValue(tranSerDet);
rowDet.getCell(12).setCellValue(qtstock);
rowDet.getCell(13).setCellValue(siteCodeDet);
rowDet.getCell(14).setCellValue(suppSiteCode== null?" ":suppSiteCode);
}
}
......@@ -13253,7 +13368,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
final String[] detTitles = { "Item Code", "Due Date",
"Demand", "Supply", "Stock Qty", "Other Supply",
"Pending PO", "Pending DO", "Pending Indent",
"Pending DR", "Tran Id", "Tran Series", "Site Code" };
"Pending DR", "Tran Id", "Tran Series", "Site Code","Supplier Site Code" };
HSSFSheet sheetDet = wb.createSheet("MRPRun Input Data Detail");
HSSFRow titleRowDet = sheetDet.createRow(0);
......@@ -13299,7 +13414,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
tranIdDet = (String) demandSupplyMap.get(11);
tranSerDet = (String) demandSupplyMap.get(12);
siteCodeDet = (String) demandSupplyMap.get(13);
suppSiteCode = (String) demandSupplyMap.get(14);
insertRowDet++;
rowDet = sheetDet.createRow(insertRowDet);
for (int j = 0; j < detTitles.length; j++)
......@@ -13323,6 +13438,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rowDet.getCell(10).setCellValue(tranIdDet);
rowDet.getCell(11).setCellValue(tranSerDet);
rowDet.getCell(12).setCellValue(siteCodeDet);
rowDet.getCell(13).setCellValue(suppSiteCode== null?" ":suppSiteCode);
}
}
......@@ -13331,7 +13447,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
final String[] detTitles = { "Item Code", "Due Date",
"Demand", "Supply", "Stock Qty", "Other Supply",
"Pending PO", "Pending DO", "Pending Indent",
"Pending DR", "Tran Id", "Tran Series", "Site Code" };
"Pending DR", "Tran Id", "Tran Series", "Site Code","Supplier Site Code" };
HSSFSheet sheetDet = wb.createSheet("MRPRun Input Data Detail");
HSSFRow titleRowDet = sheetDet.createRow(0);
......@@ -13377,7 +13493,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
tranIdDet = (String) demandSupplyMap.get(11);
tranSerDet = (String) demandSupplyMap.get(12);
siteCodeDet = (String) demandSupplyMap.get(13);
suppSiteCode = (String) demandSupplyMap.get(14);
insertRowDet++;
rowDet = sheetDet.createRow(insertRowDet);
for (int j = 0; j < detTitles.length; j++)
......@@ -13401,7 +13517,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
rowDet.getCell(10).setCellValue(tranIdDet);
rowDet.getCell(11).setCellValue(tranSerDet);
rowDet.getCell(12).setCellValue(siteCodeDet);
rowDet.getCell(13).setCellValue(suppSiteCode== null?" ":suppSiteCode);
}
}
}
......
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