issues in shipment

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

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

@@ -359,8 +359,17 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 							rsSet = null;
 						}
 						
-						sql = " SELECT S.REF_ID, S.REF_SER FROM SHIP_DOCS S,DESPATCH D WHERE "
-							  +" S.SHIPMENT_ID = ? AND D.DESP_ID = S.REF_ID AND D.CONFIRMED = ?";
+						if(!("S-DSP".equalsIgnoreCase(refSer.trim())))
+						{
+							sql = "SELECT REF_ID, REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ? " 
+								+ " AND DESP_CONFIRMED = ?";
+						}
+						else
+						{
+						
+							sql = " SELECT S.REF_ID, S.REF_SER FROM SHIP_DOCS S,DESPATCH D WHERE "
+								  +" S.SHIPMENT_ID = ? AND D.DESP_ID = S.REF_ID AND D.CONFIRMED = ?";
+						}
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, tranId);		
 						pstmt.setString(2, "N");

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

@@ -687,7 +687,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 							}
 							System.out.println("Line no["+lineNo+"]");
 							
-							if(columnValue != null && columnValue.trim().length() > 0)
+							if(columnValue != null && refSer != null && columnValue.trim().length() > 0)
 							{
 								//Changed by sumit on 22/09/12 validation for all reference series start.
 								//sql = "SELECT COUNT(*) from despatch where desp_id = ? and confirmed != 'Y' ";