Commit 9146f3b5 authored by caluka's avatar caluka

changes in Column Headings and Columns to be removed from the Screen


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98447 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a267da51
......@@ -72,7 +72,8 @@ public class MrpExportExcelServlet extends HttpServlet
String mfgLeadTime = "";
String pendPOQty = "";
String pendIndQty = "";
String holdStock = "";
HSSFCell cell = null;
HSSFRow row = null;
HSSFCellStyle cellStyle = null;
......@@ -126,12 +127,13 @@ public class MrpExportExcelServlet extends HttpServlet
titles.add("DESCRIPTION");
titles.add("UNIT");
titles.add("SUPP SOURCE");
titles.add("DEMAND");
titles.add("SUPPLY");
titles.add("REQUIREMENT");
titles.add("APPROVED STOCK ");
titles.add("QUARANTINE STOCK");
titles.add("PLAN SUPPLY");
titles.add("RUNNING PLAN SUPPLY");
titles.add("RUNNING DEMAND");
titles.add("HOLD STOCK");
//titles.add("PLAN SUPPLY");
//titles.add("RUNNING PLAN SUPPLY");
//titles.add("RUNNING DEMAND");
titles.add("RUNNING SUPPLY");
titles.add("PENDING INDENT");
titles.add("PENDING PO");
......@@ -190,18 +192,19 @@ public class MrpExportExcelServlet extends HttpServlet
demand=finalValues.get(4);
supply=finalValues.get(5);
quarantineStock=finalValues.get(6);
planSupply=finalValues.get(7);
runningPlanSupply=finalValues.get(8);
runningDemand=finalValues.get(9);
runningSupply=finalValues.get(10);
pendIndQty=finalValues.get(11);
pendPOQty=finalValues.get(12);
orderOpt=finalValues.get(13);
purLeadTime=finalValues.get(14);
mfgLeadTime=finalValues.get(15);
qcLeadTime=finalValues.get(16);
batchQty=finalValues.get(17);
yieldPerc=finalValues.get(18);
holdStock=finalValues.get(7);
//planSupply=finalValues.get(7);
//runningPlanSupply=finalValues.get(8);
//runningDemand=finalValues.get(9);
runningSupply=finalValues.get(8);
pendIndQty=finalValues.get(9);
pendPOQty=finalValues.get(10);
orderOpt=finalValues.get(11);
purLeadTime=finalValues.get(12);
mfgLeadTime=finalValues.get(13);
qcLeadTime=finalValues.get(14);
batchQty=finalValues.get(15);
yieldPerc=finalValues.get(16);
insertRow++;
row = sheet.createRow(insertRow);
......@@ -217,18 +220,19 @@ public class MrpExportExcelServlet extends HttpServlet
row.getCell(4).setCellValue(demand);
row.getCell(5).setCellValue(supply);
row.getCell(6).setCellValue(quarantineStock);
row.getCell(7).setCellValue(planSupply);
row.getCell(8).setCellValue(runningPlanSupply);
row.getCell(9).setCellValue(runningDemand);
row.getCell(10).setCellValue(runningSupply);
row.getCell(11).setCellValue(pendIndQty);
row.getCell(12).setCellValue(pendPOQty);
row.getCell(13).setCellValue(orderOpt);
row.getCell(14).setCellValue(purLeadTime);
row.getCell(15).setCellValue(mfgLeadTime);
row.getCell(16).setCellValue(qcLeadTime);
row.getCell(17).setCellValue(batchQty);
row.getCell(18).setCellValue(yieldPerc);
row.getCell(7).setCellValue(holdStock);
//.getCell(7).setCellValue(planSupply);
//row.getCell(8).setCellValue(runningPlanSupply);
//row.getCell(9).setCellValue(runningDemand);
row.getCell(8).setCellValue(runningSupply);
row.getCell(9).setCellValue(pendIndQty);
row.getCell(10).setCellValue(pendPOQty);
row.getCell(11).setCellValue(orderOpt);
row.getCell(12).setCellValue(purLeadTime);
row.getCell(13).setCellValue(mfgLeadTime);
row.getCell(14).setCellValue(qcLeadTime);
row.getCell(15).setCellValue(batchQty);
row.getCell(16).setCellValue(yieldPerc);
}
}
......
......@@ -154,15 +154,18 @@
<strong>Supp Source</strong>
</td>
<td width="4%" class="header_td" nowrap="true" valign="bottom">
<strong>Demand</strong>
<strong>Requirement</strong>
</td>
<td width="15%" class="header_td" nowrap="true" valign="bottom">
<strong>Supply</strong>
<strong>Approved Stock </strong>
</td>
<td width="2%" class="header_td" nowrap="true" valign="bottom">
<strong>Quarantine Stock</strong>
</td>
<td width="2%" class="header_td" nowrap="true" valign="bottom">
<strong>Hold Stock</strong>
</td>
<!-- <td width="2%" class="header_td" nowrap="true" valign="bottom">
<strong>Plan Supply</strong>
</td>
<td width="5%" class="header_td" nowrap="true" valign="bottom">
......@@ -170,7 +173,7 @@
</td>
<td width="5%" class="header_td" nowrap="true" valign="bottom">
<strong>Running Demand</strong>
</td>
</td> -->
<td width="5%" class="header_td" nowrap="true" valign="bottom">
<strong>Running Supply</strong>
</td>
......@@ -294,7 +297,10 @@
<xsl:variable name="quarntine_stk">
<xsl:value-of select="quarntine_stk" />
</xsl:variable>
<xsl:variable name="plan_supply">
<xsl:variable name="hold_qty">
<xsl:value-of select="hold_qty" />
</xsl:variable>
<!-- <xsl:variable name="plan_supply">
<xsl:value-of select="plan_supply" />
</xsl:variable>
<xsl:variable name="running_plan_supply">
......@@ -302,7 +308,7 @@
</xsl:variable>
<xsl:variable name="running_demand">
<xsl:value-of select="running_demand" />
</xsl:variable>
</xsl:variable> -->
<xsl:variable name="running_supply">
<xsl:value-of select="running_supply" />
</xsl:variable>
......@@ -468,6 +474,12 @@
<xsl:value-of select="quarntine_stk" />
</td>
<td class="td_leftAlign" style="text-align:right">
<input type="hidden" name="Detail3.{normalize-space($dbID)}.hold_qty"
id="Detail3.{normalize-space($dbID)}.hold_qty" value="{$hold_qty}"
size="04" ISCHANGED="false" />
<xsl:value-of select="hold_qty" />
</td>
<!-- <td class="td_leftAlign" style="text-align:right">
<input type="hidden" name="Detail3.{normalize-space($dbID)}.plan_supply"
id="Detail3.{normalize-space($dbID)}.plan_supply" value="{$plan_supply}"
size="04" ISCHANGED="false" />
......@@ -484,7 +496,7 @@
id="Detail3.{normalize-space($dbID)}.running_demand" value="{$running_demand}"
size="04" ISCHANGED="false" />
<xsl:value-of select="running_demand" />
</td>
</td> -->
<td class="td_leftAlign" style="text-align:right">
<input type="hidden" name="Detail3.{normalize-space($dbID)}.running_supply"
id="Detail3.{normalize-space($dbID)}.running_supply" value="{$running_supply}"
......
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