check prono in site_transpoter first

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

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

@@ -181,7 +181,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		boolean isError = false;
 		//Changes by Dadaso pawar on 01/03/15 [start]
 		String tranCodeL = "",adsiFlag = "",proNoFromStr = "",proNoToStr = "",proNoLastStr = "",remainProNoStr = "";
-		int remainProNo = 0; 
+		int remainProNo = 0,siteTranCnt = 0; 
 		DistCommon distCommon = new DistCommon();
 		//Changes by Dadaso pawar on 01/03/15 [END]
 		try
@@ -251,19 +251,36 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			tranCodeL = tranCodeL == null ? "" : tranCodeL.trim();
 			if(tranCodeL.length() > 0)
 			{
-				sql = "SELECT ADSI_FLAG, PRONO_FROM,PRONO_TO,PRONO_LAST FROM TRANSPORTER WHERE TRAN_CODE = ?";
+				sql = "SELECT ADSI_FLAG, PRONO_FROM,PRONO_TO,PRONO_LAST FROM SITE_TRANSPORTER WHERE TRAN_CODE = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranCodeL);
 				rs = pstmt.executeQuery();
 				if(rs.next())
 				{
+					siteTranCnt = 1;
 					adsiFlag = rs.getString("ADSI_FLAG");
 					proNoFromStr = rs.getString("PRONO_FROM");
 					proNoToStr = rs.getString("PRONO_TO");
 					proNoLastStr = rs.getString("PRONO_LAST");
 				}
 				rs.close();rs = null;
-				pstmt.close();pstmt = null;				
+				pstmt.close();pstmt = null;	
+				if(siteTranCnt == 0)
+				{
+					sql = "SELECT ADSI_FLAG, PRONO_FROM,PRONO_TO,PRONO_LAST FROM TRANSPORTER WHERE TRAN_CODE = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, tranCodeL);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{						
+						adsiFlag = rs.getString("ADSI_FLAG");
+						proNoFromStr = rs.getString("PRONO_FROM");
+						proNoToStr = rs.getString("PRONO_TO");
+						proNoLastStr = rs.getString("PRONO_LAST");
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+				}
 				adsiFlag = adsiFlag == null ? "" : adsiFlag.trim();
 				proNoFromStr = proNoFromStr == null ? "" : proNoFromStr.trim();
 				proNoToStr = proNoToStr == null ? "" : proNoToStr.trim();