same source code replace with tag ibase3-webitm-wms22-1-0-29

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

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

@@ -179,11 +179,6 @@ 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" );
@@ -228,9 +223,7 @@ 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 = ?  "; 
-			//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 = ?  ";
+			sql = "SELECT SHIPMENT.CONFIRMED, SHIPMENT.NO_PALLET,SHIPMENT.SEAL_NO,SHIPMENT.DATA_LOGGER_NO FROM SHIPMENT WHERE SHIPMENT.SHIPMENT_ID = ?  ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -241,57 +234,12 @@ 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);

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

@@ -11,13 +11,11 @@ import ibase.utility.CommonConstants;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ITMDBAccessLocal;
 import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
 //changed by sankara on 15/10/13 for clubing multiple ptcn
 import ibase.webitm.utility.wms.CommonWmsUtil;
-
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.Date;
@@ -1055,8 +1053,6 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 						
 						else if ( childNodeName.equalsIgnoreCase("tran_code") )
 						{
-							String adsiFlag = "",proNoFromStr = "",proNoToStr = "",proNoLastStr = "",remainProNoStr = "";
-							int remainProNo = 0;
 							columnValue = genericUtility.getColumnValue("tran_code", dom);
 									// genericUtility.getColumnValue("tran_code", dom);
 							if(columnValue != null && columnValue.trim().length() > 0)
@@ -1079,48 +1075,6 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 								rs = null;
 								pstmt.close();
 								pstmt = null;
-								//Changes by Dadaso pawar on 03/04/15 [Start]
-								DistCommon discommon = new DistCommon();
-								remainProNoStr = checkNull(discommon.getDisparams( "999999", "REMAIN_PRO_NO", conn));
-								System.out.println("remainProNoStr------>>["+remainProNoStr+"]");								
-								sql = "SELECT ADSI_FLAG, PRONO_FROM,PRONO_TO,PRONO_LAST FROM TRANSPORTER WHERE TRAN_CODE = ?";
-								pstmt = conn.prepareStatement(sql);
-								pstmt.setString(1, columnValue);
-								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+"]");
-								if(! "NULLFOUND".equalsIgnoreCase(remainProNoStr))
-								{
-									if(proNoLastStr.length() > 0 && proNoToStr.length() > 0)
-									{
-										remainProNo = Integer.parseInt(remainProNoStr);
-										long proNoTo = Long.parseLong(proNoToStr);
-										long proNoLast = Long.parseLong(proNoLastStr);
-
-										if((proNoTo - proNoLast) < remainProNo)
-										{
-											errCode = "VTFWPRONR";//There are only last few pro nos are remaining
-											errList.add(errCode);
-											errFields.add(childNodeName.toLowerCase());										
-										}
-									}
-
-								}
-								//Changes by Dadaso pawar on 03/04/15 [End]
 							}
 							else
 							{