Skip to content

B
business-java
Commit ff81ce56 authored by cpatil's avatar cpatil
Browse files
Options

*** empty log message *** 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96952 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b4f4bf96
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 47 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ ff81ce56
......@@ -1411,7 +1411,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//subQuery=" AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM SORDDET WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN("+itemCodeList+") ) ";
//subQuery=" AND C.ITEM_CODE IN ( SELECT ITEM_CODE__ORD FROM SORDDET WHERE CONCAT (SALE_ORDER,ITEM_CODE) IN("+itemCodeList+") " +
// " UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ";
subQuery=" and ( C.ITEM_CODE IN ("+itemCodeOnlyList+ ") OR C.ITEM_CODE IN( SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ) ";
subQuery=" and ( C.ITEM_CODE IN ("+itemCodeOnlyList+ ") OR C.ITEM_CODE IN( SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN ("+itemCodeList+") ) ) ";
// subQuery=" and C.ITEM_CODE IN ( select "+itemCodeOnlyList+" from dual " +
//" UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ";
}
......@@ -1421,8 +1421,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//subQuery=" AND C.ITEM_CODE IN(SELECT ITEM_CODE__ORD FROM SORDDET WHERE SALE_ORDER||ITEM_CODE IN("+itemCodeList+")" +
// " UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE TRAN_ID||ITEM_CODE IN("+itemCodeList+") )";
// subQuery=" and C.ITEM_CODE IN ("+itemCodeOnlyList+ ") OR C.ITEM_CODE IN( SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ";
subQuery=" and ( C.ITEM_CODE IN ( select "+itemCodeOnlyList+" from dual " +
" UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE ( TRAN_ID||ITEM_CODE) IN ("+itemCodeList+") ) ) ";
// subQuery=" and ( C.ITEM_CODE IN ( select "+itemCodeOnlyList+" from dual " +
// " UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE ( TRAN_ID||ITEM_CODE) IN ("+itemCodeList+") ) ) ";
subQuery=" and ( C.ITEM_CODE IN ("+itemCodeOnlyList+ ") OR C.ITEM_CODE IN( SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN ("+itemCodeList+") ) ) ";
}
}else if(isRequirement)
{
......@@ -8614,6 +8616,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
valueXmlString.append("<item_code_descr protect = '1'>").append("<![CDATA[" + setDescription("descr","item","item_code",itemCode,conn) + "]]>").append("</item_code_descr>\r\n");
valueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<itemType protect = '1'>").append("<![CDATA[" + getItemType(suppSour) + "]]>").append("</itemType>\r\n");
valueXmlString.append("<running_supply protect = '1'>").append("<![CDATA[" + getRequiredDecimal(runningSupply, 3) + "]]>").append("</running_supply>\r\n");
valueXmlString.append("<unit protect = '1'>").append("<![CDATA[" + unit + "]]>").append("</unit>\r\n");
//valueXmlString.append("<tran_ser_flag protect = '1'>").append("<![CDATA[" + tranSerFlag(siteCode+itemCode,IPD_DIST_List,IPD_INDENT_List,IPD_INDEPENDENT_List,IPD_MPS_ORDER_List) + "]]>").append("</tran_ser_flag>\r\n");
......@@ -8801,11 +8804,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
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("<itemType protect = '1'>").append("<![CDATA[" + getItemType(suppSour) + "]]>").append("</itemType>\r\n");
} else
{
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("<supp_sour protect = '1'>").append("<![CDATA[" + "" + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<itemType protect = '1'>").append("<![CDATA[" + getItemType("") + "]]>").append("</itemType>\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");
......@@ -9212,6 +9217,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
reqValueXmlString.append("<site_code protect = '1'>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>\r\n");
reqValueXmlString.append("<item_code protect = '1'>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>\r\n");
reqValueXmlString.append("<supp_sour protect = '1'>").append("<![CDATA[" + suppSour + "]]>").append("</supp_sour>\r\n");
valueXmlString.append("<itemType protect = '1'>").append("<![CDATA[" + getItemType(suppSour) + "]]>").append("</itemType>\r\n");
reqValueXmlString.append("<demand protect = '1'>").append("<![CDATA[" + getRequiredDecimal(demandSum, 3) + "]]>").append("</demand>\r\n");
reqValueXmlString.append("<supply protect = '1'>").append("<![CDATA[" + round(supplySum, 3) + "]]>").append("</supply>\r\n");
reqValueXmlString.append("<due_date protect = '1'>").append("<![CDATA[" + dueDateStr + "]]>").append("</due_date>\r\n");
......@@ -9320,6 +9326,27 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
return flag;
}
private String getItemType(String suppSour) throws SQLException
{
String value="";
// if( flag == true )
// {
// value="0";
// }
// else
if("M".equalsIgnoreCase(suppSour) )
{
value="1";
}
if("P".equalsIgnoreCase(suppSour) )
{
value="2";
}
return value;
}
private String setDescription(String field, String table,
String field2, String value,Connection conn) throws SQLException
{
......
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPWiz.java
View file @ ff81ce56
......@@ -444,7 +444,8 @@ public class RunMRPWiz extends ValidatorEJB implements RunMRPWizLocal, RunMRPWiz
" mps_order.status end in ('P','T','M','N')) " + // added N in condition on 26/06/14
" and mps_order.site_code >= ? AND mps_order.site_code <= ? " +
" and (mps_order.due_date >= ? ) and (mps_order.due_date <= ? ) " +
" ) a order by sale_order, line_no " ;
// " ) a order by sale_order, line_no " +
" ) a order by due_date , order_due_date " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCodeFr);
......
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