Removed the first condition of tax_env and tax_class in itemchange of supp_code column

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

webitm-dis/ibase/webitm/ejb/dis/POrderIC.java

@@ -6441,10 +6441,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 							"station_stan_code", dom);
 
 
-					//Changes by mayur on 16-May-2018---[start]
-					if(taxclassDes == null || taxclassDes.trim().length() == 0 )
-					{			
-					sql = "select tax_class from site_supplier where site_code = ?" //checking tax_class in site_supplier table
+					//Changes by mayur on 16-May-2018---[start]		
+					sql = "select tax_class from site_supplier where site_code = ?" 
 							+" and supp_code = ? ";
 					
 					System.out.println("SQL::"+sql);
@@ -6456,19 +6454,17 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 					{
 						taxclassDes = rs.getString("tax_class") == null ? "" : rs
 								 .getString("tax_class");
-					//	taxclassDes = taxClassSiteSupp;
-						System.out.println("@@taxClassSiteSupp in site_supplier@@"+taxclassDes);			
+						System.out.println("@@taxclassDes in site_supplier@@"+taxclassDes);			
 		
 					}
 					rs.close();
 					rs = null;
 					pStmt.close();
 					pStmt = null;
-					}
 										
 					if(taxclassDes == null || taxclassDes.trim().length() ==  0)
 					{
-						sql = "select tax_class from supplier where supp_code = ? "; //checking tax_class in supplier table
+						sql = "select tax_class from supplier where supp_code = ? "; 
 						
 						System.out.println("SQL::"+sql);
 						pStmt = conn.prepareStatement(sql);
@@ -6478,8 +6474,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						{
 							taxclassDes = rs.getString("tax_class") == null ? "" : rs
 									.getString("tax_class");
-							//taxclassDes = taxClassSupplier;
-							System.out.println("@@taxClassSupplier in supplier@@"+taxclassDes);
+							System.out.println("@@taxclassDes in supplier@@"+taxclassDes);
 					
 						}
 						rs.close();
@@ -6487,10 +6482,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						pStmt.close();
 						pStmt = null;
 					}
-										
-					if(taxenvDes == null || taxenvDes.trim().length() ==  0)
-					{		
-					sql = "select tax_env from site_supplier where site_code = ?" //checking tax_env in site_supplier table
+		
+					sql = "select tax_env from site_supplier where site_code = ?" 
 							+" and supp_code = ? ";
 					
 					System.out.println("SQL::"+sql);
@@ -6502,8 +6495,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 					{
 						taxenvDes= rs.getString("tax_env") == null ? "" : rs
 								.getString("tax_env");
-						//taxenvDes = taxEnvSiteSupp;
-						System.out.println("@@taxEnvSiteSupp in site_supplier@@"+taxenvDes);
+						System.out.println("@@taxenvDes in site_supplier@@"+taxenvDes);
 			
 		
 					}
@@ -6511,11 +6503,10 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 					rs = null;
 					pStmt.close();
 					pStmt = null;
-					}
 									
 					if(taxenvDes == null || taxenvDes.trim().length() ==  0)
 					{
-						sql = "select tax_env from supplier where supp_code = ? "; //checking tax_class in supplier table
+						sql = "select tax_env from supplier where supp_code = ? "; 
 						
 						System.out.println("SQL::"+sql);
 						pStmt = conn.prepareStatement(sql);
@@ -6525,9 +6516,8 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
 						{
 
 							taxenvDes = rs.getString("tax_env") == null ? "" : rs
-								.getString("tax_env");
-							//taxenvDes = taxEnvSupplier;			
-							System.out.println("@@taxEnvSupplier in supplier@@"+taxenvDes);
+								.getString("tax_env");			
+							System.out.println("@@taxenvDes in supplier@@"+taxenvDes);
 					
 						}
 						rs.close();