Validation for pro no.

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

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

@@ -179,6 +179,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		String siteCodeShip = "";
 		boolean isSiteTransporterexist = true;
 		boolean isError = false;
+		//Changes by Dadaso pawar on 01/03/15 [start]
+		String tranCodeL = "",adsiFlag = "",proNoFromStr = "",proNoToStr = "",proNoLastStr = "",remainProNoStr = "";
+		int remainProNo = 0; 
+		DistCommon distCommon = new DistCommon();
+		//Changes by Dadaso pawar on 01/03/15 [END]
 		try
 		{
 			conn = connDriver.getConnectDB( "DriverITM" );
@@ -223,7 +228,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			
 			//Changed By Pragyan 29/DEC/14 To get seal no and data logger no
 			//sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ?  "; 
-			sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET,SHIPMENT.SEAL_NO,SHIPMENT.DATA_LOGGER_NO FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ?  ";
+			//Changes and commented by Dadaso pawar on 01/03/15 [start]
+			//sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET,SHIPMENT.SEAL_NO,SHIPMENT.DATA_LOGGER_NO FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ?  ";
+			sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET,SHIPMENT.SEAL_NO,SHIPMENT.DATA_LOGGER_NO,SHIPMENT.TRAN_CODE FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ?  ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -234,12 +241,57 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 				//Changed By Pragyan 29/DEC/14 To get seal no and data logger no
 				sealNo = checkNull(rs.getString("SEAL_NO"));
 				dataLoggerNo = checkNull(rs.getString("DATA_LOGGER_NO"));
-				
+				tranCodeL = checkNull(rs.getString("TRAN_CODE"));
 			}
 			
 			rs.close();rs = null;
 			pstmt.close();pstmt = null;
 			
+			System.out.println("tranCodeL--------->>["+tranCodeL+"]");
+			tranCodeL = tranCodeL == null ? "" : tranCodeL.trim();
+			if(tranCodeL.length() > 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();
+				proNoLastStr = proNoLastStr == null ? "" : proNoLastStr.trim();
+				
+				System.out.println("adsiFlag----->["+adsiFlag+"] proNoFromStr--->["+proNoFromStr+"]");
+				System.out.println("proNoToStr--->["+proNoToStr+"] proNoLastStr--->["+proNoLastStr+"]");
+				remainProNoStr = checkNull(distCommon.getDisparams( "999999", "REMAIN_PRO_NO", conn));
+				System.out.println("remainProNoStr--------->>["+remainProNoStr+"]");				
+				if("N".equalsIgnoreCase(adsiFlag))
+				{
+					if(proNoFromStr.length() > 0 && proNoToStr.length() > 0)
+					{
+						long proNoTo = Long.parseLong(proNoToStr);
+						if(proNoLastStr.length() == 0)
+						{
+							proNoLastStr = "0";
+						}
+						long proNoLast = Long.parseLong(proNoLastStr);						
+						if(proNoLast > proNoTo)
+						{
+							errString = itmDBAccessLocal.getErrorString("","VTPRONOE","");
+							return errString;
+						}
+					}
+				}
+			}
+			//Changes and commented by Dadaso pawar on 01/03/15 [End]
 			sql = "SELECT REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ?  "; 
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);