Skip to content

B
business-java
Commit 931febec authored by rbhogale's avatar rbhogale
Browse files
Options

Changed by Rohan on 06-02-13 for wave genration wrong case pick location 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92651 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8c6cd259
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 41 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 931febec
......@@ -12751,7 +12751,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
int tempListToReplLen = tempListToRepl.size();
String isCreateReplHeader ="N";
String pickRefId = "";
//Chnged by Rohan on 06-02-13 for define variable
String lineNo ="";
ArrayList tempList = (ArrayList)allCasePickList.get(cCTR);
int tempLen = tempList.size();
int replCtr = 1;
......@@ -12838,6 +12839,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
replQuantityID = checkForReplenishment(itemCode, siteCode, lotNo, lotSl, locCode, quantity, 2, conn);
System.out.println("replQuantityID::"+replQuantityID);
StringTokenizer stReplQtyID = new StringTokenizer(replQuantityID, ":");
while(stReplQtyID.hasMoreTokens())
......@@ -12851,7 +12853,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
prvReplID=stReplQtyID.nextToken();
prvLocCodeTo=stReplQtyID.nextToken();
prvReplLineNo=Integer.parseInt(stReplQtyID.nextToken());
//Changed by Rohan on 06-02-13 for checking null repanishment
//prvReplLineNo=Integer.parseInt(stReplQtyID.nextToken());
//pickOrd !=null && pickOrd.length() > 0?pickOrd:"0"
lineNo = stReplQtyID.nextToken();
System.out.println("lineNo-->"+lineNo);
if("null".equalsIgnoreCase(lineNo))
{
lineNo ="0";
}
//prvReplLineNo=Integer.parseInt(lineNo != null && lineNo.length() > 0?lineNo:"0");
prvReplLineNo=Integer.parseInt(lineNo);
prvPickOrd=stReplQtyID.nextToken();
prvPickLineNo=Integer.parseInt(stReplQtyID.nextToken());
}
......@@ -13184,6 +13196,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
prvPickLineNo=Integer.parseInt(stReplQtyID.nextToken());
}
}
if("Y".equalsIgnoreCase(isRepl))
{
pstmtRplDet.setString(1,replRefDeepId);
......@@ -18502,7 +18515,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
return pin;
}
//Changed by Rohan on 06-02-13 for not considering sSQL in case of checkForReplenishment
private String checkForReplenishment(String itemCode,String siteCode,String lotNo,String lotSl,String locCode,Double quantity,int flag,Connection conn) throws ITMException
{
String returnString="Y";
......@@ -18512,8 +18525,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ResultSet rs = null;
String sSQL = "SELECT REPL_ORDER , LINE_NO ,LOC_CODE__TO FROM REPL_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
//Changed by Rohan on 06-02-13 for checking location instat.start
String sqlInv = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ? ";
String invStat = "";
String invReserve = discommon.getDisparams("999999","RESERV_LOCATION",conn);
//Changed by Rohan on 06-02-13 for checking location instat.end
try {
if(itemInfoMapForRepl !=null || itemInfoMapForRepl.size() > 0)
{
......@@ -18597,6 +18613,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(itemSitemap.containsKey("LAST_REPL_ID"))
{
replID= (String)itemSitemap.get("LAST_REPL_ID");
System.out.println("LAST_REPL_ID&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"+replID);
}
if(itemSitemap.containsKey("REPL_LOC_TO"))
{
......@@ -18619,8 +18636,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
pickLineNo =(Integer)itemSitemap.get("LINE_NO_PICK");
}
pickOrd = pickOrd !=null && pickOrd.length() > 0?pickOrd:"0";
//Changed by Rohan on 06-02-13 for checking location instat.start
pstmt = conn.prepareStatement(sqlInv);
pstmt.setString(1,locCode);
rs = pstmt.executeQuery();
if(rs.next())
{
invStat = rs.getString("INV_STAT");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs =null;
}
if(!invStat.trim().equalsIgnoreCase(invReserve))
{
//Changed by Rohan on 06-02-13 for checking location instat.start
pickOrd = pickOrd !=null && pickOrd.length() > 0?pickOrd:"0";
if(pickOrd.equalsIgnoreCase("0") && replID != null && replID.length() > 0)
{
pstmt = conn.prepareStatement(sSQL);
......@@ -18647,11 +18685,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt = null;
}
}
//Changed by Rohan on 06-02-13 for checking location instat
}
System.out.println("availQty*****:[ "+availQty+" ] actulaQty:[ "+actulaQty+" ] quantity :[ "+quantity+" ]"+"stockQuantity"+stockQuantity+"Pick Ord"+pickOrd+"Pick Line No"+pickLineNo);
if(actulaQty >= quantity)
{
......@@ -18778,8 +18813,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ResultSet rspstmtAvail = null;
String pickType = "";
String sqlReplHis = "";
String activePickLoc = "";
//Chnaged by Rohan on 10-9-12 to define variable.end
String activePickLoc = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);;
//Changed by Rohan on 10-9-12 to define variable.end
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment
String casePickInv = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
String pndLoc = discommon.getDisparams("999999","PND_INVSTAT",conn);
ArrayList tempHisList = null;
try {
......@@ -18790,16 +18830,31 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
/*sqlReplHistory= "SELECT LOC_CODE,REPL_ORDER,QUANTITY,ACTUAL_QTY,LOC_CODE__TO,LINE_NO,PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET"
//+" WHERE ITEM_CODE =? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND ACTUAL_QTY >= 0";
+" WHERE ITEM_CODE =? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";*/
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.start
/*
sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S WHERE D.ITEM_CODE = ? AND "
+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
+" AND D.ITEM_CODE = S.ITEM_CODE AND D.SITE_CODE = S.SITE_CODE "
+" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL AND D.ACTUAL_QTY > 0";
*/
sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L WHERE D.ITEM_CODE = ? AND "
+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
+" AND D.ITEM_CODE = S.ITEM_CODE AND D.SITE_CODE = S.SITE_CODE "
+" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL AND D.LOC_CODE__TO = L.LOC_CODE AND L.INV_STAT IN( ?,? ) "
+" AND D.ACTUAL_QTY > 0 ";
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
pstmtReplHistory =conn.prepareStatement(sqlReplHistory);
pstmtReplHistory.setString(1, itemCodeHis);
pstmtReplHistory.setString(2, siteCodeHis);
pstmtReplHistory.setString(3, lotNoHis);
pstmtReplHistory.setString(4, lotSlHis);
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.start
pstmtReplHistory.setString(5, casePickInv);
pstmtReplHistory.setString(6, pndLoc);
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
//Changed By Rohan
//pstmtReplHistory.setString(5, locCodeHis);
rsReplHistory = pstmtReplHistory.executeQuery();
......@@ -18927,10 +18982,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 27/07/12 to move location form caspick location to DOCK location.end
tempHisMap.put("QTY_AVAIL",quantityReplHis);
tempHisMap.put("QTY_ACTUAL", actualQtyReplHis);
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.start
tempHisMap.put("LAST_REPL_ID", replOrderHis);
//tempHisMap.put("LAST_REPL_ID", picOrd);
System.out.println("LAST REPL ID"+replOrderHis);
////Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
//Changed by Roha on 27/07/12 to move location form caspick location to DOCK location.start
//tempHisMap.put("REPL_LOC_TO",locCodeToHis);
if(invState.startsWith("PND"))
//Changed by Rohan on 06-02-13 to retrive only case Repalnishment
//if(invState.startsWith("PND"))
if(invState.equalsIgnoreCase(pndLoc))
{
sqlLoc = "SELECT LOC_CODE__TO FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmtLoc =conn.prepareStatement(sqlLoc);
......
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