cycle count Point no 10 and bug found in pellet merging

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

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

@@ -222,9 +222,16 @@ public class PalletMergeIC extends ValidatorEJB implements PalletMergeICLocal, P
 							else
 							{	
 								 palletNo = genericUtility.getColumnValue("pallet_no__new",dom);
+								 
+								 if("palletmerge".equalsIgnoreCase(objName))
+								 {
 									 //Changed by sumit on 16/11/12 adding status condition 
-								 //sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ?";
+									 sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ?";
+								 }
+								 else
+								 {
 									 sql = "SELECT COUNT(*) AS COUNT FROM PALLET_NO WHERE PALLET_NO = ? AND STATUS = 'A'";
+								 }
 								 System.out.println(" sql sumit ->["+sql+"]");
 								 pstmt = conn.prepareStatement(sql);
 								 pstmt.setString(1,palletNo);

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

@@ -61,6 +61,14 @@ public class PalletMergePos extends ValidatorEJB implements PalletMergePosLocal,
 			pstmt = null;
 			
 			//Changed by sumit on 23/11/12 updated carton_master start.
+			sSQL = "UPDATE REPL_ISS_HDR SET CARTON_NO = ?  WHERE CARTON_NO = ? ";
+			pstmt = conn.prepareStatement(sSQL);
+			pstmt.setString(1, palletNoNew);
+			pstmt.setString(2, palletNo);
+			pstmt.executeUpdate();	
+			pstmt.close();
+			pstmt = null;
+			
 			sSQL = "UPDATE CARTON_MASTER SET PALLET_NO = ?  WHERE PALLET_NO = ? ";
 			pstmt = conn.prepareStatement(sSQL);
 			pstmt.setString(1, palletNoNew);

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

+/********************************************************
+	Title : ScheduleLocationICLocal
+	Date  : 23/11/12
+	Developer: Kunal Mandhre
+
+********************************************************/
+package ibase.webitm.ejb.wms;
+import java.rmi.RemoteException;
+import org.w3c.dom.*;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import javax.ejb.Local;
+@Local
+public interface ScheduleLocationICLocal extends ValidatorLocal
+{
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+}

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

+/********************************************************
+	Title : ScheduleLocationICRemote
+	Date  : 23/11/12
+	Developer: Kunal Mandhre
+
+********************************************************/
+package ibase.webitm.ejb.wms;
+import java.rmi.RemoteException;
+import org.w3c.dom.*;
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import javax.ejb.Remote; 
+@Remote 
+public interface ScheduleLocationICRemote extends ValidatorRemote
+{
+	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+	public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
+}

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

@@ -36020,7 +36020,7 @@ INSERT INTO POPHELP (
   
 commit;
 
-//Changed by Rohan on 26-11-12 for active pick split
+//---------Changed by Rohan on 26-11-12 for active pick split
 INSERT INTO DISPARM (
 	prd_code,
 	var_name,
@@ -36041,3 +36041,255 @@ INSERT INTO DISPARM (
 	fn_sysdate(),
 	'Rohan     ',
 	'Base ');
+	
+	
+//---------Changed by Kunal Cycle Count 28-11-12
+INSERT INTO ITM2MENU 
+(
+	APPLICATION,
+	LEVEL_1,
+	LEVEL_2,
+	LEVEL_3,
+	LEVEL_4,
+	LEVEL_5,
+	WIN_NAME,
+	DESCR,
+	COMMENTS,
+	MENU_PATH,
+	ICON_PATH,
+	OBJ_TYPE,
+	CHG_USER,
+	CHG_TERM,
+	CHG_DATE
+	
+)VALUES (
+	'WMS',
+	1,51,0,0,0,
+	'w_schedule_location',
+	'Schedule Location(Manually)',
+	null,
+	'WMS.1.51.0.0.0',
+	'e12_logo.gif',
+	null,
+	'kunal',
+	'kunal',
+	sysdate
+	
+);
+
+INSERT INTO TRANSETUP
+(TRAN_WINDOW,SAVE_FLAG,VAL_FLAG,KEY_FLAG,KEY_STRING,CHG_DATE,CHG_USER,CHG_TERM,
+ EDI_OPTION,CONFIRM_COL,CONFIRM_VAL,REPEAT_ADD_DET,LEDG_POST_CONF,TRAN_ID_COL,
+ CONFIRM_MODE,MAIL_OPTION,TABLE_NAME,APPLICATION,REF_SER,VIEW_MODE) 
+VALUES 
+('w_schedule_location','2','2','A','seq10',sysdate,'kunal','BASE',
+ '0','','','Y','N','tran_id',
+ '0','0','physcan','WMS','PSCAN','F');	
+
+
+INSERT INTO OBJ_FORMS 
+(	WIN_NAME,
+	TITLE,
+	OBJ_BROW_NAME,
+	OBJ_EDIT_NAME,
+	CROSS_UPDATE_EXPR,
+	EXPR_FLD_INFO,
+	TARGET_FLD_INFO,
+	EXPR_COMMENT,
+	FORM_NO
+	
+) values (
+	'w_schedule_location',
+	'Header',
+	'schedule_location11',
+	'schedule_location21',
+	null,
+	null,
+	null,
+	null,
+	'1'
+	
+);
+
+
+INSERT INTO OBJ_FORMS 
+(	WIN_NAME,
+	TITLE,
+	OBJ_BROW_NAME,
+	OBJ_EDIT_NAME,
+	CROSS_UPDATE_EXPR,
+	EXPR_FLD_INFO,
+	TARGET_FLD_INFO,
+	EXPR_COMMENT,
+	FORM_NO
+	
+) values (
+	'w_schedule_location',
+	'Detail',
+	'schedule_location12',
+	'schedule_location22',
+	null,
+	null,
+	null,
+	null,
+	'2'
+	
+);
+
+
+
+	
+INSERT INTO OBJ_ACTIONS 
+(
+	OBJ_NAME ,
+	LINE_NO,
+	RIGHTS_CHAR,
+	INTERACTIVE, 
+	SERVICE_CODE, 
+	DESCRIPTION, 
+	TITLE, 
+	IMAGE, 
+	FORM_NO, 
+	SERVICE_HANDLER,
+	PLACEMENT,
+	ACTION_TYPE,	
+	TRAN_TYPE
+) VALUES (
+	'schedule_location',
+	'1',
+	'E',
+	'a',
+	'a',
+	'Editing Existing Record',
+	'Edit',
+	'edit.gif',
+	'1',
+	NULL,
+	NULL,
+	'S',
+	NULL
+);
+	
+
+	
+
+
+INSERT INTO SYSTEM_EVENTS
+(
+	OBJ_NAME,
+	EVENT_CODE,
+	EVENT_CONTEXT,
+	SERVICE_CODE,
+	METHOD_RULE,
+	CHG_DATE,
+	CHG_USER,
+	CHG_TERM,
+	RESULT_HANDLE,
+	OVERWRITE_CORE,
+	COMP_TYPE,
+	COMP_NAME,
+	COMM_FORMAT
+) VALUES (
+	'schedule_location',
+	'pre_validate',
+	'1',
+	'prv_default_ejb',
+	null,
+	sysdate,
+	'Kunal',
+	'Kunal',
+	'2',
+	'0',
+	'EJB',
+	'ScheduleLocationIC',
+	NULL
+);
+
+
+INSERT INTO SYSTEM_EVENTS
+(	
+	OBJ_NAME,
+	EVENT_CODE,
+	EVENT_CONTEXT,
+	SERVICE_CODE,
+	METHOD_RULE,
+	CHG_DATE,
+	CHG_USER,
+	CHG_TERM,
+	RESULT_HANDLE,
+	OVERWRITE_CORE,
+	COMP_TYPE,
+	COMP_NAME,
+	COMM_FORMAT
+) VALUES (
+	'schedule_location',
+	'post_item_change',
+	'1',
+	'poic_default_ejb',
+	null,
+	sysdate,
+	'Mangesh',
+	'Mangesh',
+	'2',
+	'0',
+	'EJB',
+	'ScheduleLocationIC',
+	NULL
+);
+
+insert into obj_itemchange (obj_name,FIELD_NAME,form_no) values ('schedule_location','itm_default',2);
+insert into obj_itemchange (obj_name,FIELD_NAME,form_no) values ('schedule_location','loc_code',2);
+
+
+update messages set msg_type = 'E' ,msg_opt = 'Y' where msg_no = 'VMLOC6' ;
+update messages set msg_type = 'E' ,msg_opt = 'Y' where msg_no = 'VMLOC4' ;
+
+INSERT INTO messages(
+	msg_no,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt 
+	)
+ VALUES (
+	'VMIDATA3',
+	'Invalid Location Code',
+	'Data for the specified Location Code  not found.',
+	'E',
+	'Y'
+	);
+
+INSERT INTO messages(
+	msg_no,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt 
+	)
+ VALUES (
+	'VMDEL1',
+	'Can not Delete Record',
+	'Can not Delete Schedular generated record. ',
+	'E',
+	'Y'
+	);
+
+
+
+alter table physcandet
+add tran_type char(1);
+
+--added by akhilesh on 28/nov/12 for audit trail
+Insert into obj_actions
+(OBJ_NAME,LINE_NO,IMAGE,DESCRIPTION,SERVICE_CODE,INTERACTIVE,RIGHTS_CHAR,TITLE,FORM_NO,SERVICE_HANDLER,PLACEMENT,ACTION_TYPE,TRAN_TYPE,CHG_DATE,CHG_TERM,CHG_USER)
+values ('schedule_location',21,'menu.bmp','View AuditTrail','audit_trail','1','X','View Audit','1','1','1','U',null,null,null,null);
+
+update  transetup set audit_trail_opt ='1' where tran_window = 'w_schedule_location' ;
+
+Insert into SYSTEM_EVENTS(OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT) 
+values ('schedule_location','audit_trail','1','project_audit_trail',null,'0',sysdate,'d','Base45','2',null,null,null);
+
+commit;
+
+
+