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
Hide 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,9 +1411,9 @@ 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 ( select "+itemCodeOnlyList+" from dual " +
//" 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 ( select "+itemCodeOnlyList+" from dual " +
//" UNION SELECT ITEM_CODE FROM MPS_ORDER WHERE CONCAT (TRAN_ID,ITEM_CODE) IN("+itemCodeList+") ) ";
}
else
{
......@@ -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)
{
......@@ -3187,11 +3189,11 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
System.out.println("@@@@cpatil adpList["+adpeList.size()+"]");
populateDemandSupply(adpeList);
//System.out.println("@@@@@@@@@@@ after modify adpeList ----------adpeList["+adpeList+"]----");
String itemCodeAdp="",siteCodeAdp="",saleOrderAdp="" ;
double demandAdp=0,supplyAdp = 0,stockQtyAdp = 0,othSupplyAdp = 0,pendingPOAdp = 0, pendingDOAdp = 0,pendingIndentAdp = 0,pendingDRAdp = 0;
for ( int ctr1 = 0; ctr1 < adpeList.size(); ctr1++ ) //Loop for each node of current detail
{
ADPElement adpElement = (ADPElement) adpeList.get(ctr1);
......@@ -3207,9 +3209,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
pendingDOAdp = adpElement.getPendingDO();
pendingIndentAdp = adpElement.getPendingIndent();
pendingDRAdp = adpElement.getPendingDR();
System.out.println("@@@_saleOrderAdp==["+saleOrderAdp+"]itemCodeAdp==["+itemCodeAdp+"]siteCodeAdp["+siteCodeAdp+"]demandAdp["+demandAdp+"]supplyAdp["+supplyAdp+"]stockQtyAdp["+stockQtyAdp+"]othSupplyAdp["+othSupplyAdp+"]pendingPOAdp["+pendingPOAdp+"]pendingDOAdp["+pendingDOAdp+"]pendingIndentAdp["+pendingIndentAdp+"]pendingDRAdp["+pendingDRAdp+"]");
if(isDetailReq)
{
ArrayList<HashMap<String, ADPElement>> detList=adpElement.getDetList();
......@@ -3230,7 +3232,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
}
}
}
else
{
......@@ -3701,10 +3703,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
double prevpendDRQty=0;
double qtStk=0;//added by Chandrashekar 0n 11-08-14
String siteCodeAdp="",tempitemCodeList="";
try
{
System.out.println("@@@@cpatil adpList["+adpList.size()+"]");
for ( int ctr1 = 0; ctr1 < adpList.size(); ctr1++ ) //Loop for each node of current detail
{
......@@ -3732,8 +3734,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("@@@@@@@@ after tempitemCodeList==["+tempitemCodeList+"]");
//itemCode = adpElement.getItemCode();
//siteCode = adpElement.getSiteCode();
// 01/04/11 manoharan if made to order is selected and item is of
......@@ -3864,8 +3866,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
// System.out.println("Query Executed for item : " + itemCode);
String rsItemCode = "", adpItemcode = "",rsSiteCode="";
HashMap<String, ArrayList<DataBean>> dataMap = new HashMap<String, ArrayList<DataBean>>();
// HashMap<K, V>
// HashMap<K, V>
while(rs.next())
{
DataBean dataBeanObject = new DataBean();
......@@ -3887,13 +3889,13 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
tranId=rs.getString("tran_id");
tranSer=rs.getString("tran_ser");
dataBeanObject.setTranId(tranId);
dataBeanObject.setTranSer(tranSer);
}
System.out.println("@@@_for setmap:::itemCode==["+rs.getString(1)+"]siteCode["+rs.getString(13)+"]demand["+rs.getDouble(3)+"]supply["+rs.getDouble(4)+"]stockQty["+rs.getDouble(5)+"]othSupply["+rs.getDouble(6)+"]pendingPO["+rs.getDouble(7)+"]pendingDO["+rs.getDouble(8)+"]pendingIndent["+rs.getDouble(9)+"]pendingDR["+rs.getDouble(10)+"]");
if( dataMap.containsKey(siteCodeAdp+rsItemCode) )
{
ArrayList tempAdpElementList = (ArrayList) dataMap.get(rsSiteCode+rsItemCode);
......@@ -3908,9 +3910,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
dataMap.put(rsSiteCode+rsItemCode,tempAdpElementList);
//adpElementMap.put(siteCodeAdp+rsItemCode, adpElementList);
}
dataBeanObject = null;
}
rs.close();
rs = null;
......@@ -3933,18 +3935,18 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
//System.out.println("@@@@@ value get from map.....");
//System.out.println("adpElementListValueAll.size["+adpElementListValueAll.size()+"]");
for( int ctrList =0; ctrList < adpElementListValueAll.size(); ctrList++)
{
//ArrayList adpElementListValue = new ArrayList();
DataBean dataBeanTemp = (DataBean) adpElementListValueAll.get(ctrList);
System.out.println("@@@_for getmap:::itemCode==["+itemCode+"]siteCode["+siteCodeAdp+"]demand["+dataBeanTemp.getDemand()+"]supply["+dataBeanTemp.getSupply()+"]stockQty["+dataBeanTemp.getStockQty()+"]othSupply["+dataBeanTemp.getOthSupply()+"]pendingPO["+dataBeanTemp.getPendPOQty()+"]pendingDO["+dataBeanTemp.getPendDOQty()+"]pendingIndent["+dataBeanTemp.getPendIndQty()+"]pendingDR["+dataBeanTemp.getPendDRQty()+"]");
tranId = dataBeanTemp.getTranId();
tranSer = dataBeanTemp.getTranSer();
System.out.println("@@@tranId["+tranId+"]tranSer["+tranSer+"]");
//dueDate = (Timestamp)adpElementListValue.get(1);
dueDate = (Timestamp) dataBeanTemp.getDueDate();
......@@ -3956,7 +3958,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
{
//demand = (Double) adpElementListValue.get(2);
demand = (Double) dataBeanTemp.getDemand();
}
//adpElement.setDemand(dueDate, demand, " ", " ");
......@@ -3975,15 +3977,15 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
adpElement.setPendingIndent(dueDate, (Double) dataBeanTemp.getPendIndQty());
//adpElement.setPendingDR(dueDate, pendDRQty);
adpElement.setPendingDR(dueDate, (Double) dataBeanTemp.getPendDRQty());
if(isDetailReq)
{
System.out.println("@@@_for detail getmap:::itemCode==["+itemCode+"]siteCode["+siteCodeAdp+"]demand["+dataBeanTemp.getDemand()+"]supply["+dataBeanTemp.getSupply()+"]stockQty["+dataBeanTemp.getStockQty()+"]othSupply["+dataBeanTemp.getOthSupply()+"]pendingPO["+dataBeanTemp.getPendPOQty()+"]pendingDO["+dataBeanTemp.getPendDOQty()+"]pendingIndent["+dataBeanTemp.getPendIndQty()+"]pendingDR["+dataBeanTemp.getPendDRQty()+"]");
ADPElement detADPElement=new ADPElement();
detADPElement.setDemand(dueDate, demand, " ", " ");
detADPElement.setSupply(dueDate, (Double) dataBeanTemp.getSupply() );
//System.out.println("@@@@@@@@@@@@detADPElement.getSupply()["+detADPElement.getSupply()+"]");
detADPElement.setStockQty(dueDate, (Double) dataBeanTemp.getStockQty());
......@@ -4015,12 +4017,12 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
//dataBeanTemp = null; //cpatilnull
}
System.out.println(adpElement.getSupply());
if (demand != 0 || supply != 0)
{
......@@ -4028,18 +4030,18 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
if (adpElement.getSuppSour().equals("M"))
System.out.println("Site Code : " + siteCode + " Item Code : " + itemCode + " Due Date : " + dueDate + " Demand : " + demand + " supply : " + supply);
}
//System.out.println("@@@@@ in ctr["+ctr+"]adpElement["+adpElement+"]");
adpeList.set(ctr, adpElement);
//adpElementListValueAll = null; //cpatilnull
}
System.out.println("@@@@@ adpeList.size()["+adpeList.size()+"]");
} catch (SQLException se)
{
System.out.println("SQLException :RunMRPPrcEJB : populateDemandSupply(ADPElement).." + se.getMessage());
......@@ -4273,7 +4275,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("@@@cpatiladpElementMap["+adpElementMap+"]");
System.out.println("@@@cpatiladpList.size()["+adpList.size()+"]");
for( int ctr=0; ctr < adpList.size() ; ctr++ )
{
ADPElement adpElement = (ADPElement) adpeList.get(ctr);
......@@ -4282,8 +4284,8 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
siteCodeAdp = adpElement.getSiteCode();
// ArrayList adpElementListValue = new ArrayList();
adpElementListValueAll = (ArrayList) adpElementMap.get(siteCodeAdp+rsItemCode);
adpElementListValueAll = (ArrayList) adpElementMap.get(siteCodeAdp+rsItemCode);
//adpElementListValueAll = (ArrayList) adpElementMap.get(siteCodeAdp+rsItemCode);
//System.out.println("@@@cpatilitemCode["+itemCode+"]siteCodeAdp["+siteCodeAdp+"]adpElementListValue["+adpElementListValue+"]");
//ADPElement adpElement = new ADPElement();
......@@ -4291,9 +4293,9 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
for( int ctrList=0; ctrList < adpElementListValueAll.size(); ctrList++ )
{
ArrayList adpElementListValue = new ArrayList();
ArrayList adpElementListValue = new ArrayList();
adpElementListValue = (ArrayList) adpElementListValueAll.get(ctr);
adpElementListValue = (ArrayList) adpElementListValueAll.get(ctr);
System.out.println("@@@cpatiladpElementListValue["+adpElementListValue+"]");
dueDate = (Timestamp)adpElementListValue.get(1);
......@@ -4370,7 +4372,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
}
//System.out.println("@@@@@ out updctr["+updctr+"]updFlag["+updFlag+"]");
//if( updFlag == true)
/*
else
......@@ -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