Commit 15ca3805 authored by manohar's avatar manohar

Correction to Potency calculation


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101687 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8ea77322
......@@ -94,7 +94,7 @@ import javax.xml.rpc.ParameterMode;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType;
import org.apache.commons.net.ntp.TimeStamp;
//import org.apache.commons.net.ntp.TimeStamp;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
......@@ -1788,24 +1788,24 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
{
worderDetailBeanObj = (WorkOrderDetailBean) workOrderBeanList.get(outerCtr);
System.out.println("Printing WorkOrder Bean Details");
System.out.println("#---->WorkOrder["+worderDetailBeanObj.getWorkOrder()+"] Type["+worderDetailBeanObj.getWorderType()+"] ExpLev["+worderDetailBeanObj.getExpLev()+"] ItemCode["+worderDetailBeanObj.getItemCode()+"]SiteCode["+worderDetailBeanObj.getSiteCode()+"] Quantity["+worderDetailBeanObj.getQuantity()+"] Sufficient["+worderDetailBeanObj.getSufficient()+"] Operation["+worderDetailBeanObj.getOperation()+"] AllocateType["+worderDetailBeanObj.getAllocateType()+"] getAdjPotency ["+worderDetailBeanObj.getAdjPotency()+"] MatchPotency["+worderDetailBeanObj.getMatchPotency()+"] Crit Item["+worderDetailBeanObj.getCritItem()+"] ConsiderPartialAlt["+worderDetailBeanObj.getConsiderPartialAlt()+"] ConsiderLotNoIssue["+worderDetailBeanObj.getConsiderLotNoIssue()+"] MinPotencyPerc["+worderDetailBeanObj.getMinPotencyPerc()+"] QtyPer["+worderDetailBeanObj.getQtyPer()+"]getSuppCodeMfg["+worderDetailBeanObj.getSuppCodeMfg()+"] GetSufficient["+worderDetailBeanObj.getSufficient()+"] ReqQuantity["+worderDetailBeanObj.getReqQty()+"] getPotencyAdjQty["+worderDetailBeanObj.getPotencyAdjQty()+"] getItemCategory["+worderDetailBeanObj.getItemCategory()+"] getMinReqQty["+worderDetailBeanObj.getMinReqQty()+"] BatchNo["+worderDetailBeanObj.getBatchQty()+"] getRoundTo["+worderDetailBeanObj.getRoundTo()+"] getRound["+worderDetailBeanObj.getRound()+"] LocationUsageType["+worderDetailBeanObj.getLocUsageType()+"] ItemActive["+worderDetailBeanObj.getItemActive()+" AdjustedQuantity["+worderDetailBeanObj.getAdjustedQty()+"] UpdQuantity["+worderDetailBeanObj.getUpdQty()+"] LineType["+worderDetailBeanObj.getLineType()+"] QuantityRef["+worderDetailBeanObj.getQuantityRef()+"] UsageType["+worderDetailBeanObj.getUsageType()+"]");
//System.out.println("Printing WorkOrder Bean Details");
//System.out.println("worderDetailBeanObj->WorkOrder["+worderDetailBeanObj.getWorkOrder()+"] ExpLev["+worderDetailBeanObj.getExpLev()+"] ItemCode["+worderDetailBeanObj.getItemCode()+"]SiteCode["+worderDetailBeanObj.getSiteCode()+"] Quantity["+worderDetailBeanObj.getQuantity()+"] Sufficient["+worderDetailBeanObj.getSufficient()+"] Operation["+worderDetailBeanObj.getOperation()+"] AllocateType["+worderDetailBeanObj.getAllocateType()+"] getAdjPotency ["+worderDetailBeanObj.getAdjPotency()+"] MatchPotency["+worderDetailBeanObj.getMatchPotency()+"] Crit Item["+worderDetailBeanObj.getCritItem()+"] ConsiderPartialAlt["+worderDetailBeanObj.getConsiderPartialAlt()+"] ConsiderLotNoIssue["+worderDetailBeanObj.getConsiderLotNoIssue()+"] MinPotencyPerc["+worderDetailBeanObj.getMinPotencyPerc()+"] QtyPer["+worderDetailBeanObj.getQtyPer()+"]getSuppCodeMfg["+worderDetailBeanObj.getSuppCodeMfg()+"] GetSufficient["+worderDetailBeanObj.getSufficient()+"] ReqQuantity["+worderDetailBeanObj.getReqQty()+"] getPotencyAdjQty["+worderDetailBeanObj.getPotencyAdjQty()+"] getItemCategory["+worderDetailBeanObj.getItemCategory()+"] getMinReqQty["+worderDetailBeanObj.getMinReqQty()+"] BatchNo["+worderDetailBeanObj.getBatchQty()+"] getRoundTo["+worderDetailBeanObj.getRoundTo()+"] getRound["+worderDetailBeanObj.getRound()+"] LocationUsageType["+worderDetailBeanObj.getLocUsageType()+"] ItemActive["+worderDetailBeanObj.getItemActive()+" AdjustedQuantity["+worderDetailBeanObj.getAdjustedQty()+"] UpdQuantity["+worderDetailBeanObj.getUpdQty()+"] LineType["+worderDetailBeanObj.getLineType()+"] QuantityRef["+worderDetailBeanObj.getQuantityRef()+"] UsageType["+worderDetailBeanObj.getUsageType()+"]");
//count++;// 09-mar-16 manoharan
//deAllocQtyMap.clear();// 09-mar-16 manoharan
//System.out.println("potency calculation-------------------->>"+count);// 09-mar-16 manoharan
//index = -1; // 09-mar-16 manoharan
workOrder = worderDetailBeanObj.getWorkOrder().trim();
if(!workOrderPotency.trim().equalsIgnoreCase(workOrder.trim()))
{
continue;
}
expLevel = worderDetailBeanObj.getExpLev().trim();
matchPotency = worderDetailBeanObj.getMatchPotency();
adjPotency = worderDetailBeanObj.getAdjPotency();
requiredStock = worderDetailBeanObj.getQuantity();
balance = requiredStock;
System.out.println("MatchPotency---------->>["+matchPotency+"]");
if(!workOrderPotency.trim().equalsIgnoreCase(workOrder.trim()))
{
continue;
}
// 09-mar-16 manoharan following code block may not be necessary
//ListIterator<WorderStkBean> iterator = worderStkBeanList.listIterator();
//for(WorderStkBean worderStkBeanObj : worderStkBeanList)
......@@ -1827,6 +1827,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
*/ //09-mar-16 manoharan end block comment
//Changed by wasim on 07-04-2016 to comment and change while loop
//while(iterator.hasNext())
System.out.println("Same wo worderDetailBeanObj->WorkOrder["+worderDetailBeanObj.getWorkOrder()+"] ExpLev["+worderDetailBeanObj.getExpLev()+"] ItemCode["+worderDetailBeanObj.getItemCode()+"]SiteCode["+worderDetailBeanObj.getSiteCode()+"] Quantity["+worderDetailBeanObj.getQuantity()+"] Sufficient["+worderDetailBeanObj.getSufficient()+"] Operation["+worderDetailBeanObj.getOperation()+"] AllocateType["+worderDetailBeanObj.getAllocateType()+"] getAdjPotency ["+worderDetailBeanObj.getAdjPotency()+"] MatchPotency["+worderDetailBeanObj.getMatchPotency()+"] Crit Item["+worderDetailBeanObj.getCritItem()+"] ConsiderPartialAlt["+worderDetailBeanObj.getConsiderPartialAlt()+"] ConsiderLotNoIssue["+worderDetailBeanObj.getConsiderLotNoIssue()+"] MinPotencyPerc["+worderDetailBeanObj.getMinPotencyPerc()+"] QtyPer["+worderDetailBeanObj.getQtyPer()+"]getSuppCodeMfg["+worderDetailBeanObj.getSuppCodeMfg()+"] GetSufficient["+worderDetailBeanObj.getSufficient()+"] ReqQuantity["+worderDetailBeanObj.getReqQty()+"] getPotencyAdjQty["+worderDetailBeanObj.getPotencyAdjQty()+"] getItemCategory["+worderDetailBeanObj.getItemCategory()+"] getMinReqQty["+worderDetailBeanObj.getMinReqQty()+"] BatchNo["+worderDetailBeanObj.getBatchQty()+"] getRoundTo["+worderDetailBeanObj.getRoundTo()+"] getRound["+worderDetailBeanObj.getRound()+"] LocationUsageType["+worderDetailBeanObj.getLocUsageType()+"] ItemActive["+worderDetailBeanObj.getItemActive()+" AdjustedQuantity["+worderDetailBeanObj.getAdjustedQty()+"] UpdQuantity["+worderDetailBeanObj.getUpdQty()+"] LineType["+worderDetailBeanObj.getLineType()+"] QuantityRef["+worderDetailBeanObj.getQuantityRef()+"] UsageType["+worderDetailBeanObj.getUsageType()+"]");
for(int innerCtr=0 ; innerCtr < worderStkBeanList.size(); innerCtr++)
{
worderStkBeanObj = (WorderStkBean) worderStkBeanList.get(innerCtr);
......@@ -1836,13 +1837,15 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
//WorderStkBean worderStkBeanObj = iterator.next();//Commented by wasim as iterator loop commented
System.out.println("workOrder----->>["+workOrder+"] ["+worderStkBeanObj.getWorkOrder()+"]");
System.out.println("expLevel----->>["+expLevel+"] ["+worderStkBeanObj.getExpLevel()+"]");
//System.out.println("workOrder----->>["+workOrder+"] ["+worderStkBeanObj.getWorkOrder()+"]");
//System.out.println("expLevel----->>["+expLevel+"] ["+worderStkBeanObj.getExpLevel()+"]");
System.out.println("***ItemCode["+worderStkBeanObj.getItemCode()+"]LotNo["+worderStkBeanObj.getLotNo()+"]LotSl["+worderStkBeanObj.getLotSl()+"]LocCode["+worderStkBeanObj.getLocCode()+"]SiteCode["+worderStkBeanObj.getSiteCode()+"]AllocQty["+worderStkBeanObj.getAllocQty()+"]Stock Quantity["+worderStkBeanObj.getStkQuantity()+"]getQuantity["+worderStkBeanObj.getQuantity()+"]PotencyAdj["+worderStkBeanObj.getPotencyAdj()+"]Stock Sufficient["+worderStkBeanObj.getStockSufficient()+"]getCritItem["+worderStkBeanObj.getCritItem()+"]MinReqQty["+worderStkBeanObj.getMinQtyReq()+"]StockPotencyPerc["+worderStkBeanObj.getStkPotencyPerc()+"]OtherSiteYN["+worderStkBeanObj.getOtherSiteYN()+"]getAlternate["+worderStkBeanObj.getAlternate()+"]Qty Adj["+worderStkBeanObj.getQtyAdj()+"]UpdQty["+worderStkBeanObj.getUpdQty()+"MfgDate["+worderStkBeanObj.getMfgDate()+"]ExpDate["+worderStkBeanObj.getExpDate()+"SiteCodeMfg["+worderStkBeanObj.getSiteCodeMfg()+"]ReserveLineNo["+worderStkBeanObj.getReserveLineNo()+"]ReserveStkTranId["+worderStkBeanObj.getReserveStkTranId()+"]Unit["+worderStkBeanObj.getUnit()+"]");
//System.out.println("***ItemCode["+worderStkBeanObj.getItemCode()+"]LotNo["+worderStkBeanObj.getLotNo()+"]LotSl["+worderStkBeanObj.getLotSl()+"]LocCode["+worderStkBeanObj.getLocCode()+"]SiteCode["+worderStkBeanObj.getSiteCode()+"]AllocQty["+worderStkBeanObj.getAllocQty()+"]Stock Quantity["+worderStkBeanObj.getStkQuantity()+"]getQuantity["+worderStkBeanObj.getQuantity()+"]PotencyAdj["+worderStkBeanObj.getPotencyAdj()+"]Stock Sufficient["+worderStkBeanObj.getStockSufficient()+"]getCritItem["+worderStkBeanObj.getCritItem()+"]MinReqQty["+worderStkBeanObj.getMinQtyReq()+"]StockPotencyPerc["+worderStkBeanObj.getStkPotencyPerc()+"]OtherSiteYN["+worderStkBeanObj.getOtherSiteYN()+"]getAlternate["+worderStkBeanObj.getAlternate()+"]Qty Adj["+worderStkBeanObj.getQtyAdj()+"]UpdQty["+worderStkBeanObj.getUpdQty()+"MfgDate["+worderStkBeanObj.getMfgDate()+"]ExpDate["+worderStkBeanObj.getExpDate()+"SiteCodeMfg["+worderStkBeanObj.getSiteCodeMfg()+"]ReserveLineNo["+worderStkBeanObj.getReserveLineNo()+"]ReserveStkTranId["+worderStkBeanObj.getReserveStkTranId()+"]Unit["+worderStkBeanObj.getUnit()+"]");
if(workOrder.equalsIgnoreCase(worderStkBeanObj.getWorkOrder().trim()) && expLevel.equalsIgnoreCase(worderStkBeanObj.getExpLevel().trim()))
{
System.out.println("Same wo/expLev worderStkBeanObj->workOrder["+worderStkBeanObj.getWorkOrder()+"] expLevel ["+worderStkBeanObj.getExpLevel()+"]ItemCode["+worderStkBeanObj.getItemCode()+"]LotNo["+worderStkBeanObj.getLotNo()+"]LotSl["+worderStkBeanObj.getLotSl()+"]LocCode["+worderStkBeanObj.getLocCode()+"]SiteCode["+worderStkBeanObj.getSiteCode()+"]AllocQty["+worderStkBeanObj.getAllocQty()+"]Stock Quantity["+worderStkBeanObj.getStkQuantity()+"]getQuantity["+worderStkBeanObj.getQuantity()+"]PotencyAdj["+worderStkBeanObj.getPotencyAdj()+"]Stock Sufficient["+worderStkBeanObj.getStockSufficient()+"]getCritItem["+worderStkBeanObj.getCritItem()+"]MinReqQty["+worderStkBeanObj.getMinQtyReq()+"]StockPotencyPerc["+worderStkBeanObj.getStkPotencyPerc()+"]OtherSiteYN["+worderStkBeanObj.getOtherSiteYN()+"]getAlternate["+worderStkBeanObj.getAlternate()+"]Qty Adj["+worderStkBeanObj.getQtyAdj()+"]UpdQty["+worderStkBeanObj.getUpdQty()+"MfgDate["+worderStkBeanObj.getMfgDate()+"]ExpDate["+worderStkBeanObj.getExpDate()+"SiteCodeMfg["+worderStkBeanObj.getSiteCodeMfg()+"]ReserveLineNo["+worderStkBeanObj.getReserveLineNo()+"]ReserveStkTranId["+worderStkBeanObj.getReserveStkTranId()+"]Unit["+worderStkBeanObj.getUnit()+"]");
availableStock = worderStkBeanObj.getStkQuantity();//available
stkPotencyPerc = worderStkBeanObj.getStkPotencyPerc();
itemCode = worderStkBeanObj.getItemCode();
......@@ -2042,29 +2045,37 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
else
{
System.out.println(" N adjPotency----->>["+adjPotency+"] ["+availableStock+"]");
System.out.println("Same wo/expLev(N) worderStkBeanObj->workOrder["+worderStkBeanObj.getWorkOrder()+"] expLevel ["+worderStkBeanObj.getExpLevel()+"]ItemCode["+worderStkBeanObj.getItemCode()+"]LotNo["+worderStkBeanObj.getLotNo()+"]LotSl["+worderStkBeanObj.getLotSl()+"]LocCode["+worderStkBeanObj.getLocCode()+"]SiteCode["+worderStkBeanObj.getSiteCode()+"]AllocQty["+worderStkBeanObj.getAllocQty()+"]Stock Quantity["+worderStkBeanObj.getStkQuantity()+"]getQuantity["+worderStkBeanObj.getQuantity()+"]PotencyAdj["+worderStkBeanObj.getPotencyAdj()+"]Stock Sufficient["+worderStkBeanObj.getStockSufficient()+"]getCritItem["+worderStkBeanObj.getCritItem()+"]MinReqQty["+worderStkBeanObj.getMinQtyReq()+"]StockPotencyPerc["+worderStkBeanObj.getStkPotencyPerc()+"]OtherSiteYN["+worderStkBeanObj.getOtherSiteYN()+"]getAlternate["+worderStkBeanObj.getAlternate()+"]Qty Adj["+worderStkBeanObj.getQtyAdj()+"]UpdQty["+worderStkBeanObj.getUpdQty()+"MfgDate["+worderStkBeanObj.getMfgDate()+"]ExpDate["+worderStkBeanObj.getExpDate()+"SiteCodeMfg["+worderStkBeanObj.getSiteCodeMfg()+"]ReserveLineNo["+worderStkBeanObj.getReserveLineNo()+"]ReserveStkTranId["+worderStkBeanObj.getReserveStkTranId()+"]Unit["+worderStkBeanObj.getUnit()+"]");
if(adjPotency != null && adjPotency.trim().length() > 0)
{
System.out.println("match potency N inner...........");
System.out.println("Potency to be adjusted [" + adjPotency + "]");
unitPotency = getColumnDescr(conn, "unit__potency", "bom", "bom_code", worderDetailBeanObj.getBomCode());
if (!worderStkBeanObj.getUnit().trim().equals(unitPotency.trim())) // 09-mar-16 manoharan check unit are same, if so no conversion required
{
requiredStock = disCommon.convQtyFactor(worderStkBeanObj.getUnit(), unitPotency, worderStkBeanObj.getItemCode(), requiredStock, conn);
}
System.out.println("RequiredStock After--->>["+requiredStock+"]");
System.out.println("Stk qty After--->>["+worderStkBeanObj.getStkQuantity()+"]");
System.out.println("Work Order Bean Quantity="+worderDetailBeanObj.getQuantity());
AdjPotencyExplevQtyMap.put(adjPotency+":"+expLevel, requiredStock);
//if (!worderStkBeanObj.getUnit().trim().equals(unitPotency.trim())) // 09-mar-16 manoharan check unit are same, if so no conversion required
//{
// requiredStock = disCommon.convQtyFactor(worderStkBeanObj.getUnit(), unitPotency, worderStkBeanObj.getItemCode(), requiredStock, conn);
//}
//System.out.println("RequiredStock After--->>["+requiredStock+"]");
qtyPotencyUnit = 0;
if (!worderStkBeanObj.getUnit().trim().equals(unitPotency.trim())) // 09-mar-16 manoharan check unit are same, if so no conversion required
{
//Changed by wasim on 18-05-2016
//qtyPotencyUnit = disCommon.convQtyFactor(worderStkBeanObj.getUnit(), unitPotency, worderStkBeanObj.getItemCode(), worderDetailBeanObj.getQuantity(), conn);
qtyPotencyUnit = disCommon.convQtyFactor(worderStkBeanObj.getUnit(), unitPotency, worderStkBeanObj.getItemCode(), requiredStock, conn);
}
qtyPotencyUnit = qtyPotencyUnit + worderStkBeanObj.getAllocQty();
else // 19-may-16 manoharan this else condition added
{
qtyPotencyUnit = requiredStock;
}
System.out.println("manohar qtyPotencyUnit before[" + qtyPotencyUnit + "] worderStkBeanObj.getAllocQty() [" + worderStkBeanObj.getAllocQty() + "]");
System.out.println("Stk qty After--->>["+worderStkBeanObj.getStkQuantity()+"]");
System.out.println("Work Order Bean Quantity="+worderDetailBeanObj.getQuantity());
// 19-May-16 manoharan if there are multiple for same exp_lev then add
//AdjPotencyExplevQtyMap.put(adjPotency+":"+expLevel, requiredStock);
System.out.println("AdjPotencyExplevQtyMap before ["+AdjPotencyExplevQtyMap + "]");
System.out.println("manohar qtyPotencyUnit after[" + qtyPotencyUnit + "] potencyAdjMapN before [" + potencyAdjMapN + "]");
if(!AdjPotencyExplevQtyMap.containsKey(adjPotency+":"+expLevel))
{
AdjPotencyExplevQtyMap.put(adjPotency+":"+expLevel, qtyPotencyUnit );
if(potencyAdjMapN.containsKey(adjPotency))
{
potencyAdjMapN.put(adjPotency, (potencyAdjMapN.get(adjPotency) + qtyPotencyUnit ));
......@@ -2073,10 +2084,17 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
{
potencyAdjMapN.put(adjPotency, qtyPotencyUnit );
}
}
System.out.println("AdjPotencyExplevQtyMap after [ "+AdjPotencyExplevQtyMap + "]");
System.out.println("manohar qtyPotencyUnit after[" + qtyPotencyUnit + "] potencyAdjMapN after [" + potencyAdjMapN + "]");
// end 19-May-16 manoharan if there are multiple for same exp_lev then add
//qtyPotencyUnit = qtyPotencyUnit + worderStkBeanObj.getAllocQty();
}
else
{
System.out.println("iin else of adj_potency null1.................."+requiredStock+" and avalable stock "+availableStock);
System.out.println("In else of adj_potency null1.................."+requiredStock+" and avalable stock "+availableStock);
//directly set upd qty as bill qty
worderStkBeanObj.setAllocQty(requiredStock);
......@@ -2141,7 +2159,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
adjPotencyChk = entry.getKey();
potencyAdjNew = -1 * (entry.getValue());
System.out.println("adjPotencyChk="+adjPotencyChk+" and potencyAdjNew="+potencyAdjNew);
System.out.println("adjPotencyChk ["+adjPotencyChk+"] potencyAdjNew ["+potencyAdjNew + "]");
if(potencyAdjMapN.containsKey(adjPotencyChk))
{
......@@ -2154,6 +2172,9 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
//indexN = -1; // 09-mar-16 manoharan commented for index based
//for(WorderStkBean worderStkBeanObj : worderStkBeanList)
//{
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
for(int potencyCtr=0 ; potencyCtr < worderStkBeanList.size(); potencyCtr++)
{
worderStkBeanObj = (WorderStkBean) worderStkBeanList.get(potencyCtr);
......@@ -2170,8 +2191,8 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
//-3.425 * 40 / 90 = -1.5221088435
//System.out.println("shortageQty---------->>["+shortageQty+"]");
System.out.println("potencyAdjNew--------->>["+potencyAdjNew+"]");//-93.733
System.out.println("potencyAdjNew--------->>["+adjPotencyExpLevel.getValue()+"]");//
System.out.println("potencyAdjNew--------->>["+potencyAdjMapN.get(adjPotencyChk)+"]");//
System.out.println("adjPotencyExpLevel.getValue()--------->>["+adjPotencyExpLevel.getValue()+"]");//
System.out.println("potencyAdjMapN--------->>["+potencyAdjMapN.get(adjPotencyChk)+"]");//
proportionateTotQty = potencyAdjNew * adjPotencyExpLevel.getValue() / potencyAdjMapN.get(adjPotencyChk) ;
proportionateTotQty = Double.parseDouble(df.format(proportionateTotQty));
System.out.println("proportionateTotQty---------->>["+proportionateTotQty+"]");//-93.733
......@@ -2267,7 +2288,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
}
} //end stock bean
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} //end AdjPotencyExplevQtyMap
} //end potencyAdjMapN contains
......
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