Commit ba01234e authored by cpatil's avatar cpatil

modify for solving time issue of execution


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96893 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4d8654c8
......@@ -3187,6 +3187,50 @@ 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);
saleOrderAdp = adpElement.getSaleOrder();
itemCodeAdp = adpElement.getItemCode();
siteCodeAdp = adpElement.getSiteCode();
demandAdp = adpElement.getDemand();
supplyAdp = adpElement.getSupply();
stockQtyAdp = adpElement.getStockQty();
othSupplyAdp = adpElement.getOthSupply();
pendingPOAdp = adpElement.getPendingPO();
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();
for(int l=0;l<detList.size();l++)
{
HashMap<String,ADPElement> detMap=detList.get(l);
Set keyset=detMap.keySet();
Iterator<String> itr=keyset.iterator();
while(itr.hasNext())
{
String key=itr.next();
//cpatil-25/08/14-System.out.println("key----"+key);
if(key!=null && (checkNull(key).trim()).length()>0)
{
System.out.println("inside--detMap.get(key).getItemCode["+detMap.get(key).getItemCode()+"]detMap.get(key).getSiteCode["+detMap.get(key).getSiteCode()+"]detMap.get(key).getPendingPO()["+detMap.get(key).getPendingPO()+"]detMap.get(key).getDemand()["+detMap.get(key).getDemand()+"]detMap.get(key).getSupply()["+detMap.get(key).getSupply()+"]detMap.get(key).getPendingDO["+detMap.get(key).getPendingDO()+"]detMap.get(key).getPendingDR["+detMap.get(key).getPendingDR()+"]detMap.get(key).getPendingIndent["+detMap.get(key).getPendingIndent()+"]detMap.get(key).getStockQty["+detMap.get(key).getStockQty()+"]");
}
}
}
}
}
}
else
{
......@@ -3212,7 +3256,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//cpatil-25/08/14-System.out.println("key----"+key);
if(key!=null && (checkNull(key).trim()).length()>0)
{
System.out.println("detMap.get(key).getPendingPO()---"+detMap.get(key).getPendingPO());
System.out.println("inside--detMap.get(key).getItemCode["+detMap.get(key).getItemCode()+"]detMap.get(key).getSiteCode["+detMap.get(key).getSiteCode()+"]detMap.get(key).getPendingPO()["+detMap.get(key).getPendingPO()+"]detMap.get(key).getDemand()["+detMap.get(key).getDemand()+"]detMap.get(key).getSupply()["+detMap.get(key).getSupply()+"]detMap.get(key).getPendingDO["+detMap.get(key).getPendingDO()+"]detMap.get(key).getPendingDR["+detMap.get(key).getPendingDR()+"]detMap.get(key).getPendingIndent["+detMap.get(key).getPendingIndent()+"]");
}
}
}
......@@ -3680,6 +3724,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//tempitemCodeList = "'"+siteCode+itemCode+"'" ;
tempitemCodeList = "'"+siteCodeAdp+itemCode+"'" ;
}
//adpElement=null; //cpatilnull
}
System.out.println("@@@@@@@@ before tempitemCodeList==["+tempitemCodeList+"]");
......@@ -3842,8 +3887,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);
......@@ -3858,6 +3908,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;
......@@ -3873,21 +3926,26 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itemCode = adpElement.getItemCode();
siteCodeAdp = adpElement.getSiteCode();
System.out.println("dataMap["+dataMap+"]");
//System.out.println("dataMap["+dataMap+"]");
if( dataMap != null && dataMap.containsKey(siteCodeAdp+itemCode))
{
adpElementListValueAll = dataMap.get(siteCodeAdp+itemCode);
}
System.out.println("@@@@@ value get from map.....");
System.out.println("adpElementListValueAll.size["+adpElementListValueAll.size()+"]");
//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();
//ArrayList adpElementListValue = new ArrayList();
DataBean dataBeanTemp = (DataBean) adpElementListValueAll.get(ctrList);
System.out.println("@@@cpatiladpElementListValue["+adpElementListValue+"]");
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();
if("0".equals(madeToOrder) && "O".equals(adpElement.getMfgType()))
......@@ -3912,7 +3970,7 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
//adpElement.setPendingPO(dueDate, pendPOQty);
adpElement.setPendingPO(dueDate, (Double) dataBeanTemp.getPendPOQty());
//adpElement.setPendingDO(dueDate, pendDOQty);
adpElement.setPendingDO(dueDate, (Double) dataBeanTemp.getPendPOQty());
adpElement.setPendingDO(dueDate, (Double) dataBeanTemp.getPendDOQty());
//adpElement.setPendingIndent(dueDate, pendIndQty);
adpElement.setPendingIndent(dueDate, (Double) dataBeanTemp.getPendIndQty());
//adpElement.setPendingDR(dueDate, pendDRQty);
......@@ -3920,17 +3978,20 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
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, supply);
detADPElement.setStockQty(dueDate, dataBeanTemp.getStockQty());
detADPElement.setOthSupply(dueDate, dataBeanTemp.getOthSupply());
detADPElement.setPendingPO(dueDate, dataBeanTemp.getPendPOQty());
detADPElement.setPendingDO(dueDate, dataBeanTemp.getPendDOQty());
detADPElement.setPendingIndent(dueDate, dataBeanTemp.getPendIndQty());
detADPElement.setPendingDR(dueDate, dataBeanTemp.getPendDRQty());
detADPElement.setSupply(dueDate, (Double) dataBeanTemp.getSupply() );
//System.out.println("@@@@@@@@@@@@detADPElement.getSupply()["+detADPElement.getSupply()+"]");
detADPElement.setStockQty(dueDate, (Double) dataBeanTemp.getStockQty());
detADPElement.setOthSupply(dueDate, (Double) dataBeanTemp.getOthSupply());
detADPElement.setPendingPO(dueDate, (Double) dataBeanTemp.getPendPOQty());
detADPElement.setPendingDO(dueDate, (Double) dataBeanTemp.getPendDOQty());
detADPElement.setPendingIndent(dueDate, (Double) dataBeanTemp.getPendIndQty());
detADPElement.setPendingDR(dueDate, (Double) dataBeanTemp.getPendDRQty());
//cpatil-25/08/14-System.out.println("Setting SaleOrder in Detail record---"+adpElement.getSaleOrder());
//cpatil-25/08/14-System.out.println("Setting Line No in Detail record---"+adpElement.getLineNo());
detADPElement.setSaleOrder(adpElement.getSaleOrder());
......@@ -3946,13 +4007,17 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
alist.add( detMap);
}
//adpElement.setDetMap(detMap);
//System.out.println("@@@@@@@@detADPElement["+detADPElement+"]");
adpElement.setDetList(alist);
detMap=null;
detADPElement=null;
alist=null;
//detMap=null;
//detADPElement=null;
//alist=null;
}
//dataBeanTemp = null; //cpatilnull
}
......@@ -3966,9 +4031,10 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
System.out.println("@@@@@ in ctr["+ctr+"]adpElement["+adpElement+"]");
//System.out.println("@@@@@ in ctr["+ctr+"]adpElement["+adpElement+"]");
adpeList.set(ctr, adpElement);
//adpElementListValueAll = null; //cpatilnull
}
......@@ -4215,19 +4281,19 @@ public class RunMRPPrc extends ProcessEJB implements RunMRPPrcLocal, RunMRPPrcRe
itemCode = adpElement.getItemCode();
siteCodeAdp = adpElement.getSiteCode();
ArrayList adpElementListValue = new ArrayList();
// ArrayList adpElementListValue = new ArrayList();
adpElementListValue = (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();
System.out.println("@@@cpatil adpElementListValueAll.size()["+ adpElementListValueAll.size()+"]");
//for( int ctrList=0; ctrList < adpElementListValueAll.size(); ctrList++ )
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);
......
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