Skip to content

B
business-java
Commit 9cf8c445 authored by dpawar's avatar dpawar
Browse files
Options

sovled potency addition in potencyY map 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100060 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b170f4aa
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 31 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WoFirmplanPrc.java
View file @ 9cf8c445
...@@ -227,6 +227,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -227,6 +227,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
/**/ /**/
try try
{ {
isReallocation = false;
isError = false; isError = false;
xtraParamsG = xtraParams; xtraParamsG = xtraParams;
System.out.println("xtraParams----->>["+xtraParams+"]"); System.out.println("xtraParams----->>["+xtraParams+"]");
...@@ -1160,18 +1161,23 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1160,18 +1161,23 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
{ {
//Stock sufficient //Stock sufficient
//Update alloc quantity in stock //Update alloc quantity in stock
worderStkBeanObj.setStockSufficient("Y");
stockAllocMap.put("ALLOC_QTY",""+requiredQty);
stockAllocMap.put("LOC_CODE", locCode);
stockAllocMap.put("ITEM_CODE",detailMap.get("ITEM_CODE"));
stockAllocMap.put("SITE_CODE",detailMap.get("SITE_CODE"));
stockAllocMap.put("LOT_NO",lotNo);
stockAllocMap.put("LOT_SL",lotSl);
allocRetStr = updateStockAllocQty(stockAllocMap,conn);
System.out.println("allocRetStr :"+allocRetStr);
balanceQty = 0; balanceQty = 0;
isSufficient = true; isSufficient = true;
//Update alloc quantity in stock
if(isReallocation)
{
System.out.println("setActualAllocQty------------Y------------->>["+requiredQty+"]");
stockAllocMap.put("ALLOC_QTY",""+requiredQty);
stockAllocMap.put("LOC_CODE", locCode);
stockAllocMap.put("ITEM_CODE",detailMap.get("ITEM_CODE"));
stockAllocMap.put("SITE_CODE",detailMap.get("SITE_CODE"));
stockAllocMap.put("LOT_NO",lotNo);
stockAllocMap.put("LOT_SL",lotSl);
allocRetStr = updateStockAllocQty(stockAllocMap,conn);
System.out.println("allocRetStr :"+allocRetStr);
}
} }
else else
...@@ -1179,22 +1185,27 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1179,22 +1185,27 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
System.out.println("else..........."); System.out.println("else...........");
isSufficient = false; isSufficient = false;
balanceQty = requiredQty - (stkQuantity + softAllocQty); balanceQty = requiredQty - (stkQuantity + softAllocQty);
if(isReallocation)
{
System.out.println("setActualAllocQty------------Y------------->>["+stkQuantity+"]");
stockAllocMap.put("ALLOC_QTY",""+stkQuantity);
stockAllocMap.put("LOC_CODE", locCode);
stockAllocMap.put("ITEM_CODE",detailMap.get("ITEM_CODE"));
stockAllocMap.put("SITE_CODE",detailMap.get("SITE_CODE"));
stockAllocMap.put("LOT_NO",lotNo);
stockAllocMap.put("LOT_SL",lotSl);
allocRetStr = updateStockAllocQty(stockAllocMap,conn);
System.out.println("allocRetStr :"+allocRetStr);
}
//softAllocQty = stkQuantity + softAllocQty; //softAllocQty = stkQuantity + softAllocQty;
balanceQty = Double.parseDouble(df.format(balanceQty)); balanceQty = Double.parseDouble(df.format(balanceQty));
System.out.println("balanceQty@@ : ["+balanceQty+"] "); System.out.println("balanceQty@@ : ["+balanceQty+"] ");
System.out.println("softAllocQty@@ : ["+softAllocQty+"] "); System.out.println("softAllocQty@@ : ["+softAllocQty+"] ");
requiredQty = balanceQty; requiredQty = balanceQty;
worderStkBeanObj.setStockSufficient("N"); worderStkBeanObj.setStockSufficient("N");
//Update alloc quantity in stock
stockAllocMap.put("ALLOC_QTY",""+stkQuantity);
stockAllocMap.put("LOC_CODE", locCode);
stockAllocMap.put("ITEM_CODE",detailMap.get("ITEM_CODE"));
stockAllocMap.put("SITE_CODE",detailMap.get("SITE_CODE"));
stockAllocMap.put("LOT_NO",lotNo);
stockAllocMap.put("LOT_SL",lotSl);
allocRetStr = updateStockAllocQty(stockAllocMap,conn);
System.out.println("allocRetStr :"+allocRetStr);
} }
System.out.println("Adding stk..........."+worderStkBeanObj.getStockSufficient()); System.out.println("Adding stk..........."+worderStkBeanObj.getStockSufficient());
if(isReallocation) if(isReallocation)
...@@ -1369,7 +1380,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1369,7 +1380,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
Map<String,Double>stockAllocAddNMap = new HashMap<String,Double>(); Map<String,Double>stockAllocAddNMap = new HashMap<String,Double>();
Map<String,Double> AdjPotencyExplevQtyMap = null; Map<String,Double> AdjPotencyExplevQtyMap = null;
Map<String,Double>deAllocQtyMap = null;
ArrayList<WorkOrderDetailBean> tempWorderBeanList = new ArrayList<WorkOrderDetailBean>(); ArrayList<WorkOrderDetailBean> tempWorderBeanList = new ArrayList<WorkOrderDetailBean>();
//tempWorderBeanList = workOrderBeanList; //tempWorderBeanList = workOrderBeanList;
...@@ -1382,11 +1393,13 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1382,11 +1393,13 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
{ {
potencyAdjMapY = new HashMap<String,Double>(); potencyAdjMapY = new HashMap<String,Double>();
potencyAdjMapN = new HashMap<String,Double>(); potencyAdjMapN = new HashMap<String,Double>();
deAllocQtyMap = new HashMap<String,Double>();
AdjPotencyExplevQtyMap = new HashMap<String,Double>(); AdjPotencyExplevQtyMap = new HashMap<String,Double>();
count = -1; count = -1;
for(WorkOrderDetailBean worderDetailBeanObj : workOrderBeanList) for(WorkOrderDetailBean worderDetailBeanObj : workOrderBeanList)
{ {
count++; count++;
deAllocQtyMap.clear();
System.out.println("potency calculation-------------------->>"+count); System.out.println("potency calculation-------------------->>"+count);
index = -1; index = -1;
workOrder = worderDetailBeanObj.getWorkOrder().trim(); workOrder = worderDetailBeanObj.getWorkOrder().trim();
...@@ -1454,18 +1467,48 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1454,18 +1467,48 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
worderStkBeanObj.setAllocQty(Double.parseDouble(df.format(shortageQty + potencyAdj))); worderStkBeanObj.setAllocQty(Double.parseDouble(df.format(shortageQty + potencyAdj)));
worderStkBeanObj.setUpdQty(reqQtyNew); worderStkBeanObj.setUpdQty(reqQtyNew);
System.out.println("uPDqTY------------Y------------->>["+reqQtyNew+"]"); System.out.println("uPDqTY------------Y------------->>["+reqQtyNew+"]");
System.out.println("setActualAllocQty------------Y------------->>["+shortageQty+"]");
System.out.println("shortageQty----Y---->>["+shortageQty+"]"); System.out.println("shortageQty----Y---->>["+shortageQty+"]");
System.out.println("expLevel----->>["+expLevel+"]"); System.out.println("expLevel----->>["+expLevel+"]");
shortageQty = 0;
if(potencyAdjMapY.containsKey(adjPotency) ) /*if(potencyAdjMapY.containsKey(adjPotency) )
{ {
potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj )); potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj ));
} }
else else
{ {
potencyAdjMapY.put(adjPotency, potencyAdj ); potencyAdjMapY.put(adjPotency, potencyAdj );
} }*/
worderStkBeanObj.setStockSufficient("Y");
System.out.println("isReallocation---Y-->>["+isReallocation+"]");
System.out.println("deAllocQtyMap---Y-->>["+deAllocQtyMap+"]");
String key = worderStkBeanObj.getLocCode()+":"+worderStkBeanObj.getItemCode()+":"+worderStkBeanObj.getLotNo()+":"+worderStkBeanObj.getLotSl();
System.out.println("key---Y-->>["+key+"]");
if(!isReallocation && !deAllocQtyMap.containsKey(key))
{
if(potencyAdjMapY.containsKey(adjPotency) )
{
potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj ));
}
else
{
potencyAdjMapY.put(adjPotency, potencyAdj );
}
deAllocQtyMap.put(key, shortageQty);
Map<String,String> stockAllocMap = new HashMap<String,String>();
stockAllocMap.put("ALLOC_QTY",""+shortageQty);
stockAllocMap.put("LOC_CODE", worderStkBeanObj.getLocCode());
stockAllocMap.put("ITEM_CODE",worderStkBeanObj.getItemCode());
stockAllocMap.put("SITE_CODE",worderStkBeanObj.getSiteCode());
stockAllocMap.put("LOT_NO",worderStkBeanObj.getLotNo());
stockAllocMap.put("LOT_SL",worderStkBeanObj.getLotSl());
String allocRetStr = updateStockAllocQty(stockAllocMap,conn);
System.out.println("allocRetStr :"+allocRetStr);
}
shortageQty = 0;
} }
else else
{ {
...@@ -1521,9 +1564,9 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1521,9 +1564,9 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
detailMap.put("BALANCE_QTY",shortageQty+""); detailMap.put("BALANCE_QTY",shortageQty+"");
checkCurrentSiteStock(detailMap, conn); Map<String,String>detailStkMap = checkCurrentSiteStock(detailMap, conn);
System.out.println("detailStkMap C.Potency-------->>["+detailStkMap+"]");
} }
else else
{ {
...@@ -1531,7 +1574,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1531,7 +1574,7 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
//worderStkBeanObj.setUpdQty(shortageQty + potencyAdj); //worderStkBeanObj.setUpdQty(shortageQty + potencyAdj);
System.out.println("UnSufficient----->>["+shortageQty+"] ["+availableStock+"]"); System.out.println("UnSufficient----->>["+shortageQty+"] ["+availableStock+"]");
System.out.println("stkPotencyPerc----->>["+stkPotencyPerc+"]"); System.out.println("stkPotencyPerc----->>["+stkPotencyPerc+"]");
potencyAdj = availableStock - (availableStock * stkPotencyPerc / ItemStdPotency); potencyAdj = availableStock - (availableStock * stkPotencyPerc / ItemStdPotency);
potencyAdj = Double.parseDouble(df.format(potencyAdj)); potencyAdj = Double.parseDouble(df.format(potencyAdj));
...@@ -1553,15 +1596,41 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi ...@@ -1553,15 +1596,41 @@ public class WoFirmplanPrc extends ProcessEJB implements WoFirmplanPrcLocal,WoFi
System.out.println("shortageQty----N---->>["+shortageQty+"]"); System.out.println("shortageQty----N---->>["+shortageQty+"]");
System.out.println("expLevel----->>["+expLevel+"]"); System.out.println("expLevel----->>["+expLevel+"]");
System.out.println("uPDqTY------------n------------->>["+availableStock+"]"); System.out.println("uPDqTY------------n------------->>["+availableStock+"]");
if(potencyAdjMapY.containsKey(adjPotency)) /* if(potencyAdjMapY.containsKey(adjPotency))
{ {
potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj )); potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj ));
} }
else else
{ {
potencyAdjMapY.put(adjPotency, potencyAdj ); potencyAdjMapY.put(adjPotency, potencyAdj );
}*/
System.out.println("isReallocation---n-->>["+isReallocation+"]");
String key = worderStkBeanObj.getLocCode()+":"+worderStkBeanObj.getItemCode()+":"+worderStkBeanObj.getLotNo()+":"+worderStkBeanObj.getLotSl();
System.out.println("key---N-->>["+key+"]");
if(!isReallocation && ! deAllocQtyMap.containsKey(key))
{
System.out.println("setActualAllocQty------------Y------------->>["+availableStock+"]");
if(potencyAdjMapY.containsKey(adjPotency) )
{
potencyAdjMapY.put(adjPotency, (potencyAdjMapY.get(adjPotency) + potencyAdj ));
}
else
{
potencyAdjMapY.put(adjPotency, potencyAdj );
}
deAllocQtyMap.put(key, shortageQty);
Map<String,String> stockAllocMap = new HashMap<String,String>();
stockAllocMap.put("ALLOC_QTY",""+availableStock);
stockAllocMap.put("LOC_CODE", worderStkBeanObj.getLocCode());
stockAllocMap.put("ITEM_CODE",worderStkBeanObj.getItemCode());
stockAllocMap.put("SITE_CODE",worderStkBeanObj.getSiteCode());
stockAllocMap.put("LOT_NO",worderStkBeanObj.getLotNo());
stockAllocMap.put("LOT_SL",worderStkBeanObj.getLotSl());
String allocRetStr = updateStockAllocQty(stockAllocMap,conn);
} }
} }
} }
......
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