add ptcn in despatch and mannual shipment

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

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

@@ -690,8 +690,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 													pkg2.setHazmatFlag(false);
 													pkg2.setCODReturnAddress(addr);//As per Taro not required
 													comInfo = new CommodityInfo();
-													
-													comInfo.setDescription("");//As per taro Harmonization description
+													//Change according 09-OCT-13 to Ashish/Stepehn for ItemDescription
+													//comInfo.setDescription("");//As per taro Harmonization description
+													comInfo.setDescription(itemDescr);//As per taro Harmonization description
 													comInfo.setQuantity(noArt);
 													comInfo.setHarmonizedCode("");//As per Taro Haromonization code
 													if(unitValue > 0)

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

@@ -6782,7 +6782,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						if (errString == null || errString.trim().length() == 0)
 						{
 							String dspRefId = updateWaveTaskDet(waveId,4,saleOrder,"","",ptcnID,conn);
-							errString = updateShipment(headerDom, detailDom,waveId,saleOrder,dspRefId,tranCode,transMode, xtraParams, conn);
+							errString = updateShipment(headerDom, detailDom,waveId,ptcnID,saleOrder,dspRefId,tranCode,transMode, xtraParams, conn);
 							
 						}
 						else
@@ -14029,8 +14029,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	}
 	//Changed by sumit sarkar on 28/08/2011 [ WM1ESUN006 ] update pack_hdr & pack_det table end.
 	
+	//Changed by Pragyan To add PTCN 09-OCT-13 
 	//Changed by sumit sarkar on 8/18/2011 [ WM1ESUN006 ] update despatch table start.
-	private String updateShipment(Document headerDom, Document detailDom,String waveID,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
+	//private String updateShipment(Document headerDom, Document detailDom,String waveID,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
+	private String updateShipment(Document headerDom, Document detailDom,String waveID,String PTCN,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
 	{
 			String errString = "";			
 			String insertSql = "";			
@@ -14169,8 +14171,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						+ " CUST_CODE, CUST_CODE__DLV, DLV_ADD1, DLV_ADD2, COUNT_CODE__DLV, "
 						+ " TRANS_MODE, STAN_CODE, CONFIRMED, STATUS, CHG_USER, CHG_DATE, CHG_TERM,"
 						+ " DLV_ADD3, STATE_CODE__DLV, EXCH_RATE, WAVE_ID, EFF_DATE, DLV_CITY, DLV_PIN, TRAN_CODE, "
-						+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO )"
-						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+						/*+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO )"
+						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
+						+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO,PTCN )"
+						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				//End changes by gulzar on 12/28/2011
 				
 				pstmt = conn.prepareStatement(insertSql);
@@ -14196,6 +14200,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				System.out.println("dlv add3 "+dlvAdd3);
 				System.out.println("state code dlv "+stateCodeDlv);
 				System.out.println("exch rate "+exchRate);
+				System.out.println("PTCN "+PTCN);
 				
 				pstmt.setString(1,refId);
 				pstmt.setTimestamp(2, currDate1);
@@ -14235,6 +14240,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt.setString(32,currCode);
 				//Changed By Pragyan according to manohran sir as in future it will change .
 				pstmt.setString(33,"G");
+				pstmt.setString(34,PTCN);
 				//End changes by gulzar on 12/28/2011
 				
 				pstmt.executeUpdate();

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

@@ -42585,7 +42585,7 @@ VALUES (
 	NULL,
 	NULL);		
 	
-	CREATE OR REPLACE TRIGGER TRIG_WAVE_STAT_ORG
+CREATE OR REPLACE TRIGGER TRIG_WAVE_STAT_ORG
 AFTER UPDATE OF tran_code ON DESPATCH
 FOR EACH ROW WHEN (new.tran_code <> old.tran_code)
 BEGIN
@@ -44536,4 +44536,34 @@ VALUES (
 	'BASE  ',
 	NULL,
 	NULL);
+//chnged by Pragyan 09-OCT-13 to add ptcn in despatch detail	
+alter table despatch add ptcn char(10);
+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 (
+        'VTDIFFTRAN',
+        'Invalid PTCN',
+        'Cannot club multiple PTCN of different Transporters',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('9-10-2013 06:53:35','DD-MM-YYYY HH24:MI:SS'),
+        'TARO      ',
+        'jbnitashishm   ',
+        NULL,
+        NULL);
 commit;
\ No newline at end of file