Commit 8616efa0 authored by cpatil's avatar cpatil

modify for work order updation


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95285 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7e0ac9f8
...@@ -83,7 +83,7 @@ public class MrpWizPrsSaveBean ...@@ -83,7 +83,7 @@ public class MrpWizPrsSaveBean
// Timestamp newsysDate = java.sql.Timestamp.valueOf( sdf.format(currentDate)+" 00:00:00.0"); // Timestamp newsysDate = java.sql.Timestamp.valueOf( sdf.format(currentDate)+" 00:00:00.0");
// System.out.println("Now the date is :=> ["+newsysDate+"]"); // System.out.println("Now the date is :=> ["+newsysDate+"]");
java.sql.Date date = new java.sql.Date(currentDate.getTime()); java.sql.Date date = new java.sql.Date(currentDate.getTime());
String parentItem=""; String parentItem="",prevItemWorder="",previousItem="";
StockAllocationPrc stockAllocationPrc = new StockAllocationPrc() ; StockAllocationPrc stockAllocationPrc = new StockAllocationPrc() ;
...@@ -173,10 +173,20 @@ public class MrpWizPrsSaveBean ...@@ -173,10 +173,20 @@ public class MrpWizPrsSaveBean
{ {
parentItem = detail4List.item(cntr).getFirstChild().getNodeValue(); parentItem = detail4List.item(cntr).getFirstChild().getNodeValue();
} }
if("prev_item_worder".equalsIgnoreCase( detail4Node.getNodeName()))
{
prevItemWorder = detail4List.item(cntr).getFirstChild().getNodeValue();
}
if("previous_item".equalsIgnoreCase( detail4Node.getNodeName()))
{
previousItem = detail4List.item(cntr).getFirstChild().getNodeValue();
}
} }
} }
System.out.println("@@@@ctr["+dtlCtr+"]saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-qtyReqd["+qtyReqdStr+"]@@@"); System.out.println("@@@@ctr["+dtlCtr+"]saleOrder["+saleOrder+"]-lineNo["+lineNo+"]-qtyReqd["+qtyReqdStr+"]prevItemWorder["+prevItemWorder+"]previousItem["+previousItem+"]@@@");
System.out.println("@@@@ctr["+dtlCtr+"]siteCode["+siteCode+"]-itemCode["+itemCode+"]-lotNo["+lotNo+"]-lotSl["+lotSl+"]-locCode["+locCode+"]-tranSer["+tranSer+"]allocQtyStr["+allocQtyStr+"]@@@"); System.out.println("@@@@ctr["+dtlCtr+"]siteCode["+siteCode+"]-itemCode["+itemCode+"]-lotNo["+lotNo+"]-lotSl["+lotSl+"]-locCode["+locCode+"]-tranSer["+tranSer+"]allocQtyStr["+allocQtyStr+"]@@@");
String itemCodeHdr=""; String itemCodeHdr="";
...@@ -251,9 +261,9 @@ public class MrpWizPrsSaveBean ...@@ -251,9 +261,9 @@ public class MrpWizPrsSaveBean
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
pstmt.setDate(2,date); // TRAN_DATE pstmt.setDate(2,date); // TRAN_DATE
pstmt.setString(3, tranType); // TRAN_TYPE VARCHAR2(3) pstmt.setString(3, tranType); // TRAN_TYPE VARCHAR2(3)
pstmt.setString(4, " "); // WORK_ORDER CHAR(10) pstmt.setString(4, prevItemWorder); // WORK_ORDER CHAR(10)
pstmt.setString(5, siteCode); // SITE_CODE CHAR(5) pstmt.setString(5, siteCode); // SITE_CODE CHAR(5)
pstmt.setString(6, itemCodeHdr); // ITEM_CODE CHAR(10) pstmt.setString(6, previousItem); // ITEM_CODE CHAR(10)
pstmt.setDate(7, date); //CHG_DATE DATE pstmt.setDate(7, date); //CHG_DATE DATE
pstmt.setString(8, chgUser); //CHG_USER CHAR(10) pstmt.setString(8, chgUser); //CHG_USER CHAR(10)
pstmt.setString(9, chgTerm ); // CHG_TERM CHAR(15) pstmt.setString(9, chgTerm ); // CHG_TERM CHAR(15)
......
...@@ -166,6 +166,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -166,6 +166,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String saleOrderReplaceBom="", lineNoReplaceBom=""; String saleOrderReplaceBom="", lineNoReplaceBom="";
HashMap itemCodeDetailMap = new HashMap(); HashMap itemCodeDetailMap = new HashMap();
HashMap itemWorkOrderMap = new HashMap(); // 18/06/14
HashMap parentItemMap = new HashMap(); // 18/06/14
boolean isWizard=false; boolean isWizard=false;
//String IPD_INDEPENDENT = "",IPD_INDENT = "",IPD_MPS_ORDER = "",IPD_DIST = ""; //cpatil on 15/01/14 //String IPD_INDEPENDENT = "",IPD_INDENT = "",IPD_MPS_ORDER = "",IPD_DIST = ""; //cpatil on 15/01/14
...@@ -490,6 +494,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -490,6 +494,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
} }
String parentBom = itemCodeDetailMap.get(bomCode1) == null ? "":itemCodeDetailMap.get(bomCode1).toString(); String parentBom = itemCodeDetailMap.get(bomCode1) == null ? "":itemCodeDetailMap.get(bomCode1).toString();
itemCodeDetailMap.put(itemCodeTo, parentBom+"@"+bomCode1); itemCodeDetailMap.put(itemCodeTo, parentBom+"@"+bomCode1);
String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode1, conn);
parentItemMap.put(itemCodeTo, sourceItem ); //18/06/14
System.out.println("@@@@ 500 : sourceItem["+sourceItem+"]bomCode["+bomCode1+"]itemCodeTo["+itemCodeTo+"]parentItemMap["+parentItemMap+"]");
System.out.println("13/06/14 adpeList.size() after 2 [" + adpeList.size() + "] itemBomMap [" + itemBomMap + "]"); System.out.println("13/06/14 adpeList.size() after 2 [" + adpeList.size() + "] itemBomMap [" + itemBomMap + "]");
} }
...@@ -1538,6 +1547,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1538,6 +1547,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
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+"]");
String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
parentItemMap.put(rs.getString(1), sourceItem ); //18/06/14
System.out.println("@@@@ 1552 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
} }
rs1.close(); rs1.close();
rs1=null; rs1=null;
...@@ -1578,6 +1591,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1578,6 +1591,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itemBomMap.put(rs.getString(1), bomCode); itemBomMap.put(rs.getString(1), bomCode);
String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).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();
String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
parentItemMap.put(rs.getString(1), sourceItem ); //18/06/14
System.out.println("@@@@ 1589 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
System.out.println("14/06/14 supreme isBomReplace [" + isBomReplace + "] itemCodeMap added with [" + rs.getString(1) + "] itemCodeDetailMap [" + itemCodeDetailMap + "]"); System.out.println("14/06/14 supreme isBomReplace [" + isBomReplace + "] itemCodeMap added with [" + rs.getString(1) + "] itemCodeDetailMap [" + itemCodeDetailMap + "]");
} }
//} //}
...@@ -1636,6 +1655,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1636,6 +1655,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).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);
String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
parentItemMap.put(rs.getString(1), sourceItem ); //18/06/14
System.out.println("@@@@ 1661 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
System.out.println("@@@@ itemCodeDetailMap 1575["+itemCodeDetailMap+"]"); System.out.println("@@@@ itemCodeDetailMap 1575["+itemCodeDetailMap+"]");
} else } else
{ {
...@@ -1654,6 +1677,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -1654,6 +1677,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
String parentBom = itemCodeDetailMap.get(rs.getString(1)) == null ? "":itemCodeDetailMap.get(rs.getString(1)).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);
String sourceItem = setDescription("item_code", "bom", "bom_code", bomCode, conn);
parentItemMap.put(rs.getString(1), sourceItem ); //18/06/14
System.out.println("@@@@ 1682 : sourceItem["+sourceItem+"]bomCode["+bomCode+"]parentItemMap["+parentItemMap+"]");
System.out.println("@@@@ itemCodeDetailMap 1592["+itemCodeDetailMap+"]"); System.out.println("@@@@ itemCodeDetailMap 1592["+itemCodeDetailMap+"]");
...@@ -7212,8 +7240,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7212,8 +7240,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
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("M").append("</source_supply>\r\n"); valueXmlString.append("<source_supply protect = '1'>").append("M").append("</source_supply>\r\n");
//valueXmlString.append("<previous_item protect = '1'>").append(itemWorderMap.get(itemCodeMap)==null?"":itemWorderMap.get(itemCodeMap).toString()).append("</previous_item>\r\n");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
itemWorkOrderMap.put(itemCodeMap, tranIdCodeMap); // 18/06/14
IPD_MPS_ORDER_List.add(siteCodeMap+itemCodeMap); IPD_MPS_ORDER_List.add(siteCodeMap+itemCodeMap);
} }
System.out.println("cpatil--------IPD_INDENT["+IPD_INDENT+"]"); System.out.println("cpatil--------IPD_INDENT["+IPD_INDENT+"]");
...@@ -7242,6 +7275,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7242,6 +7275,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
//itemWorderMap.put(itemCode, tranIdCodeMap); // 18/06/14
IPD_INDENT_List.add(siteCodeMap+itemCodeMap); IPD_INDENT_List.add(siteCodeMap+itemCodeMap);
} }
System.out.println("cpatil--------IPD_DIST["+IPD_DIST+"]"); System.out.println("cpatil--------IPD_DIST["+IPD_DIST+"]");
...@@ -7270,6 +7305,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7270,6 +7305,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
// itemWorderMap.put(itemCode, tranIdCodeMap); // 18/06/14
IPD_DIST_List.add(siteCodeMap+itemCodeMap); IPD_DIST_List.add(siteCodeMap+itemCodeMap);
} }
System.out.println("cpatil--------IPD_INDEPENDENT["+IPD_INDEPENDENT+"]"); System.out.println("cpatil--------IPD_INDEPENDENT["+IPD_INDEPENDENT+"]");
...@@ -7298,6 +7335,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7298,6 +7335,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
// itemWorderMap.put(itemCode, tranIdCodeMap); // 18/06/14
IPD_INDEPENDENT_List.add(siteCodeMap+itemCodeMap); IPD_INDEPENDENT_List.add(siteCodeMap+itemCodeMap);
} }
...@@ -7995,6 +8034,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -7995,6 +8034,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + setDescription("unit", "item", "item_code", stkKey[1], conn) + "]]>").append("</unit>\r\n"); valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + setDescription("unit", "item", "item_code", stkKey[1], conn) + "]]>").append("</unit>\r\n");
valueXmlString.append("<parent_item protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</parent_item>\r\n"); valueXmlString.append("<parent_item protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</parent_item>\r\n");
String prevItemValue = parentItemMap.get(stkKey[1])==null?"":parentItemMap.get(stkKey[1]).toString();
valueXmlString.append("<previous_item protect = '1'>").append("<![CDATA[" + prevItemValue + "]]>").append("</previous_item>\r\n");
valueXmlString.append("<prev_item_worder protect = '1'>").append("<![CDATA[" + (itemWorkOrderMap.get(prevItemValue)==null?"":itemWorkOrderMap.get(prevItemValue).toString()) + "]]>").append("</prev_item_worder>\r\n");
System.out.println("@@@@8037:prevItemValue["+prevItemValue+"]parentItemMap["+parentItemMap+"]itemWorkOrderMap["+itemWorkOrderMap+"]");
} }
} }
...@@ -8007,6 +8050,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe ...@@ -8007,6 +8050,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + stkKey[1] + "]]>").append("</line_no>\r\n"); valueXmlString.append("<line_no protect = '1'>").append("<![CDATA[" + stkKey[1] + "]]>").append("</line_no>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + setDescription("unit", "item", "item_code", itemCode, conn) + "]]>").append("</unit>\r\n"); valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + setDescription("unit", "item", "item_code", itemCode, conn) + "]]>").append("</unit>\r\n");
valueXmlString.append("<previous_item protect = '1'>").append(" ").append("</previous_item>\r\n");
valueXmlString.append("<prev_item_worder protect = '1'>").append(" ").append("</prev_item_worder>\r\n");
} }
valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSer + "]]>").append("</tran_ser>\r\n"); valueXmlString.append("<tran_ser protect = '1'>").append("<![CDATA[" + tranSer + "]]>").append("</tran_ser>\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