Skip to content

B
business-java
Commit 881967d1 authored by rbhogale's avatar rbhogale
Browse files
Options

Changed by Rohan on 30-10-12 bug fixing of stock is in caspk location 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92112 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a2304fa1
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 91 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ 881967d1
......@@ -202,7 +202,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
stagingLocMpick = discommon.getDisparams( "999999", "STAGING_LOC_MPK", conn );
dsoInvstat = discommon.getDisparams( "999999", "DEEP_STORE_INVSTAT", conn );
System.out.println("dockLoc----->"+dockLoc);
GenericUtility genericUtility = GenericUtility.getInstance();
java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() );
......@@ -284,7 +283,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
refSer = checkNull( rsWave.getString("REF_SER".trim()));
refId = checkNull( rsWave.getString("REF_ID") );
System.out.println("Curren refser====>"+refSer+"REF_ID"+refId);
System.out.println("Curren refser:"+refSer+"REF_ID"+refId);
if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
{
......@@ -357,7 +356,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
locCodeTo = (String) tempPickConfirm.get(0);
confirm = (String) tempPickConfirm.get(1);
transferStatus = (String) tempPickConfirm.get(2);
System.out.println("locCodeTo**PICK***"+locCodeTo+"confirm**PICK***"+confirm+"transferStatus**PICK***"+transferStatus);
}
if("Y".equalsIgnoreCase(confirm))
......@@ -382,7 +380,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if("Y".equalsIgnoreCase(transferStatus))
{
locCode = locCodeTo;
System.out.println("Transfer staus Y loc code"+locCode);
break;
}
else
......@@ -391,13 +388,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if(refSer.equalsIgnoreCase("M-PICK"))
{
locCode = stagingLocMpick;
System.out.println("Master pack staging lacation"+stagingLocMpick);
break;
}
else
{
locCode = stagingLoc;
System.out.println("Active pick staging lacation"+stagingLoc);
break;
}
......@@ -417,8 +412,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
replLineNo = replPickLineNo;
}
System.out.println(" New replOrder order"+replOrder+"replLineNo"+replLineNo);
System.out.println(" New replOrder"+replOrder+"replLineNo"+replLineNo);
//Changed by Rohan Bhogale on 30-10-12 for if case pick is there that not depended on repalnishment then need not to check repalnishment confirm.start
if("".equalsIgnoreCase(replOrder))
{
break;
}
//Changed by Rohan Bhogale on 30-10-12 for if case pick is there that not depended on repalnishment then need not to check repalnishment confirm.end
ArrayList tempPrvReplConfirm = isReplinshmentConfirm(replOrder, replLineNo, conn);
locCodeRepl =(String) tempPrvReplConfirm.get(0);
......@@ -455,7 +455,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if("RD-DSA".equalsIgnoreCase(refSeries))
{
lotSl = (String) tempPrvReplConfirm.get(2);
System.out.println("New lot sl"+lotSl);
}
//to update actual quantity in replanishment
//Test
......@@ -465,7 +465,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
{
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
}
System.out.println("Replanishment iss confirm loc code"+locCode);
break;
}
else
......@@ -496,7 +496,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
{
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
}
System.out.println("Replanishment iss confirm loc code"+locCode);
break;
}
......@@ -513,9 +512,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
rsInv = pstmtInv.executeQuery();
if(rsInv.next())
{
invState = checkNull(rsInv.getString("INV_STAT"));
System.out.println("invState"+invState);
}
if(rsInv != null)
{
......@@ -542,7 +539,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
{
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replPickOrder +" and line no :"+replPickLineNo);
}
System.out.println("Replanishment iss confirm loc code"+locCode);
break;
}
......@@ -577,7 +573,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
{
qtyAlloc = rs.getDouble(1);
System.out.println("Quantity Alloactes"+qtyAlloc);
}
else
......@@ -613,7 +608,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
updateCnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
System.out.println("Deleted the no of records are : updateCnt :"+updateCnt);
}
else
{
......@@ -671,7 +665,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
strAllocate.put("ref_line",line.substring(line.length()-3));
strAllocate.put("site_code",siteCode);
strAllocate.put("item_code",itemCode);
System.out.println("Updated loc code*********************************************"+locCode);
strAllocate.put("loc_code",locCode);
strAllocate.put("lot_no",lotNo);
strAllocate.put("lot_sl",lotSl);
......@@ -850,8 +843,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
confirmRepl = checkNull( rsRepl.getString("CONFIRMED") );
lotSlNew = checkNull( rsRepl.getString("LOT_SL__NEW") );
System.out.println("LOCCode***####****$$$$$$$$$$*"+locCodeRepl+"confirmRepl"+confirmRepl);
}
......@@ -905,8 +896,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
confirm = "";
transferStatus = "";
System.out.println("Enter in A-PICK,M-PICK,A-PICK**************************************");
sqlpickDet = "SELECT D.LOC_CODE__TO AS LOC_CODE__TO,H.CONFIRMED AS CONFIRMED,H.TRF_STATUS AS TRF_STATUS FROM PICK_ISS_DET D,PICK_ISS_HDR H "
+" WHERE D.PICK_ORDER = ? AND D.LINE_NO__ORD = ? "
......@@ -922,7 +911,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
locCodeTo = checkNull( rsPickIss.getString("LOC_CODE__TO") );
confirm = checkNull( rsPickIss.getString("CONFIRMED") );
transferStatus = checkNull( rsPickIss.getString("TRF_STATUS") );
System.out.println("locCodeTo"+locCodeTo+"confirm"+confirm+"transferStatus"+transferStatus);
}
if(rsPickIss != null)
{
......@@ -996,7 +985,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
}
tempList.add(locCode);
tempList.add(replPickOrder);
tempList.add(replPickLineNo);
......@@ -1070,26 +1058,24 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if(rs.next())
{
orderType = rs.getString("ORDER_TYPE");
System.out.println("Order type___@@@@@_____"+orderType);
System.out.println("Order type___"+orderType);
if(!"C".equalsIgnoreCase(orderType) && !"K".equalsIgnoreCase(orderType.trim()) && !"J".equalsIgnoreCase(orderType.trim()) && !"M".equalsIgnoreCase(orderType.trim()))
{
if(!"Q".equalsIgnoreCase(orderType))
{ //rsitem.getString("PTCN") == null?"":rsitem.getString("PTCN");
System.out.println("Enter hereeeeeeee===>");
{
replOrderCopy = checkNull(rs.getString("PICK_ORDER"));
if(!"".equalsIgnoreCase(replOrderCopy))
{
System.out.println("Enterwqqqqqq===>");
replOrder = replOrderCopy;
lineNo = rs.getString("LINE_NO__PICK");
}
}
else
{
System.out.println("Order TYpe Q check"+orderType);
//to reverse actual_qty in case repanishment
//getActualQty ="SELECT ACTUAL_QTY FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
replOrdChk = "";
replLineChk = "";
......@@ -1118,13 +1104,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmt1 = null;
}
System.out.println("1 check invS"+invS+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
replOrd = checkNull(rs.getString("PICK_ORDER"));
lineNoRepl = rs.getString("LINE_NO__PICK");
if(!"".equalsIgnoreCase(replOrd))
{
System.out.println("REPL ORDER"+replOrd);
if(invS.trim().equalsIgnoreCase(casePickLoc.trim()))
{
......@@ -1152,47 +1136,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmt1.close();
pstmt1 = null;
}
System.out.println("2 check invS"+invS+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
}
//Changed by rohan start
/*
sqlOrderType = "SELECT ORDER_TYPE FROM REPL_ORD_HDR WHERE REPL_ORDER = ? ";
pstmt1 = conn.prepareStatement(sqlOrderType);
pstmt1.setString(1, replOrd);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
ordType = rs1.getString("ORDER_TYPE");
}
if(rs1 != null)
{
rs1.close();
rs1 = null;
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
*/
////Chnaged by Rohan end
/*
if("J".equalsIgnoreCase(ordType))
{
updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
+" WHERE (REPL_ORDER,LINE_NO) IN(SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET"
+" WHERE REPL_ORDER = ? AND LINE_NO = ?)";
}
else //if("C".equalsIgnoreCase(ordType))
{
updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
+" WHERE REPL_ORDER = ? AND LINE_NO = ? ";
}
*/
System.out.println("3 check invS"+invS);
if(invS.trim().equalsIgnoreCase(psoLoc.trim()))
{
updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
......@@ -1208,13 +1154,11 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmt1.setDouble(1, actQty);
if("".equalsIgnoreCase(replOrdChk) && invS.trim().equalsIgnoreCase(casePickLoc.trim()))
{
System.out.println("**************"+"replOrdChk"+replOrdChk+"replLineChk"+replLineChk);
pstmt1.setString(2, replOrdChk);
pstmt1.setString(3, replLineChk);
}
else
{
System.out.println("########################"+"replOrd"+replOrd+"replLineChk"+lineNoRepl);
pstmt1.setString(2, replOrd);
pstmt1.setString(3, lineNoRepl);
}
......@@ -1234,18 +1178,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
ArrayList ReplActQty = updateReplActQty(pickOrder,lineNoPick,conn);
System.out.println("ReplActQty-Size"+ReplActQty.size());
System.out.println("ReplActQty-Size"+ReplActQty.toString());
if(ReplActQty.size() > 0)
{
System.out.println("ttttt");
replOrdList = checkNull((String)ReplActQty.get(0));
replLineNoList = checkNull((String)ReplActQty.get(1));
}
if(!"".equalsIgnoreCase(replOrdList))
{
System.out.println("ZZZZZZ");
replOrder = replOrdList;
lineNo = replLineNoList;
}
......@@ -1257,26 +1197,18 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
else
{
ArrayList ReplActQty = updateReplActQty(pickOrder,lineNoPick,conn);
System.out.println("ReplActQty11-Size"+ReplActQty.size());
System.out.println("ReplActQty11-Size"+ReplActQty.toString());
if(ReplActQty.size() > 0)
{
System.out.println("WWWWWWW");
replOrdList = checkNull((String)ReplActQty.get(0));
replLineNoList = checkNull((String)ReplActQty.get(1));
}
if(!"".equalsIgnoreCase(replOrdList))
{
System.out.println("PPPPPPPPPP");
replOrder = replOrdList;
lineNo = replLineNoList;
}
}
//Changed by Rohan on 26-10-12
/*
sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY + ?" +
" WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
*/
sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = CASE WHEN ACTUAL_QTY IS NULL THEN 0 ELSE ACTUAL_QTY END + ?" +
" WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
pstmt = conn.prepareStatement(sql);
......@@ -1398,7 +1330,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if(replHashMap.containsKey(repl))
{
String repLine = replHashMap.get(repl);
System.out.println("Enter Here-------->"+repLine+"repl"+lineRepl);
if(!repLine.equalsIgnoreCase(lineRepl))
{
replHashMap.put(repl,lineRepl);
......@@ -1407,7 +1339,6 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
else
{
isUpdate = false;
System.out.println("IS HASHMAP FLASE");
}
}
else
......@@ -1432,7 +1363,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
actQty = rs1.getDouble("ACTUAL_QTY");
pick = checkNull(rs1.getString("PICK_ORDER"));
}
System.out.println("orderType--"+orderType+"actQty))"+actQty+"pick^^^^"+pick);
if(rs1 != null)
{
rs1.close();
......@@ -1537,10 +1468,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
pstmt1.close();
pstmt1 = null;
}
System.out.println("pick))))))))"+pick);
if(!"".equalsIgnoreCase(pick))
{
System.out.println("adding to templist");
tempReplList.add(pick);
tempReplList.add(lineNoPk);
......@@ -1566,7 +1496,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
}
}
System.out.println("Return templist"+tempReplList.toString());
return tempReplList;
}
......
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