Skip to content

B
business-java
Commit e006053b authored by caluka's avatar caluka
Browse files
Options

ejb updated for MRP Requirement Wizard[MF3KSUN005] 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95599 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4f9d32f0
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 6 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RequirementIC.java
View file @ e006053b
......@@ -118,6 +118,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
String siteCodeTo = "";
String siteItemList="";
String tranidIncrement="";
String bomCode="";
Document argDom = null;
......@@ -189,7 +190,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
/* Change By Sachin on 26/6/2013 */
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE >= ? AND A.SITE_CODE <=? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY";
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY, C.BOM_CODE " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE >= ? AND A.SITE_CODE <=? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
pstmt = conn.prepareStatement(selectSql);
pstmt.setString(1, siteCodeFr);
......@@ -218,6 +219,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + rs.getString("UNIT") + "]]>").append("</unit>\r\n");
valueXmlString.append("<no_of_batch protect = '1'>").append("<![CDATA[" + batchReq + "]]>").append("</no_of_batch>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[" + rs.getDouble("QUANTITY") + "]]>").append("</quantity>\r\n");
valueXmlString.append("<bom_code>").append("<![CDATA[" + rs.getString("BOM_CODE") + "]]>").append("</bom_code>\r\n");
valueXmlString.append("</Detail2>");
}
rs.close();
......@@ -236,6 +238,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
valueXmlString.append("<quantity>").append("0").append("</quantity>\r\n");
valueXmlString.append("<no_of_batch protect = '1'>").append("0").append("</no_of_batch>\r\n");
valueXmlString.append("<unit protect = '1'>").append("").append("</unit>\r\n");
valueXmlString.append("<bom_code>").append("").append("</bom_code>\r\n");
valueXmlString.append("</Detail2>");
}
......@@ -262,11 +265,11 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
siteCodeFr = genericUtility.getColumnValue("site_code__fr", dom1);
siteCodeTo = genericUtility.getColumnValue("site_code__to", dom1);
insertSql = "INSERT INTO MPS_ORDER(TRAN_ID, ORDER_TYPE, ITEM_CODE, SITE_CODE, QUANTITY, ORD_DATE, DUE_DATE, STATUS, STATUS_DATE, YIELD_PERC, UNIT ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
insertSql = "INSERT INTO MPS_ORDER(TRAN_ID, ORDER_TYPE, ITEM_CODE, SITE_CODE, QUANTITY, ORD_DATE, DUE_DATE, STATUS, STATUS_DATE, YIELD_PERC, UNIT , BOM_CODE ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
pstmtIns = conn.prepareStatement(insertSql);
selectSql = "SELECT BATCH_QTY FROM BOM WHERE BOM_CODE = (SELECT BOM_CODE FROM SITEITEM WHERE SITE_CODE = ? AND ITEM_CODE = ? )";
selectSql = "SELECT BATCH_QTY,BOM_CODE FROM BOM WHERE BOM_CODE = (SELECT BOM_CODE FROM SITEITEM WHERE SITE_CODE = ? AND ITEM_CODE = ? )";
pstmtSel = conn.prepareStatement(selectSql);
selectSql = "SELECT UNIT,YIELD_PERC FROM ITEM WHERE ITEM_CODE = ? ";
......@@ -367,6 +370,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
if (rs.next())
{
batchQty = rs.getDouble("BATCH_QTY");
bomCode = rs.getString("BOM_CODE");
}
pstmtSel.clearParameters();
rs.close();
......@@ -397,6 +401,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
pstmtIns.setTimestamp(9, sysDate);
pstmtIns.setDouble(10, yieldPerc);
pstmtIns.setString(11, unit);
pstmtIns.setString(12, bomCode);
pstmtIns.addBatch();
pstmtIns.clearParameters();
}
......@@ -893,7 +898,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
{
System.out.println("In side Search "+search);
sql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? AND A.ITEM_CODE LIKE ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY";
sql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY ,C.BOM_CODE " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? AND A.ITEM_CODE LIKE ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
System.out.println("sql:::"+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
......@@ -918,6 +923,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
valueXmlString.append("<quantity>").append("<![CDATA[" + rs.getDouble("QUANTITY") + "]]>").append("</quantity>\r\n");
valueXmlString.append("<DOMID><![CDATA[").append(dbID).append("]]></DOMID>\r\n");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>\r\n");
valueXmlString.append("<BOM_CODE protect = '1'>").append("<![CDATA[" + rs.getString("BOM_CODE") + "]]>").append("</BOM_CODE>\r\n");
valueXmlString.append("</ITEM>\r\n");
num++;
}
......@@ -930,7 +936,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
else if(itemCode == null || itemCode.trim().length() == 0)
{
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY";
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY ,C.BOM_CODE " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
System.out.println("sql:::"+selectSql);
pstmt = conn.prepareStatement(selectSql);
pstmt.setString(1, siteCode);
......@@ -954,6 +960,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
valueXmlString.append("<quantity>").append("<![CDATA[" + rs.getDouble("QUANTITY") + "]]>").append("</quantity>\r\n");
valueXmlString.append("<DOMID><![CDATA[").append(dbID).append("]]></DOMID>\r\n");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>\r\n");
valueXmlString.append("<BOM_CODE protect = '1'>").append("<![CDATA[" + rs.getString("BOM_CODE") + "]]>").append("</BOM_CODE>\r\n");
valueXmlString.append("</ITEM>\r\n");
num++;
}
......@@ -966,7 +973,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
}
else{
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? AND A.ITEM_CODE LIKE ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY";
selectSql = "SELECT A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, SUM(A.QUANTITY) AS QUANTITY,C.BOM_CODE " + "FROM MPS_ORDER A, ITEM B ,BOM C " + "WHERE ( A.ITEM_CODE = B.ITEM_CODE (+)) " + "AND A.SITE_CODE = ? AND A.ITEM_CODE LIKE ? " + "AND A.STATUS IN ('P','T','M') " + "AND A.BOM_CODE=C.BOM_CODE " + "GROUP BY A.SITE_CODE, A.ITEM_CODE, B.DESCR, A.UNIT, C.BATCH_QTY, C.BOM_CODE";
System.out.println("sql:::"+selectSql);
pstmt = conn.prepareStatement(selectSql);
pstmt.setString(1, siteCode);
......@@ -989,6 +996,7 @@ public class RequirementIC extends ValidatorEJB implements RequirementICLocal, R
valueXmlString.append("<UNIT protect = '1'>").append("<![CDATA[" + rs.getString("UNIT") + "]]>").append("</UNIT>\r\n");
valueXmlString.append("<no_of_batch protect = '1'>").append("<![CDATA[" + batchReq + "]]>").append("</no_of_batch>\r\n");
valueXmlString.append("<quantity>").append("<![CDATA[" + rs.getDouble("QUANTITY") + "]]>").append("</quantity>\r\n");
valueXmlString.append("<BOM_CODE protect = '1'>").append("<![CDATA[" + rs.getString("BOM_CODE") + "]]>").append("</BOM_CODE>\r\n");
valueXmlString.append("<DOMID><![CDATA[").append(dbID).append("]]></DOMID>\r\n");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>\r\n");
valueXmlString.append("</ITEM>\r\n");
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ e006053b
......@@ -3582,6 +3582,19 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//}
}
}
//start Added by chandrashekar on 09-07-2014
System.out.println("siteItemList["+siteItemList+"]"+"Sitecode["+siteCode+"]"+"itemCode["+rsItemCode+"]");
if(isRequirement)
{
if(siteItemList.length()>0 && !(siteItemList.indexOf(siteCode+rsItemCode) > -1 ))
{
//if(!(siteItemList.indexOf(rsItemCode) > -1 ))
//{
continue;
//}
}
}
//End Added by chandrashekar on 09-07-2014
adpElement.setSaleOrder(saleOrder);
adpElement.setLineNo(lineNo);
......
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