Skip to content

B
business-java
Commit 83e21784 authored by manohar's avatar manohar
Browse files
Options

quantity calculation changed in few places 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91225 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c957ba51
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 126 deletions
webitm-mfg/ibase/webitm/ejb/mfg/RunMRPPrc.java
View file @ 83e21784
...@@ -2714,7 +2714,7 @@ fout.close(); ...@@ -2714,7 +2714,7 @@ fout.close();
batchQtyType = adpElement.getBatchQtyType(); batchQtyType = adpElement.getBatchQtyType();
orderOpt = adpElement.getOrderOpt(); orderOpt = adpElement.getOrderOpt();
minStkDay = adpElement.getMinStkDay(); minStkDay = adpElement.getMinStkDay();
System.out.println("11012008 Item " + adpElement.getItemCode() + " integralQty " + decFormat(integralQty) + " req qty " + decFormat(reqQty) + " Batch Qty " + decFormat(batchQty) ); System.out.println("25022010 Item " + adpElement.getItemCode() + " integralQty " + decFormat(integralQty) + " req qty " + decFormat(reqQty) + " Batch Qty " + decFormat(batchQty) );
if ( minStkDay > 0 && mrpDynMinStk.equals("Y") ) if ( minStkDay > 0 && mrpDynMinStk.equals("Y") )
{ {
stkLevel = getStkLevel(adpElement, dueDate); stkLevel = getStkLevel(adpElement, dueDate);
...@@ -2731,122 +2731,94 @@ fout.close(); ...@@ -2731,122 +2731,94 @@ fout.close();
chkOrdQty = stkLevel; chkOrdQty = stkLevel;
} }
} }
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{ System.out.println("25022010 1-> chkOrdQty " + decFormat(chkOrdQty) + " reqQty " + decFormat(reqQty) + " stkLevel " + decFormat(stkLevel) + " reoQty " + decFormat(reoQty));
System.out.println("calculateQuantity 1-> chkOrdQty " + decFormat(chkOrdQty) + " reqQty " + decFormat(reqQty) + " stkLevel " + decFormat(stkLevel) + " reoQty " + decFormat(reoQty));
}
if (reqQty > chkOrdQty && chkOrdQty > 0) if (reqQty > chkOrdQty && chkOrdQty > 0)
{ {
if ( minOrderChk.equals("Y") ) if ( minOrderChk.equals("Y") )
{ {
multiplier = new Double(Math.ceil( (reqQty + stkLevel) / integralQty)).intValue(); multiplier = new Double(Math.ceil( (reqQty + stkLevel) / integralQty)).intValue();
System.out.println("25022010 2->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
if (mfgPlan.equals("N") && matPlan.equals("N") ) if (mfgPlan.equals("N") && matPlan.equals("N") )
{ {
multiplier = new Double(Math.ceil(((reqQty + stkLevel)) / integralQty)).intValue(); multiplier = new Double(Math.ceil(((reqQty + stkLevel)) / integralQty)).intValue();
System.out.println("25022010 3->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
//if (suppSour.equals("M") && orderOpt.equals("B") && !batchQtyType.equals("V"))
//{
//}
//else
//{
//multiplier = wf_demand_qty(reqQty, stkLevel, integralQty );
if (reqQty > 0 && reqQty > Math.floor(reqQty)) if (reqQty > 0 && reqQty > Math.floor(reqQty))
{ {
if (integralQty > 1) if (integralQty > 1)
{ {
multiplier = new Double(Math.ceil((reqQty + stkLevel) / integralQty)).intValue(); multiplier = new Double(Math.ceil((reqQty + stkLevel) / integralQty)).intValue();
System.out.println("25022010 4->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
multiplier = new Double(reqQty).intValue(); multiplier = new Double(Math.ceil(reqQty + stkLevel)).intValue();//(new Double(reqQty + stkLevel).intValue()) + 1; // 25/02/10
System.out.println("25022010 5->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
} }
else else
{ {
multiplier = new Double(Math.ceil( (reqQty + stkLevel) / integralQty)).intValue(); multiplier = new Double(Math.ceil( (reqQty + stkLevel) / integralQty)).intValue();
} System.out.println("25022010 6->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
//}
} }
} }
} }
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{
System.out.println("calculateQuantity 2-> integralQty " + decFormat(integralQty) + " multiplier " + multiplier + " newIntegral " + decFormat(multiplier * integralQty));
} }
integralQty = multiplier * integralQty; integralQty = multiplier * integralQty;
multiplier = 1; multiplier = 1;
System.out.println("25022010 7->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
if (integralQty > reoQty) if (integralQty > reoQty)
{ {
reoQty = integralQty; reoQty = integralQty;
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{
System.out.println("A");
} }
} System.out.println("25022010 8->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
//else
//{
if ( reoQty == 0) if ( reoQty == 0)
{ {
reoQty = reqQty + stkLevel; reoQty = reqQty + stkLevel;
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{
System.out.println("B");
}
} }
System.out.println("25022010 8->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
if ( minOrderChk.equals("Y") ) if ( minOrderChk.equals("Y") )
{ {
multiplier = new Double(Math.ceil( (stkLevel + reqQty ) / reoQty)).intValue(); multiplier = new Double(Math.ceil( (stkLevel + reqQty ) / reoQty)).intValue();
System.out.println("C"); System.out.println("25022010 9->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
if (mfgPlan.equals("N") && matPlan.equals("N") ) if (mfgPlan.equals("N") && matPlan.equals("N") )
{ {
multiplier = new Double(Math.ceil((reqQty + stkLevel)/ reoQty)).intValue(); multiplier = new Double(Math.ceil((reqQty + stkLevel)/ reoQty)).intValue();
System.out.println("D"); System.out.println("25022010 10->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
//if (suppSour.equals("M") && orderOpt.equals("B") && !batchQtyType.equals("V"))
//{
//}
//else
//{
if (reqQty > 0 && reqQty > Math.floor(reqQty)) if (reqQty > 0 && reqQty > Math.floor(reqQty))
{ {
if (reoQty > 1) if (reoQty > 1)
{ {
System.out.println("E");
multiplier = new Double(Math.ceil((reqQty + stkLevel) / reoQty)).intValue(); multiplier = new Double(Math.ceil((reqQty + stkLevel) / reoQty)).intValue();
System.out.println("25022010 11->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
multiplier = new Double(reqQty).intValue(); multiplier = new Double(Math.ceil(reqQty + stkLevel)).intValue() ; // 25/02/10
System.out.println("F"); System.out.println("25022010 12->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
} }
else else
{ {
System.out.println("multiplier.before calculating......................"+multiplier);
System.out.println("reqQty......................."+reqQty);
System.out.println("stkLevel......................."+stkLevel);
System.out.println("reoQty......................."+reoQty);
System.out.println("multiplier calculating..( (reqQty + stkLevel) / reoQty))...................."+( (reqQty + stkLevel) / reoQty));
multiplier = new Double(Math.ceil( (reqQty + stkLevel) / reoQty)).intValue(); multiplier = new Double(Math.ceil( (reqQty + stkLevel) / reoQty)).intValue();
System.out.println("G"); System.out.println("25022010 13->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
System.out.println("multiplier after calculating.using ceil....................."+multiplier);
} }
//}
} }
} }
if ( minOrderChk.equals("Y") ) if ( minOrderChk.equals("Y") )
...@@ -2854,23 +2826,20 @@ fout.close(); ...@@ -2854,23 +2826,20 @@ fout.close();
if (reqQty < chkOrdQty && adpElement.getMinQty() < reoQty) if (reqQty < chkOrdQty && adpElement.getMinQty() < reoQty)
{ {
reqQty = reoQty; reqQty = reoQty;
System.out.println("H"); System.out.println("25022010 14->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
reqQty = reoQty * multiplier; reqQty = reoQty * multiplier;
System.out.println("I"); System.out.println("25022010 15->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
} }
else else
{ {
reqQty = reoQty * multiplier; reqQty = reoQty * multiplier;
System.out.println("13012009 Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "] multiplier ["+multiplier + "]"); System.out.println("25022010 16->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
System.out.println("J");
} }
//}
//System.out.println("calculateQuantity 3--> Req qty " + decFormat(reqQty) + " Multiplier " + multiplier);
// consider fixed batch size and minimum plan %
if (orderOpt.equals("B") && !batchQtyType.equals("V")) if (orderOpt.equals("B") && !batchQtyType.equals("V"))
{ {
...@@ -2882,15 +2851,18 @@ fout.close(); ...@@ -2882,15 +2851,18 @@ fout.close();
if ( getMod(reqQty,batchQty) >= (batchQty * minPlanPerc / 100 )) if ( getMod(reqQty,batchQty) >= (batchQty * minPlanPerc / 100 ))
{ {
multiplier = new Double(Math.floor(reqQty / batchQty)).intValue() + 1; multiplier = new Double(Math.floor(reqQty / batchQty)).intValue() + 1;
System.out.println("25022010 17->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
multiplier = new Double(Math.floor(reqQty / batchQty)).intValue(); multiplier = new Double(Math.floor(reqQty / batchQty)).intValue();
System.out.println("25022010 18->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
} }
else else
{ {
multiplier = new Double(Math.floor(reqQty / batchQty)).intValue() ; multiplier = new Double(Math.floor(reqQty / batchQty)).intValue() ;
System.out.println("25022010 19->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
} }
else else
...@@ -2899,24 +2871,19 @@ fout.close(); ...@@ -2899,24 +2871,19 @@ fout.close();
if (reqQty >= (batchQty * minPlanPerc / 100 ) ) if (reqQty >= (batchQty * minPlanPerc / 100 ) )
{ {
multiplier = 1; multiplier = 1;
System.out.println("25022010 20->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
else else
{ {
multiplier = 0; multiplier = 0;
System.out.println("25022010 21->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
}
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{
System.out.println("261207 batchQty [" + decFormat(batchQty) + "] reqQty [" +decFormat(reqQty) + "] minPlanPerc [" +decFormat(minPlanPerc) + "] multiplier [" + multiplier + "]");
} }
reqQty = multiplier * batchQty; reqQty = multiplier * batchQty;
System.out.println("25022010 22->Item [" + adpElement.getItemCode() + "] reqQty [" + reqQty + "] reoQty [" + reoQty + "]] integralQty [" + integralQty + "] multiplier ["+multiplier + "]");
} }
if(adpElement.getItemCode().trim().equalsIgnoreCase("BD0783"))
{
System.out.println("calculateQuantity multiplier " + multiplier + " Item " + adpElement.getItemCode() + " Req Original " + decFormat(reqQtyOriginal) + " req cur " + decFormat(reqQty) + " reoQty " + decFormat(reoQty) );
}
return reqQty; return reqQty;
} }
private double getMod(double total, double batch) private double getMod(double total, double batch)
......
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