Skip to content

B
business-java
Commit 41e6a293 authored by ppatro's avatar ppatro
Browse files
Options

wave cancel and pallet merging 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92254 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3bec8776
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletMergeIC.java
View file @ 41e6a293
...@@ -70,7 +70,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P ...@@ -70,7 +70,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null ; PreparedStatement pstmt = null ;
ResultSet rs = null , rs1 = null; ResultSet rs = null , rs1 = null;
String sql = "" ; String sql = "",sqlCarton = "" ;
String userId = ""; String userId = "";
int currentFormNo=0; int currentFormNo=0;
int childNodeListLength; int childNodeListLength;
...@@ -233,6 +233,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P ...@@ -233,6 +233,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
//sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ?"; //sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ?";
sql = "SELECT COUNT(*) AS COUNT FROM DESPATCHDET WHERE DESP_ID IN(SELECT DESP_ID " + sql = "SELECT COUNT(*) AS COUNT FROM DESPATCHDET WHERE DESP_ID IN(SELECT DESP_ID " +
" FROM DESPATCHDET WHERE PALLET_NO = ?) AND PALLET_NO = ?"; " FROM DESPATCHDET WHERE PALLET_NO = ?) AND PALLET_NO = ?";
sqlCarton = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ? AND STATUS = 'A'";
} }
else else
{ {
...@@ -251,12 +252,52 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P ...@@ -251,12 +252,52 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
{ {
count = rs.getInt("COUNT"); count = rs.getInt("COUNT");
} }
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if( count == 0 ) if( count == 0 )
{ {
if("palletmerge".equalsIgnoreCase(objName)) if("palletmerge".equalsIgnoreCase(objName))
{ {
errString = getErrorString("pallet_no__new","INVPLTDESP",userId); pstmt = conn.prepareStatement(sqlCarton);
break; pstmt.setString(1,palletNo);
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(count == 0)
{
errString = getErrorString("pallet_no__new","INVPLTMST",userId);
break;
}
else
{
errString = getErrorString("pallet_no__new","INVPLTDESP",userId);
break;
}
} }
else else
{ {
...@@ -265,7 +306,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P ...@@ -265,7 +306,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
} }
} }
if(pstmt != null) /* if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -275,7 +316,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P ...@@ -275,7 +316,7 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }*/
} }
} }
} }
......
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ 41e6a293
...@@ -460,7 +460,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -460,7 +460,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
//to update actual quantity in replanishment //to update actual quantity in replanishment
//Test //Test
updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess //Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock
//updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
if(!refSer.trim().equalsIgnoreCase("S-DOC") || !refSer.equalsIgnoreCase("RP-PND") || !refSer.equalsIgnoreCase("RP-PSO"))
{
updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
}
//Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock.end
if(updateRecord > 0) if(updateRecord > 0)
{ {
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo); System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
...@@ -484,6 +490,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -484,6 +490,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
//update actual quantity in repl_order_det.start //update actual quantity in repl_order_det.start
if("".equalsIgnoreCase(replPickOrder)) if("".equalsIgnoreCase(replPickOrder))
{ //to update actual quantity in repanishment { //to update actual quantity in repanishment
//Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock.start
/*
if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO")) if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
{ {
updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
...@@ -491,11 +499,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -491,11 +499,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
else else
{ {
updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,false,conn);//test1sucess updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,false,conn);//test1sucess
} }
if(updateRecord > 0) */
if(!refSer.trim().equalsIgnoreCase("S-DOC") || !refSer.equalsIgnoreCase("RP-PND") || !refSer.equalsIgnoreCase("RP-PSO"))
{ {
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo); updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,false,conn);
} }
//Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock.start
break; break;
} }
...@@ -527,6 +537,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -527,6 +537,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if(dsoInvstat.trim().equalsIgnoreCase(invState.trim())) if(dsoInvstat.trim().equalsIgnoreCase(invState.trim()))
{ {
//to update actual quantity in replanishment //to update actual quantity in replanishment
//Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock.start
/*
if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO")) if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
{ {
updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
...@@ -534,7 +546,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca ...@@ -534,7 +546,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
else else
{ {
updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,false,conn); updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,false,conn);
} }
*/
if(!refSer.trim().equalsIgnoreCase("S-DOC") || !refSer.equalsIgnoreCase("RP-PND") || !refSer.equalsIgnoreCase("RP-PSO"))
{
updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,false,conn);
}
//Changed by Rohan on 03/12/11 not update repanishment in case of stock to dock.end
if(updateRecord > 0) if(updateRecord > 0)
{ {
System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replPickOrder +" and line no :"+replPickLineNo); System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replPickOrder +" and line no :"+replPickLineNo);
......
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