changed by shankara on date 16-08-13 for tran code validation in case of manual shipment

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

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

@@ -184,7 +184,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			conn = connDriver.getConnectDB( "DriverITM" );
 			String userID = genericUtility.getValueFromXTRA_PARAMS( xtraParam, "LoginCode" );
 			//Changed by sumit on 28/09/12 checking whether shipment is already confirmed or not start.
-			System.out.println(" forced flag ["+forcedFlag+"]");
+			System.out.println(" forced flag:::>>>>:: ["+forcedFlag+"]");
 			ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
 			//Changed by Rohan on 30-07-13 for non inventory manual shipment
 			/*
@@ -318,18 +318,19 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 						rs = pstmt.executeQuery();
 						if( rs.next() )
 						{
-							lorryNo = rs.getString(1);
-							tranCode = rs.getString(2);
-							lrNo = rs.getString(3);
+							lorryNo = checkNull(rs.getString(1));
+							tranCode = checkNull(rs.getString(2));
+							lrNo = checkNull(rs.getString(3));
 							lrDate = rs.getTimestamp(4);
-							proNo = rs.getString(5);
+							proNo = checkNull(rs.getString(5));
 						}
 						rs.close();
 						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 )
+						//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.trim()) || tranCode == null) && tranCode.trim().length() <= 0 )
 						{
 							errString = itmDBAccessLocal.getErrorString("","VTTRANCDBK","");
 							return errString;