Skip to content

B
business-java
Commit 37836896 authored by ssarkar's avatar ssarkar
Browse files
Options

changed by sumit on 20/03/13 for stock to dock deallocation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92853 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ade7c91f
Hide whitespace changes
Inline Side-by-side
Showing with 593 additions and 93 deletions
webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java
View file @ 37836896
...@@ -80,6 +80,8 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -80,6 +80,8 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
String pPickType = ""; String pPickType = "";
String cartonNo = ""; String cartonNo = "";
String trfStatus = ""; String trfStatus = "";
String supRerplOrder = "";
int supReplLine = 0;
//String comfirmed = ""; //String comfirmed = "";
double DeallocQty = 0.0, quantity = 0.0; double DeallocQty = 0.0, quantity = 0.0;
int pickLineNo = 0; int pickLineNo = 0;
...@@ -175,13 +177,21 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -175,13 +177,21 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
" AND PD.PICK_ORDER = D.PICK_ORDER " + " AND PD.PICK_ORDER = D.PICK_ORDER " +
" AND PD.LINE_NO = D.LINE_NO__PICK " + " AND PD.LINE_NO = D.LINE_NO__PICK " +
" AND PH.PICK_ORDER = PD.PICK_ORDER " + " AND PH.PICK_ORDER = PD.PICK_ORDER " +
" AND PH.SALE_ORDER = S.SALE_ORDER "; " AND PH.SALE_ORDER = S.SALE_ORDER "+
" UNION ALL "+
" SELECT DISTINCT D.CARTON_NO, RD.SALE_ORDER , RD.LINE_NO__SORD, RD.ITEM_CODE, RD.EXP_LEV, RD.LOC_CODE__TO, D.LOT_SL," +
" D.LOC_CODE, D.LOT_NO, D.QUANTITY, S.CUST_CODE, D.WAVE_ID, D.PICK_ORDER RDER, D.LINE_NO__PICK, D.PICK_TYPE " +
" FROM REPL_ORD_DET RD, REPL_ORD_HDR RH , DEALLOC_ART_DET D, SORDER S " +
" WHERE D.TRAN_ID = ? AND RD.REPL_ORDER = D.PICK_ORDER " +
" AND RD.LINE_NO = D.LINE_NO__PICK AND RH.REPL_ORDER = RD.REPL_ORDER " +
" AND RH.SALE_ORDER = S.SALE_ORDER ";
sql1 = "UPDATE CARTON_MASTER SET STATUS ='R' WHERE CARTON_NO = ? "; sql1 = "UPDATE CARTON_MASTER SET STATUS ='R' WHERE CARTON_NO = ? ";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
pstmt.setString(2, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
...@@ -205,11 +215,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -205,11 +215,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
saleOrderLine = saleOrderLine.substring(saleOrderLine.length()-3); saleOrderLine = saleOrderLine.substring(saleOrderLine.length()-3);
System.out.println(" sord line no ["+saleOrderLine+"] locCode ["+locCode+"] locCodeTo["+locCodeTo+"] pickLineNo ["+pickLineNo+"]"); System.out.println(" sord line no ["+saleOrderLine+"] locCode ["+locCode+"] locCodeTo["+locCodeTo+"] pickLineNo ["+pickLineNo+"]");
/*if("S".equalsIgnoreCase(pPickType)) if("S".equalsIgnoreCase(pPickType))
{ {
deallocatedRepl(pickOrder, pickLineNo, siteCode, itemCode, lotNo, lotSl, DeallocQty, saleOrder, saleOrderLine, expLev, custCode, xtraParams, waveId, conn); errString = deallocatedRepl(pickOrder, pickLineNo, siteCode, itemCode, lotNo, lotSl, DeallocQty, saleOrder, saleOrderLine, expLev, custCode, xtraParams, waveId,cartonNo, conn);
errString = sorderDeAllocate(saleOrder, saleOrderLine, itemCode, DeallocQty, expLev, custCode, lotSl, lotNo, locCode, xtraParams, waveId, "");
continue; continue;
}*/ }
sql = ""; sql = "";
sql = " SELECT PIH.PICK_ORDER, PIH.PICK_TYPE, PIH.CONFIRMED, PID.LOC_CODE__TO, " + sql = " SELECT PIH.PICK_ORDER, PIH.PICK_TYPE, PIH.CONFIRMED, PID.LOC_CODE__TO, " +
...@@ -277,7 +288,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -277,7 +288,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
//Updating pick_order //Updating pick_order
isReplDone = true; isReplDone = true;
updateReplOrder(replOrder,replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, "",0); updateReplOrder(replOrder,replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, "",0,"",0);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType); updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
} }
...@@ -288,7 +299,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -288,7 +299,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//lotSl = replParent.get("lot_sl").toString(); //lotSl = replParent.get("lot_sl").toString();
System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
isReplDone = false; isReplDone = false;
updateReplOrder(replOrder,replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, "",0); updateReplOrder(replOrder,replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, "",0,"",0);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType); updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
updateReplOrderForActive(pPickType, replOrder,replOrderLine, empCode, conn); updateReplOrderForActive(pPickType, replOrder,replOrderLine, empCode, conn);
...@@ -320,7 +331,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -320,7 +331,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); //System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
isReplDone = true; isReplDone = true;
updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine); updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine, "", 0);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType); updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn); updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn);
} }
...@@ -332,10 +343,40 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -332,10 +343,40 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); //System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
isReplDone = false; isReplDone = false;
updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine); updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine,"", 0);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType); updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn); updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn);
} }
else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString()))
{
replParent.clear();
replParent = isParentExist(replOrder,replOrderLine, conn);
supRerplOrder = replParent.get("pick_order").toString();
supReplLine = Integer.parseInt(replParent.get("line_no__pick").toString());
System.out.println(" DSO REPL_ORDER ["+replOrder+"] replOrderLine ["+supRerplOrder+"]");
confirmed = "";
confirmed = replParent.get("confirmed").toString();
System.out.println(" *-* confirmed ["+confirmed+"]");
if("Y".equalsIgnoreCase(confirmed))
{
isReplDone = true;
updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine,supRerplOrder, supReplLine);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn);
}
else if ("N".equalsIgnoreCase(confirmed) ) //parentExist.put("paren_exist", "NO");
{
isReplDone = false;
updateReplOrder(currentReplOrder,currReplOrdLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, isReplDone, replOrder,replOrderLine,supRerplOrder, supReplLine);
updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn, isPickIssueDone,pPickType);
updateReplOrderForActive(pPickType, currentReplOrder,currReplOrdLine, empCode, conn);
}
}
} }
} }
else else
...@@ -1006,7 +1047,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1006,7 +1047,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
{ {
parentExist.put("paren_exist", "NO"); parentExist.put("paren_exist", "NO");
parentExist.put("pick_order", " "); parentExist.put("pick_order", " ");
parentExist.put("line_no__pick", ""); parentExist.put("line_no__pick", 0);
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -1123,26 +1164,67 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1123,26 +1164,67 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
return parentExist; return parentExist;
} }
// Updating repl order // Updating repl order
private int updateReplOrder(String currentReplOrder,int replOrderLine, String siteCode, String itemCode, String locCode, String lotNo, String lotSl, double DeallocQty, Connection conn, boolean isReplDone, String parentReplOrder, int parentReplOrdLine) throws ITMException private int updateReplOrder(String currentReplOrder,int replOrderLine, String siteCode, String itemCode, String locCode, String lotNo, String lotSl, double DeallocQty, Connection conn, boolean isReplDone, String parentReplOrder, int parentReplOrdLine, String supRerplOrder,int supReplLine) throws ITMException
{ {
String sql = ""; String sql = "";
double quantity = 0;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
int update = 0; int update = 0;
try try
{ {
System.out.println(" currentReplOrder ["+currentReplOrder+"] isReplDone ["+isReplDone+"] parentReplOrder["+parentReplOrder+"]"); System.out.println(" currentReplOrder ["+currentReplOrder+"] isReplDone ["+isReplDone+"] parentReplOrder["+parentReplOrder+"] supRerplOrder ["+supRerplOrder+"] supReplLine ["+supReplLine+"]");
//sql = ""; //sql = "";
//sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? "; //sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? ";
if( !isReplDone && parentReplOrder.trim().length() == 0) if( !isReplDone && parentReplOrder.trim().length() == 0)
{ {
sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?), " + sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL";
" DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty ); pstmt.setDouble(1, DeallocQty );
pstmt.setDouble(2, DeallocQty ); pstmt.setString(2, currentReplOrder);
pstmt.setString(3, currentReplOrder); pstmt.setInt(3, replOrderLine);
pstmt.setInt(4, replOrderLine); //pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(currentReplOrder+" repl_order updated successfully ");
}
pstmt.close();pstmt = null;
sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, currentReplOrder);
pstmt.setInt(3, replOrderLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(currentReplOrder+" repl_order updated successfully ");
}
pstmt.close();pstmt = null;
}
else if( isReplDone && parentReplOrder.trim().length() == 0)
{
sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, currentReplOrder);
pstmt.setInt(3, replOrderLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(currentReplOrder+" repl_order updated successfully ");
}
pstmt.close();pstmt = null;
sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, currentReplOrder);
pstmt.setInt(3, replOrderLine);
//pstmt2.setInt(3, pickLineNo); //pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate(); update = pstmt.executeUpdate();
if( update > 0 ) if( update > 0 )
...@@ -1154,12 +1236,24 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1154,12 +1236,24 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
} }
else if( !isReplDone && parentReplOrder.trim().length() > 0) else if( !isReplDone && parentReplOrder.trim().length() > 0)
{ {
sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, currentReplOrder);
pstmt.setInt(3, replOrderLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(currentReplOrder+" repl_order updated successfully ");
}
pstmt.close();pstmt = null;
sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?"; sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty ); pstmt.setDouble(1, DeallocQty );
pstmt.setDouble(2, DeallocQty ); pstmt.setString(2, currentReplOrder);
pstmt.setString(3, currentReplOrder); pstmt.setInt(3, replOrderLine);
pstmt.setInt(4, replOrderLine);
//pstmt2.setInt(3, pickLineNo); //pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate(); update = pstmt.executeUpdate();
if( update > 0 ) if( update > 0 )
...@@ -1168,12 +1262,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1168,12 +1262,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
} }
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?"; sql = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty ); pstmt.setDouble(1, DeallocQty );
pstmt.setDouble(2, DeallocQty ); pstmt.setString(2, parentReplOrder);
pstmt.setString(3, parentReplOrder); pstmt.setInt(3, parentReplOrdLine);
pstmt.setInt(4, parentReplOrdLine);
//pstmt2.setInt(3, pickLineNo); //pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate(); update = pstmt.executeUpdate();
if( update > 0 ) if( update > 0 )
...@@ -1193,13 +1286,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1193,13 +1286,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
{ {
System.out.println(currentReplOrder+" repl_order of REPL_ISS_DET updated successfully "); System.out.println(currentReplOrder+" repl_order of REPL_ISS_DET updated successfully ");
} }
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
else if( isReplDone && parentReplOrder.trim().length() > 0) else if( isReplDone && parentReplOrder.trim().length() > 0)
{ {
sql = " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?"; sql = " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty ); pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, parentReplOrder); pstmt.setString(2, parentReplOrder);
...@@ -1226,6 +1318,138 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1226,6 +1318,138 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
if( !isReplDone && supRerplOrder.trim().length() > 0 )
{
sql = " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, supRerplOrder);
pstmt.setInt(3, supReplLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(supRerplOrder+" repl_order of REPL_ORD_DET updated successfully ");
}
pstmt.close();pstmt = null;
sql = "UPDATE REPL_ISS_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO__ORD = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, supRerplOrder);
pstmt.setInt(3, supReplLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(supRerplOrder+" repl_order of REPL_ISS_DET updated successfully ");
}
pstmt.close();pstmt = null;
}
else if ( isReplDone && supRerplOrder.trim().length() > 0 )
{
sql = " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ( ACTUAL_QTY + ?) WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, supRerplOrder);
pstmt.setInt(3, supReplLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(supRerplOrder+" repl_order of REPL_ORD_DET updated successfully ");
}
pstmt.close();pstmt = null;
sql = "UPDATE REPL_ISS_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO__ORD = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, DeallocQty );
pstmt.setString(2, supRerplOrder);
pstmt.setInt(3, supReplLine);
//pstmt2.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
if( update > 0 )
{
System.out.println(supRerplOrder+" repl_order of REPL_ISS_DET updated successfully ");
}
pstmt.close();pstmt = null;
}
if( parentReplOrder.trim().length() > 0 )
{
sql = " SELECT (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) AS QUANTITY " +
" FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, parentReplOrder);
pstmt.setInt(2, parentReplOrdLine);
rs = pstmt.executeQuery();
if( rs.next())
{
quantity = rs.getDouble("QUANTITY");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( quantity == 0 )
{
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, parentReplOrder);
pstmt.setInt(2, parentReplOrdLine);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" REPL_ORD_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
sql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, parentReplOrder);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" WAVE_TASK_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
}
}
if( supRerplOrder.trim().length() > 0 )
{
sql = " SELECT (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) AS QUANTITY " +
" FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, supRerplOrder);
pstmt.setInt(2, supReplLine);
rs = pstmt.executeQuery();
if( rs.next())
{
quantity = rs.getDouble("QUANTITY");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( quantity == 0 )
{
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, supRerplOrder);
pstmt.setInt(2, supReplLine);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" REPL_ORD_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
sql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, supRerplOrder);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" WAVE_TASK_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
}
}
} }
catch(Exception e) catch(Exception e)
...@@ -1697,9 +1921,29 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1697,9 +1921,29 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
System.out.println(" REPL_ORD_DET updated succesfully"); System.out.println(" REPL_ORD_DET updated succesfully");
} }
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
sql = " UPDATE REPL_ISS_HDR SET CONFIRMED ='Y', CONF_DATE = ? , EMP_CODE__APRV = ? WHERE REPL_ORDER = ? AND CONFIRMED = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, currDate);
pstmt.setString(2, empCode);
pstmt.setString(3, replOrder);
if( pstmt.executeUpdate() > 0 )
{
System.out.println(" confirmed sussccessfully ");
}
pstmt.close(); pstmt = null;
sql = " UPDATE WAVE_TASK_DET SET STATUS ='Y' WHERE REF_ID = ? AND STATUS = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder);
if ( pstmt.executeUpdate() > 0)
{
System.out.println(" wave_task_det updated succesfully");
}
pstmt.close(); pstmt = null;
} }
sql = " SELECT SUM(ROD.QUANTITY - CASE WHEN ROD.ACTUAL_QTY IS NULL THEN 0 ELSE ROD.ACTUAL_QTY END ) AS QUANTITY " + /*sql = " SELECT SUM(ROD.QUANTITY - CASE WHEN ROD.ACTUAL_QTY IS NULL THEN 0 ELSE ROD.ACTUAL_QTY END ) AS QUANTITY " +
" FROM REPL_ORD_DET ROD, REPL_ORD_HDR ROH WHERE ROD.REPL_ORDER = ? AND ROH.REPL_ORDER = ROD.REPL_ORDER AND ROH.ORDER_TYPE = 'Q' "; " FROM REPL_ORD_DET ROD, REPL_ORD_HDR ROH WHERE ROD.REPL_ORDER = ? AND ROH.REPL_ORDER = ROD.REPL_ORDER AND ROH.ORDER_TYPE = 'Q' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, replOrder); pstmt.setString(1, replOrder);
...@@ -1714,16 +1958,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1714,16 +1958,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
if(quantity == 0) if(quantity == 0)
{ {
sql = " UPDATE REPL_ISS_HDR SET CONFIRMED ='Y', CONF_DATE = ? , EMP_CODE__APRV = ? WHERE REPL_ORDER = ? AND CONFIRMED = 'N'";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, currDate);
pstmt.setString(2, empCode);
pstmt.setString(3, replOrder);
if( pstmt.executeUpdate() > 0 )
{
System.out.println(" confirmed sussccessfully ");
}
pstmt.close(); pstmt = null;
sql = " UPDATE WAVE_TASK_DET SET STATUS ='Y' WHERE REF_ID = ? AND STATUS = 'N'"; sql = " UPDATE WAVE_TASK_DET SET STATUS ='Y' WHERE REF_ID = ? AND STATUS = 'N'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1733,7 +1968,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1733,7 +1968,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
System.out.println(" wave_task_det updated succesfully"); System.out.println(" wave_task_det updated succesfully");
} }
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
} }*/
} }
} }
catch(Exception e) catch(Exception e)
...@@ -1763,7 +1998,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1763,7 +1998,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
return null; return null;
} }
private String deallocatedRepl(String refId, int pickLineNo,String siteCode, String itemCode, String lotNo, String lotSl, double DeallocQty,String saleOrder, String saleOrderLine, String expLev,String custCode,String xtraParams,String waveId,Connection conn) throws ITMException private String deallocatedRepl(String refId, int pickLineNo,String siteCode, String itemCode, String lotNo, String lotSl, double DeallocQty,String saleOrder, String saleOrderLine, String expLev,String custCode,String xtraParams,String waveId,String cartonNo, Connection conn) throws ITMException
{ {
String sql = ""; String sql = "";
String confirmed =""; String confirmed ="";
...@@ -1774,9 +2009,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1774,9 +2009,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
String currentRepl = ""; String currentRepl = "";
int currReplLineNo = 0; int currReplLineNo = 0;
String errString = ""; String errString = "";
String replPickOrder = "";
//String lotNo = ""; //String lotNo = "";
// lotSl = ""; // lotSl = "";
double quantity = 0.0;
int replOrderLine = 0; int replOrderLine = 0;
int replPickLine = 0;
boolean isIssueDone = false; boolean isIssueDone = false;
PreparedStatement pstmt = null, pstmt2 = null; PreparedStatement pstmt = null, pstmt2 = null;
ResultSet rs = null; // rs2 = null; ResultSet rs = null; // rs2 = null;
...@@ -1788,7 +2026,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1788,7 +2026,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
" AND RIH.REPL_ORDER = RID.REPL_ORDER "; " AND RIH.REPL_ORDER = RID.REPL_ORDER ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId); pstmt.setString(1, refId);
pstmt.setInt(1, pickLineNo); pstmt.setInt(2, pickLineNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
confirmed = ""; confirmed = "";
if( rs.next()) if( rs.next())
...@@ -1807,14 +2045,26 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1807,14 +2045,26 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
if( !isIssueDone ) if( !isIssueDone )
{ {
/*replIss = new HashMap(); sql = "SELECT PICK_ORDER, LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
replIss = isParentReplExist(pickOrder, pickLineNo, conn); pstmt = conn.prepareStatement(sql);
if("YES".equalsIgnoreCase(replIss.get("isRepl").toString())) pstmt.setString(1, refId);
{*/ pstmt.setInt(2, pickLineNo);
rs = pstmt.executeQuery();
if( rs.next() )
{
replPickOrder = checkNull(rs.getString("PICK_ORDER"));
replPickLine = rs.getInt("LINE_NO__PICK");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println(" parent repl_order ["+replPickOrder+"] replPickLine ["+replPickLine+"]");
if(replPickOrder.trim().length() > 0 )
{
//replOrder = replIss.get("repl_order").toString(); //replOrder = replIss.get("repl_order").toString();
//System.out.println(" 88 replOrder ["+replOrder+"]"); line_no__pick //System.out.println(" 88 replOrder ["+replOrder+"]"); line_no__pick
HashMap replParent = new HashMap(); HashMap replParent = new HashMap();
replParent = isParentExist(refId,pickLineNo, conn); replParent = isParentExist(replPickOrder,replPickLine, conn);
replOrder = replParent.get("pick_order").toString(); replOrder = replParent.get("pick_order").toString();
replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString()); replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
...@@ -1826,15 +2076,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1826,15 +2076,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
locCode = replParent.get("loc_code__to").toString(); locCode = replParent.get("loc_code__to").toString();
lotNo = replParent.get("lot_no").toString(); lotNo = replParent.get("lot_no").toString();
lotSl = replParent.get("lot_sl").toString(); lotSl = replParent.get("lot_sl").toString();
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); //System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
/*stockDetail.put("loc_code", locCode); updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replPickOrder, replPickLine,"",0);
stockDetail.put("ref_id", refId);
stockDetail.put("ref_line_no", pickLineNo);*/
updateReplOrder(replOrder, replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0);
} }
else if ("N".equalsIgnoreCase(confirmed) && "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())) //parentExist.put("paren_exist", "NO"); else if ("N".equalsIgnoreCase(confirmed) /*&& "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())*/) //parentExist.put("paren_exist", "NO");
{ {
locCode = replParent.get("loc_code__to").toString(); locCode = replParent.get("loc_code__to").toString();
lotNo = replParent.get("lot_no").toString(); lotNo = replParent.get("lot_no").toString();
...@@ -1843,12 +2090,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1843,12 +2090,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn); //updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn); //updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
/*stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replParent.get("pick_order").toString()); updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, false, replPickOrder, replPickLine,"",0);
stockDetail.put("ref_line_no", replOrderLine);*/
updateReplOrder(replOrder, replOrderLine, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, false, "", 0);
} }
else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString())) /*else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString()))
{ {
System.out.println(" repl order going to search it's ["+replOrder+"] parent "); System.out.println(" repl order going to search it's ["+replOrder+"] parent ");
currentRepl = replOrder; currentRepl = replOrder;
...@@ -1873,9 +2118,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1873,9 +2118,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]"); System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn); //updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
/*stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replOrder);
stockDetail.put("ref_line_no", replOrderLine);*/
updateReplOrder(currentRepl, currReplLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine); updateReplOrder(currentRepl, currReplLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine);
} }
else if ("N".equalsIgnoreCase(confirmed) && "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())) //parentExist.put("paren_exist", "NO"); else if ("N".equalsIgnoreCase(confirmed) && "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())) //parentExist.put("paren_exist", "NO");
...@@ -1887,12 +2130,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1887,12 +2130,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn); //updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn); //updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
/*stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replParent.get("pick_order").toString());
stockDetail.put("ref_line_no", replOrderLine);*/
updateReplOrder(currentRepl, currReplLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine); updateReplOrder(currentRepl, currReplLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine);
} }
} } */
}
} }
else else
...@@ -1911,11 +2153,55 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1911,11 +2153,55 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
/*stockDetail.put("loc_code", locCode); /*stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", refId); stockDetail.put("ref_id", refId);
stockDetail.put("ref_line_no", pickLineNo);*/ stockDetail.put("ref_line_no", pickLineNo);*/
updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine); updateReplOrder(refId, pickLineNo, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, replOrder, replOrderLine,"",0);
} }
System.out.println(" final locCode ["+locCode+"]"); System.out.println(" final locCode ["+locCode+"]");
errString = sorderDeAllocate(saleOrder, saleOrderLine, itemCode, DeallocQty, expLev, custCode, lotSl, lotNo, locCode, xtraParams, waveId, ""); sql = " SELECT (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) AS QUANTITY " +
" FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
pstmt.setInt(2, pickLineNo);
rs = pstmt.executeQuery();
if( rs.next())
{
quantity = rs.getDouble("QUANTITY");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
if( quantity == 0 )
{
sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
pstmt.setInt(2, pickLineNo);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" REPL_ORD_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
sql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" WAVE_TASK_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
sql = "UPDATE CARTON_MASTER SET STATUS = 'Y' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
pstmt.setInt(2, pickLineNo);
if ( pstmt.executeUpdate() > 0 )
{
System.out.println(" WAVE_TASK_DET updated succesfully ");
}
pstmt.close(); pstmt = null;
}
if (errString != null && errString.trim().length() > 0) if (errString != null && errString.trim().length() > 0)
{ {
...@@ -1926,7 +2212,9 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1926,7 +2212,9 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
errString = e.getMessage();
throw new ITMException(e); throw new ITMException(e);
} }
finally finally
{ {
...@@ -1944,6 +2232,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo ...@@ -1944,6 +2232,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
catch( Exception ex) catch( Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();
errString = ex.getMessage();
throw new ITMException(ex); throw new ITMException(ex);
} }
} }
......
webitm-wms/ibase/webitm/ejb/wms/DeallocArtIC.java
View file @ 37836896
...@@ -680,6 +680,9 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De ...@@ -680,6 +680,9 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
String confDate = ""; String confDate = "";
String pickOrder = ""; String pickOrder = "";
String CartonNo = ""; String CartonNo = "";
String columnValue = "";
String saleOrderTo = "";
String saleOrderFr = "";
int lineNo = 0; int lineNo = 0;
int count= 0; int count= 0;
...@@ -767,12 +770,83 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De ...@@ -767,12 +770,83 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
} }
else if( currentColumn.trim().equalsIgnoreCase( "sale_order__fr" ) ) else if( currentColumn.trim().equalsIgnoreCase( "sale_order__fr" ) )
{ {
//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" ); columnValue = genericUtility.getColumnValue("sale_order__fr",currDom);
saleOrderTo = checkNull(genericUtility.getColumnValue("sale_order__to",currDom));
//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );
sql = " SELECT C.CUST_CODE,S.CUST_CODE__DLV FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE AND C.WAVE_TYPE = W.WAVE_TYPE ";
System.out.println("queryString="+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,columnValue);
rs = pstmt.executeQuery();
if(rs.next())
{
if( columnValue.equalsIgnoreCase(saleOrderTo))
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( rs.getString("CUST_CODE") ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( rs.getString("CUST_CODE") ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( rs.getString("CUST_CODE__DLV") ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( rs.getString("CUST_CODE__DLV") ).append( "]]></cust_code__dlv_to>\r\n" );
}
else
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__dlv_to>\r\n" );
}
}
else
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__dlv_to>\r\n" );
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
} }
else if( currentColumn.trim().equalsIgnoreCase( "sale_order__to" ) ) else if( currentColumn.trim().equalsIgnoreCase( "sale_order__to" ) )
{ {
//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" ); columnValue = genericUtility.getColumnValue("sale_order__to",currDom);
saleOrderFr = checkNull(genericUtility.getColumnValue("sale_order__fr",currDom));
//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );
sql = " SELECT C.CUST_CODE,S.CUST_CODE__DLV FROM SORDER S, CUSTOMER C, WAVE_TYPE W WHERE SALE_ORDER = ? " +
" AND C.CUST_CODE = S.CUST_CODE AND C.WAVE_TYPE = W.WAVE_TYPE ";
System.out.println("queryString="+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,columnValue);
rs = pstmt.executeQuery();
if(rs.next())
{
if( columnValue.equalsIgnoreCase(saleOrderFr))
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( rs.getString("CUST_CODE") ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( rs.getString("CUST_CODE") ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( rs.getString("CUST_CODE__DLV") ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( rs.getString("CUST_CODE__DLV") ).append( "]]></cust_code__dlv_to>\r\n" );
}
else
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__dlv_to>\r\n" );
}
}
else
{
valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__fr>\r\n" );
valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__dlv_fr>\r\n" );
valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__dlv_to>\r\n" );
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
} }
else if("ptcn".equalsIgnoreCase(currentColumn.trim())) else if("ptcn".equalsIgnoreCase(currentColumn.trim()))
{ {
......
webitm-wms/ibase/webitm/ejb/wms/DeallocArtPrc.java
View file @ 37836896
...@@ -147,7 +147,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -147,7 +147,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code"); //siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
/*ptcn = genericUtility.getColumnValue("ptcn",headerDom); /*ptcn = genericUtility.getColumnValue("ptcn",headerDom);
if ( ptcn == null || ptcn.trim().length() == 0 ) if ( ptcn == null || ptcn.trim().length() == 0 )
{ {
...@@ -156,25 +156,37 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -156,25 +156,37 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString; return errString;
} */ } */
siteCode = genericUtility.getColumnValue("site_code",headerDom);
if ( siteCode == null || siteCode.trim().length() == 0 )
{
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString;
}
System.out.println(" site code ["+siteCode+"]");
saleOrderFr = genericUtility.getColumnValue("sale_order__fr",headerDom); saleOrderFr = genericUtility.getColumnValue("sale_order__fr",headerDom);
if ( saleOrderFr == null || saleOrderFr.trim().length() == 0 ) if ( saleOrderFr == null || saleOrderFr.trim().length() == 0 )
{ {
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString; return errString;
} }
System.out.println(" saleOrderFr ["+saleOrderFr+"]");
saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom); saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom);
if ( saleOrderTo == null || saleOrderTo.trim().length() == 0 ) if ( saleOrderTo == null || saleOrderTo.trim().length() == 0 )
{ {
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString; return errString;
} }
System.out.println(" saleOrderTo ["+saleOrderTo+"]");
custCodeFr = genericUtility.getColumnValue("cust_code__fr",headerDom); custCodeFr = genericUtility.getColumnValue("cust_code__fr",headerDom);
if ( custCodeFr == null || custCodeFr.trim().length() == 0 ) if ( custCodeFr == null || custCodeFr.trim().length() == 0 )
{ {
errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
return errString; return errString;
} }
System.out.println(" custCodeFr ["+custCodeFr+"]");
custCodeTo = genericUtility.getColumnValue("cust_code__to",headerDom); custCodeTo = genericUtility.getColumnValue("cust_code__to",headerDom);
if ( custCodeTo == null || custCodeTo.trim().length() == 0 ) if ( custCodeTo == null || custCodeTo.trim().length() == 0 )
{ {
...@@ -801,7 +813,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -801,7 +813,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
return errString; return errString;
} }
} }
else if( "C".equalsIgnoreCase(pickType)) else if( "C".equalsIgnoreCase(pickType) || "M".equalsIgnoreCase(pickType) )
{ {
HashMap itmVolumeMap = getItemVoumeMap(itemCode,"",conn); HashMap itmVolumeMap = getItemVoumeMap(itemCode,"",conn);
double packSizeActive = (Double)itmVolumeMap.get("PACK_SIZE"); double packSizeActive = (Double)itmVolumeMap.get("PACK_SIZE");
...@@ -813,6 +825,29 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -813,6 +825,29 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
return errString; return errString;
} }
} }
else if( "S".equalsIgnoreCase(pickType) )
{
double packSizeActive = 0.0;
sql = "SELECT QUANTITY FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, pickOrder);
pstmt1.setString(2, lineNoPick);
rs = pstmt1.executeQuery();
if( rs.next())
{
packSizeActive = rs.getDouble("QUANTITY");
}
rs.close(); rs = null;
pstmt1.close(); pstmt1 = null;
if(packSizeActive != quantity)
{
errString="INVDEALLQ4";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
return errString;
}
}
// CHECKING QUANTITY AGAINST // CHECKING QUANTITY AGAINST
//sql = " " //sql = " "
...@@ -1398,6 +1433,55 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1398,6 +1433,55 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
stockDetail.put("ref_id", replOrder); stockDetail.put("ref_id", replOrder);
stockDetail.put("ref_line_no", replOrderLine); stockDetail.put("ref_line_no", replOrderLine);
} }
else if ("N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString())) //parentExist.put("paren_exist", "NO");
{
replOrder = "";
replOrder = replParent.get("pick_order").toString();
replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
System.out.println(" DSO repl order going to serch it's parent ["+replOrder+"]");
replParent.clear();
replParent = isParentExistAndConfirmed(replOrder,replOrderLine, conn);
confirmed = "";
confirmed = replParent.get("confirmed").toString();
System.out.println(" *-* confirmed ["+confirmed+"]");
if("Y".equalsIgnoreCase(confirmed))
{
locCode = replParent.get("loc_code__to").toString();
lotNo = replParent.get("lot_no").toString();
lotSl = replParent.get("lot_sl").toString();
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", currentReplOrder);
stockDetail.put("ref_line_no", currentLine);
}
else if ("N".equalsIgnoreCase(confirmed) /*&& "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())*/) //parentExist.put("paren_exist", "NO");
{
locCode = replParent.get("loc_code__to").toString();
lotNo = replParent.get("lot_no").toString();
lotSl = replParent.get("lot_sl").toString();
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replOrder);
stockDetail.put("ref_line_no", replOrderLine);
}
//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
/*stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replOrder);
stockDetail.put("ref_line_no", replOrderLine);*/
}
} }
} }
else else
...@@ -1411,6 +1495,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1411,6 +1495,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
{ {
locCode = rs.getString("LOC_CODE"); locCode = rs.getString("LOC_CODE");
} }
else
{
stockDetail.put("loc_code", "");
stockDetail.put("ref_id", "");
stockDetail.put("ref_line_no", "");
}
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -1446,7 +1537,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1446,7 +1537,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null;*/ pstmt.close(); pstmt = null;*/
boolean isAllTaskConfirmed = isAllTaskComp(pickOrder, conn); boolean isAllTaskConfirmed = isAllTaskConf(pickOrder, conn);
System.out.println( " isAllTaskConfirmed ["+isAllTaskConfirmed+"]"); System.out.println( " isAllTaskConfirmed ["+isAllTaskConfirmed+"]");
//if( ("C".equalsIgnoreCase(pickType) && "C".equalsIgnoreCase(status) ) || ("C".equalsIgnoreCase(status) && "Y".equalsIgnoreCase(trfStatus) && ( "A".equalsIgnoreCase(pickType) || "M".equalsIgnoreCase(pickType)))) //if( ("C".equalsIgnoreCase(pickType) && "C".equalsIgnoreCase(status) ) || ("C".equalsIgnoreCase(status) && "Y".equalsIgnoreCase(trfStatus) && ( "A".equalsIgnoreCase(pickType) || "M".equalsIgnoreCase(pickType))))
if( isAllTaskConfirmed ) if( isAllTaskConfirmed )
...@@ -1546,7 +1637,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1546,7 +1637,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
String replOrder = ""; String replOrder = "";
String lotNo = ""; String lotNo = "";
String lotSl = ""; String lotSl = "";
String replPickOrder = "";
int replOrderLine = 0; int replOrderLine = 0;
int replPickLine = 0;
boolean isIssueDone = false; boolean isIssueDone = false;
PreparedStatement pstmt = null, pstmt2 = null; PreparedStatement pstmt = null, pstmt2 = null;
ResultSet rs = null; // rs2 = null; ResultSet rs = null; // rs2 = null;
...@@ -1576,14 +1669,27 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1576,14 +1669,27 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
if( !isIssueDone ) if( !isIssueDone )
{ {
/*replIss = new HashMap();
replIss = isParentReplExist(pickOrder, pickLineNo, conn); sql = "SELECT PICK_ORDER, LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
if("YES".equalsIgnoreCase(replIss.get("isRepl").toString())) pstmt = conn.prepareStatement(sql);
{*/ pstmt.setString(1, refId);
//replOrder = replIss.get("repl_order").toString(); pstmt.setInt(2, pickLineNo);
//System.out.println(" 88 replOrder ["+replOrder+"]"); line_no__pick rs = pstmt.executeQuery();
if( rs.next() )
{
replPickOrder = checkNull(rs.getString("PICK_ORDER"));
replPickLine = rs.getInt("LINE_NO__PICK");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
System.out.println(" parent repl_order ["+replPickOrder+"] replPickLine ["+replPickLine+"]");
if( replPickOrder.trim().length() > 0)
{
HashMap replParent = new HashMap(); HashMap replParent = new HashMap();
replParent = isParentExistAndConfirmed(refId,pickLineNo, conn); replParent = isParentExistAndConfirmed(replPickOrder,replPickLine, conn);
replOrder = replParent.get("pick_order").toString();
replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString()); replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
confirmed = replParent.get("confirmed").toString();//confirmed confirmed = replParent.get("confirmed").toString();//confirmed
System.out.println(" confirmed ["+confirmed+"] paren_exist ["+replParent.get("paren_exist").toString()+"] repl_order ["+replParent.get("pick_order").toString()+"]"); System.out.println(" confirmed ["+confirmed+"] paren_exist ["+replParent.get("paren_exist").toString()+"] repl_order ["+replParent.get("pick_order").toString()+"]");
...@@ -1598,7 +1704,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1598,7 +1704,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
stockDetail.put("ref_id", refId); stockDetail.put("ref_id", refId);
stockDetail.put("ref_line_no", pickLineNo); stockDetail.put("ref_line_no", pickLineNo);
} }
else if ("N".equalsIgnoreCase(confirmed) && "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())) //parentExist.put("paren_exist", "NO"); else if ("N".equalsIgnoreCase(confirmed) /*&& "NO".equalsIgnoreCase(replParent.get("paren_exist").toString())*/) //parentExist.put("paren_exist", "NO");
{ {
locCode = replParent.get("loc_code__to").toString(); locCode = replParent.get("loc_code__to").toString();
lotNo = replParent.get("lot_no").toString(); lotNo = replParent.get("lot_no").toString();
...@@ -1608,10 +1714,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1608,10 +1714,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn); //updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn); //updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
stockDetail.put("loc_code", locCode); stockDetail.put("loc_code", locCode);
stockDetail.put("ref_id", replParent.get("pick_order").toString()); stockDetail.put("ref_id", replPickOrder);
stockDetail.put("ref_line_no", replOrderLine); stockDetail.put("ref_line_no", replPickLine);
} }
else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString())) /*else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString()))
{ {
System.out.println(" repl order going to search it's ["+replOrder+"] parent "); System.out.println(" repl order going to search it's ["+replOrder+"] parent ");
replOrder = ""; replOrder = "";
...@@ -1650,8 +1756,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1650,8 +1756,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
stockDetail.put("ref_id", replParent.get("pick_order").toString()); stockDetail.put("ref_id", replParent.get("pick_order").toString());
stockDetail.put("ref_line_no", replOrderLine); stockDetail.put("ref_line_no", replOrderLine);
} }
} }*/
}
} }
else else
{ {
...@@ -1670,7 +1777,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1670,7 +1777,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
stockDetail.put("ref_id", refId); stockDetail.put("ref_id", refId);
stockDetail.put("ref_line_no", pickLineNo); stockDetail.put("ref_line_no", pickLineNo);
} }
System.out.println(" final locCode ["+locCode+"]"); System.out.println(" stockDetail ["+stockDetail+"]");
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1773,7 +1880,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1773,7 +1880,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
{ {
parentExist.put("paren_exist", "NO"); parentExist.put("paren_exist", "NO");
parentExist.put("pick_order", " "); parentExist.put("pick_order", " ");
parentExist.put("line_no__pick", " "); parentExist.put("line_no__pick", 0);
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -1830,6 +1937,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1830,6 +1937,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
parentExist.put("lot_sl", rs2.getString("LOT_SL")); parentExist.put("lot_sl", rs2.getString("LOT_SL"));
parentExist.put("loc_code__to", rs2.getString("LOC_CODE")); parentExist.put("loc_code__to", rs2.getString("LOC_CODE"));
} }
else
{
parentExist.put("item_code", "");
parentExist.put("lot_no", "");
parentExist.put("lot_sl", "");
parentExist.put("loc_code__to", "");
}
parentExist.put("confirmed", "N"); parentExist.put("confirmed", "N");
rs2.close();rs2 = null; rs2.close();rs2 = null;
pstmt2.close();pstmt2 = null; pstmt2.close();pstmt2 = null;
...@@ -1890,7 +2004,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal, ...@@ -1890,7 +2004,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
return parentExist; return parentExist;
} }
private boolean isAllTaskComp(String refId, Connection conn) throws ITMException private boolean isAllTaskConf(String refId, Connection conn) throws ITMException
{ {
String sql = "", sql1 = ""; String sql = "", sql1 = "";
String waveId = ""; String waveId = "";
......
webitm-wms/module-resource/sql/update.sql
View file @ 37836896
...@@ -31898,6 +31898,29 @@ INSERT INTO MESSAGES ( ...@@ -31898,6 +31898,29 @@ INSERT INTO MESSAGES (
NULL, NULL,
NULL); NULL);
--Changed by sumit on 20/03/13 for item changed
INSERT INTO obj_itemchange (
obj_name ,
form_no ,
field_name ,
mandatory )
VALUES (
'dealloc_art_proc',
'1 ',
'sale_order__to',
'Y');
INSERT INTO obj_itemchange (
obj_name ,
form_no ,
field_name ,
mandatory )
VALUES (
'dealloc_art_proc',
'1 ',
'sale_order__fr',
'Y');
commit; commit;
......
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