1.If busiType parameter is not null then only validate for tax env for business process logic.

2.Local method(gfCheckTaxenvStatus()) is commented and called common method(getCheckTaxEnvStatus()) from distcommon.

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

webitm-dis/src/ibase/webitm/ejb/dis/DistCommon.java

@@ -8315,11 +8315,10 @@ public class DistCommon {
 						}
 						// added on 28-feb-2019 by  nandkumar gadkari -if environment is still not found check on the basis of country code---end----------------
 						
-			//Commented by Pavan R [for tax env getting blank] 
-			/*String errorString = getCheckTaxEnvStatus(taxEnv, currDateTs,"", conn);
+			String errorString = getCheckTaxEnvStatus(taxEnv, currDateTs,"", conn);
 			if (errorString != null && errorString.trim().length() > 0) {
 				taxEnv = "";
-			}*/
+			}
 			sql = " select tax_env_prefix  from site where site_code= ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, siteCodeShip);
@@ -8416,6 +8415,8 @@ public class DistCommon {
 					return errorResturn;  //Pavan R 31aug19 start
 				}
 				//Pavan R 31aug19 start[to validate tax environment in all transaction]
+				if(busiType != null && busiType.trim().length() > 0)//Pavan R 18oct19 end[to ignore valdaiton if type is null]
+				{
 					sql = "select busi_proc_use from taxenv where tax_env = ? ";			
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, taxEnv);
@@ -8440,6 +8441,7 @@ public class DistCommon {
 						errorResturn = "VTTAXENVVL";
 						return errorResturn;
 					}
+				}// end of if(busiType != null)
 				//Pavan R 31aug19 end[to validate tax environment in all transaction]
 			} catch (Exception e) {
 				e.printStackTrace();

webitm-dis/src/ibase/webitm/ejb/dis/SalesOrderIC.java

@@ -746,7 +746,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							} else {
 								//Pavan R 17sept19 start[to validate tax environment]
 								//errCode = gfCheckTaxenvStatus(taxEnv, orderDate, conn);															
-								errCode = gfCheckTaxenvStatus(taxEnv, orderDate, "S", conn);
+								//errCode = gfCheckTaxenvStatus(taxEnv, orderDate, "S", conn);
+								errCode = distCommon.getCheckTaxEnvStatus(taxEnv, orderDate, "S", conn);
 								//Pavan R 17sept19 end[to validate tax environment]
 								if (errCode != null && errCode.trim().length() > 0) {
 									errList.add(errCode);
@@ -3773,7 +3774,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							{
 								//Pavan R 17sept19 start[to validate tax environment]
 								//errCode = gfCheckTaxenvStatus(taxEnv, orderDate, conn);
-								errCode = gfCheckTaxenvStatus(taxEnv, orderDate, "S", conn);
+								//errCode = gfCheckTaxenvStatus(taxEnv, orderDate, "S", conn);
+								errCode = distCommon.getCheckTaxEnvStatus(taxEnv, orderDate, "S", conn);
 								//Pavan R 17sept19 end[to validate tax environment]
 								if (errCode != null && errCode.trim().length() > 0) {
 									errList.add(errCode);
@@ -4438,7 +4440,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 	}
 
-	private String gfCheckTaxenvStatus(String taxEnv, Timestamp orderDate, String busiType, Connection conn) throws ITMException {
+	//Commented by Pavan R 18oct19 start [to called common method from distcommon]
+	/*private String gfCheckTaxenvStatus(String taxEnv, Timestamp orderDate, String busiType, Connection conn) throws ITMException {
 		// TODO Auto-generated method stub
 		String errorCode = "", sql = "", lsStatus = "", busiProcUse="";
 		PreparedStatement pstmt = null;
@@ -4495,7 +4498,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 		}
 
 		return errorCode;
-	}
+	}*/
+	//Commented by Pavan R 18oct19 start [to called common method from distcommon]
 
 	private String gbfScItemQtyVal(String itemCode, String contractNo, Connection conn) throws ITMException {
 		// TODO Auto-generated method stub