Changed by shankara on 16-08-13 for validation of trancose in shipment for manual shipment

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

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

@@ -284,7 +284,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-					}	
+					
+					}
+					
 					//Changed by Rohan on 31-07-13 for checking status of pallet No.end
 					sql = "SELECT COUNT(*) as COUNT FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ?";
 					pstmt = conn.prepareStatement(sql);
@@ -326,7 +328,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-			
+						//changed by sankara on 16/08/13 tran code is blank in shipment header in case of manual shipment.start.		
+						if(("".equalsIgnoreCase(refSer.trim())) || ("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) ) && ( "".equalsIgnoreCase(tranCode) || tranCode == null) && tranCode.trim().length() <= 0 )
+						{
+							errString = itmDBAccessLocal.getErrorString("","VTTRANCDBK","");
+							return errString;
+						}	
+					   //changed by sankara on 16/08/13 tran code is blank in shipment header in case of manual shipment.end.	
 						//Changed by sumit on 28/09/12 wrong sql
 						//sql = "SELECT PRONO_LASTe FROM transporter WHERE tran_code = ? ";
 						//sql = "SELECT PRONO_LAST FROM transporter WHERE tran_code = ? ";
@@ -1804,6 +1812,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 				pstmt1.setString(1, "N");
 				pstmt1.setString(2, error.get("description").toString());
 				pstmt1.setString(3, refId);
+				//Changed by shankra on 16/08/13
+				pstmt1.executeUpdate();
+				
 			 }
 			 else
 			 {
@@ -1827,12 +1838,18 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 					pstmt1.setString(1, "Y");
 					pstmt1.setString(2, "");
 					pstmt1.setString(3, refId);
+					//Changed by shankra on 16/08/13
+					pstmt1.executeUpdate();
 				 }
 			 }
-			pstmt1.executeUpdate();
-			pstmt1.close();
-			pstmt1 = null;
-			conn.commit();
+			 //Changed by shankra on 16/08/13
+			//pstmt1.executeUpdate();
+			 if(pstmt1 != null)
+			 {		 
+				 pstmt1.close();
+				 pstmt1 = null;
+			 }	 
+			 conn.commit();
 		}
 		catch( Exception e)
 		{