changed by sankara on 26/06/14 updated DeallocArtConf,ShipmentOCnf,ShipmentIC and messages sql

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95317 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java

@@ -13,7 +13,6 @@ import ibase.webitm.ejb.fin.*;
 
 import java.rmi.RemoteException;
 import java.util.*;
-import java.util.Date;
 import java.text.*;
 import java.sql.*;
 
@@ -2357,6 +2356,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				{
 					if( "DSO".equalsIgnoreCase(invStat) )
 					{
+						boolean isParentUpd = false;
 						sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y',ACTUAL_QTY = 0 WHERE REPL_ORDER = ? AND LINE_NO = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, parentReplOrder);
@@ -2364,6 +2364,17 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						if ( pstmt.executeUpdate() > 0 )
 						{
 							System.out.println(" REPL_ORD_DET updated succesfully ");
+							//changed by sankara on 26/06/14 update cancel mode in repl_ord_det start.
+							sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, parentReplOrder);
+							pstmt.setInt(2, parentReplOrdLine);
+							int replpickcount = pstmt.executeUpdate();
+							if( replpickcount > 0 )
+							{
+								System.out.println("replpickcount["+replpickcount+"]");
+							}
+							//changed by sankara on 26/06/14 update cancel mode in repl_ord_det end.
 						}
 						pstmt.close(); pstmt = null;
 						//changed by sankara on 20/06/14 update status in wave_task_det start.
@@ -2388,6 +2399,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 							pstmt.setString(1, parentReplOrder);				
 							if ( pstmt.executeUpdate() > 0 )
 							{
+								isParentUpd = true;
 								System.out.println(" WAVE_TASK_DET updated succesfully ");
 							}
 							pstmt.close(); pstmt = null;
@@ -2395,10 +2407,23 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						//changed by sankara on 20/06/14 update status in wave_task_det end.
 						//changed by sankara on 03/05/14 update cancel_mode for parent repl order only
 						//sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
+						//changed by sankara on 26/06/14 update status in wave_task_det start.
+						//sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
+						if(isParentUpd)
+						{
+							sql = " UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? ";
+						}
+						else
+						{
 							sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? AND ACTUAL_QTY IS NOT NULL ";
+						}
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, currentReplOrder);
+						//pstmt.setInt(2, replOrderLine);
+						if(!isParentUpd)
+						{
 							pstmt.setInt(2, replOrderLine);
+						}
 						if ( pstmt.executeUpdate() > 0 )
 						{
 							System.out.println(" REPL_ORD_DET updated succesfully ");

webitm-wms/module-resource/sql/update.sql

@@ -45723,6 +45723,64 @@ BEGIN
  RETURN DEALLOCATED;
 END;
 /
+--changed by sankara on 26/06/14 updated messages sql
+INSERT INTO messages (
+	msg_no ,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt ,
+	msg_time ,
+	alarm ,
+	err_source ,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	override_input ,
+	mail_option )
+ VALUES (
+	'VTUNCNFIRM',
+	'Transaction not confirmed',
+	'Transaction not confirmed ',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'Base   ',
+	'Base   ',
+	NULL,
+	NULL);
+INSERT INTO messages (
+ msg_no,
+ msg_str ,
+ msg_descr ,
+ msg_type ,
+ msg_opt ,
+ msg_time ,
+ alarm ,
+ err_source ,
+ chg_date ,
+ chg_user ,
+ chg_term ,
+ override_input ,
+ mail_option )
+VALUES (
+	'VTINVPRONO',
+	'Duplicate Pro Number',
+	'The Pro Number already used for another shipment Transaction.',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'Base',
+	'Base',
+	NULL,
+	NULL);
+commit;