issues in shipment

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

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

@@ -257,7 +257,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 						pstmt = null;
 						
 						
-						sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3 FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
+						sql = "SELECT CONSIGNEE_NAME,ADDR1,ADDR2,ADDR3,LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, PRO_NO  FROM SHIPMENT WHERE SHIPMENT_ID = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, tranId);
 						rs = pstmt.executeQuery();
@@ -268,6 +268,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 							shipAdd1 = checkNull(rs.getString("ADDR3")).trim();
 							shipAdd2 = checkNull(rs.getString("ADDR2")).trim();
 							shipAdd3 = checkNull(rs.getString("ADDR1")).trim();
+							lorryNo = checkNull(rs.getString("LORRY_NO"));
+							tranCode = checkNull(rs.getString("TRAN_CODE"));
+							lrNo = checkNull(rs.getString("LR_NO"));
+							lrDate = rs.getTimestamp("LR_DATE");
+							proNo = checkNull(rs.getString("PRO_NO"));
 						}
 						
 						if("".equalsIgnoreCase(custName) && custName.trim().length() <= 0)
@@ -879,7 +884,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 									System.out.println(" update sucessfully ");
 								}
 						
-								sql = "SELECT LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, pro_no FROM SHIPMENT WHERE SHIPMENT_ID = ?";
+								/*sql = "SELECT LORRY_NO,TRAN_CODE,LR_NO,LR_DATE, pro_no FROM SHIPMENT WHERE SHIPMENT_ID = ?";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, tranId);
 								rs = pstmt.executeQuery();
@@ -894,7 +899,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 								rs.close();
 								rs = null;
 								pstmt.close();
-								pstmt = null;
+								pstmt = null;*/
 								
 								sql = "UPDATE DESPATCH  SET LORRY_NO = ?, SHIPMENT_ID = ?, TRAN_CODE = ?," 
 									+ " LR_NO  = ?,  LR_DATE = ?, PRO_NO = ? WHERE " 

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

@@ -44196,6 +44196,36 @@ INSERT INTO obj_itemchange(
 	NULL,
 	NULL);
 commit;	
+
+//Pragyan 120913
+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 (
+'VTTRANCDBK',
+'Transporter Code Blank',
+'Transporter Code is Blank,Please enter valid Transporter Code',
+'E',
+'Y',
+NULL,
+NULL,
+NULL,
+TO_DATE('16-08-2013 15:50:24','DD-MM-YYYY HH24:MI:SS'),
+'Base      ',
+'Base           ',
+NULL,
+NULL);
 commit;	
 
  
\ No newline at end of file