Commit 70623e2e authored by pjain's avatar pjain

changed by sankara on 16/04/14 updated wavegenerationprc given by pragyan for wms live


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94599 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fcb5517d
......@@ -161,6 +161,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
private ArrayList tempItemOrderList = new ArrayList();
DistCommon discommon = new DistCommon();
private HashMap itemInfoMapForRepl = new HashMap();
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue]
private HashMap itemQtyMapForActiveRepl = new HashMap();
ArrayList replanismentInfoList = new ArrayList();
//ArrayList masterOrParclNoList = new ArrayList();
ArrayList masterOrParclNoList = null ;
......@@ -3074,6 +3076,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
saleOrderWiseMap.clear();
itemInfoMapForRepl.clear();
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue]
itemQtyMapForActiveRepl.clear();
replanismentInfoList.clear();
//Changed By Rohan on 7/5/12 To Clear list.start
saleOrderWiseNotAllowList.clear();
......@@ -4064,10 +4068,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
Map tempMapReplenishment =new HashMap();
Map tempMapActiveRepl = null;
String lastReplenishmentID="",locCodeTo="";
int lineNoRepl=0;
System.out.println("Current Stock Qty ["+stkQuantity+"]");
if(((invSt.trim().equalsIgnoreCase(resrvLoc) || invSt.trim().equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate >= packSize)) || invSt.trim().equalsIgnoreCase(partialResrvLoc))
{
if(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))
{
......@@ -4081,8 +4087,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("In Case Of Mannual Stock Allocation current avilable stock ["+stkQuantity+"]");
tempListForRepl = new ArrayList();
qtyActual=0.0;
if(!invSt.equalsIgnoreCase(partialResrvLoc))
{
stkQuantity = Math.floor(stkQuantity/itemPackSize) * itemPackSize;
System.out.println("In Case Of Mannual Stock Allocation current avilable stock in case ["+stkQuantity+"]");
}
System.out.println("In Case Of Mannual Stock Allocation current avilable stock in case ["+stkQuantity+"]invSt["+invSt+"]");
tempMapReplenishment.put("QTY_ACTUAL", qtyActual);
tempMapReplenishment.put("LAST_REPL_ID", lastReplenishmentID);
tempMapReplenishment.put("REPL_LINE_NO", lineNoRepl);
......@@ -4093,6 +4102,44 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
itemInfoMapForRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd, tempListForRepl);
}
}
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue].start
else
{
if(((invSt.equalsIgnoreCase(resrvLoc) || invSt.equalsIgnoreCase(deepStoreLoc)) && (qtyAllocate < packSize) && !(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))))
{
double totalCaseQty = 0.0,totalPickQty = 0.0,stkActReplQty = 0.0;
if(itemQtyMapForActiveRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd))
{
tempMapActiveRepl = (HashMap)itemQtyMapForActiveRepl.get(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd);
totalCaseQty = (Double)tempMapActiveRepl.get("ACTIVE_REPL_QTY");
totalPickQty = (Double)tempMapActiveRepl.get("REPL_PICK_QTY");
stkActReplQty= (Double)tempMapActiveRepl.get("REPL_STK_QTY");
if((totalPickQty + qtyAllocate) > totalCaseQty)
{
totalCaseQty = totalCaseQty + packSize;
}
}
else
{
tempMapActiveRepl = new HashMap();
totalCaseQty = packSize;
stkActReplQty = stkQuantity;
}
totalPickQty = totalPickQty + qtyAllocate;
tempMapActiveRepl.put("ACTIVE_REPL_QTY",totalCaseQty);
tempMapActiveRepl.put("REPL_PICK_QTY",totalPickQty);
tempMapActiveRepl.put("REPL_STK_QTY",stkActReplQty);
itemQtyMapForActiveRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCd, tempMapActiveRepl);
System.out.println("itemQtyMapForActiveRepl Present In Mannual>>>>>>>>>>"+itemQtyMapForActiveRepl.toString()+"]");
}
}
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue].end
System.out.println("Current Mannual Map-------------------["+itemInfoMapForRepl.toString()+"]");
perItemVolume = (Double)itmVolumeMap.get("ITEM_SIZE");
......@@ -5506,7 +5553,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
double stkQuantity = getStockQuantity(itemCode,siteCode,locCode,lotNo,lotSl,0.0,conn);
if(!invStat.equalsIgnoreCase(partialResrvLoc))
{
stkQuantity = Math.floor(stkQuantity/packSizeActive) * packSizeActive;
}
System.out.println("stkQuantity["+stkQuantity+"]");
tempMapReplenishment.put("QTY_ACTUAL", qtyActual);
tempMapReplenishment.put("LAST_REPL_ID", lastReplenishmentID);
......@@ -5550,7 +5601,46 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("Location Code To Found To Create Replenishment After ["+locCodeTo+"]");
}
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue].start
}
else
{
Map tempMapActiveRepl = null;
if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated < packSizeActive) && !(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode)))
{
double totalCaseQty = 0.0,totalPickQty = 0.0,stkActReplQty = 0.0;
if(itemQtyMapForActiveRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode))
{
tempMapActiveRepl = (HashMap)itemQtyMapForActiveRepl.get(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode);
totalCaseQty = (Double)tempMapActiveRepl.get("ACTIVE_REPL_QTY");
totalPickQty = (Double)tempMapActiveRepl.get("REPL_PICK_QTY");
stkActReplQty= (Double)tempMapActiveRepl.get("REPL_STK_QTY");
if((totalPickQty + lotQtyToBeAllocated) > totalCaseQty)
{
totalCaseQty = totalCaseQty + packSizeActive;
}
}
else
{
tempMapActiveRepl = new HashMap();
totalCaseQty = packSizeActive;
stkActReplQty = stkAllocQty;
}
totalPickQty = totalPickQty + lotQtyToBeAllocated;
tempMapActiveRepl.put("ACTIVE_REPL_QTY",totalCaseQty);
tempMapActiveRepl.put("REPL_PICK_QTY",totalPickQty);
tempMapActiveRepl.put("REPL_STK_QTY",stkActReplQty);
itemQtyMapForActiveRepl.put(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode, tempMapActiveRepl);
System.out.println("itemQtyMapForActiveRepl Present In Normal>>>>>>>>>>"+itemQtyMapForActiveRepl.toString()+"]");
}
}
//Changed By Pragyan 16-APR-14 To store the active Repl Qty and in same wave [taro live issue].end
System.out.println("Finally Loc Code["+locCode+"]Loc Code To["+locCodeTo+"]");
......@@ -20338,7 +20428,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double sordAllocQty = 0.0;
double activeReplQty = 0.0;
double finalQty = 0.0;
double totalCaseQty = 0.0,totalPickQty = 0.0,stkActReplQty = 0.0;
try
{
......@@ -20426,7 +20516,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("activeReplQty["+activeReplQty+"]");
finalQty = finalQty - activeReplQty;
System.out.println("finalQty["+finalQty+"]");
System.out.println("finalQty after activeReplQty["+finalQty+"]");
HashMap tempMap = (HashMap)itemQtyMapForActiveRepl.get(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode);
if(tempMap != null && tempMap.size() > 0)
{
totalCaseQty = (Double)tempMap.get("ACTIVE_REPL_QTY");
totalPickQty = (Double)tempMap.get("REPL_PICK_QTY");
stkActReplQty= (Double)tempMap.get("REPL_STK_QTY");
System.out.println("Found totalCaseQty["+totalCaseQty+"]totalPickQty["+totalPickQty+"]stkActReplQty["+stkActReplQty+"]");
}
finalQty = finalQty - totalCaseQty;
System.out.println("finalQty after Map ReplQty["+finalQty+"]");
if(rs != null)
{
......
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