added validation required field on cpd and sales quotation amd

Saburi/13Mar-Sales_quot_amd/java/SalesQuotationAmdIC.java

@@ -87,7 +87,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 		int cnt = 0;
 		String siteCode = "" , modName = "";
 		String custCode="",currCode="",empCodeConf="",itemCode="",unit="",unitRate="",crTerm="",dlvTerm="",packCode="";
-		String taxClass="",taxChap="",taxEnv="";
+		String taxClass="",taxChap="",taxEnv="", quotNo="";
 		Timestamp quotDate = null;
 		SimpleDateFormat dateFormat = null;
 		UtilMethods utilMethods = new UtilMethods();
@@ -124,11 +124,50 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 					childNode = childList.item(ctr);
 					childNodeName = childNode.getNodeName();
 					BaseLogger.log("3", getUserInfo(), null,  "Inside childNodeName ***********"+childNodeName);
-					if(childNodeName.equalsIgnoreCase("cust_code"))
+					if(childNodeName.equalsIgnoreCase("quot_no"))
+					{
+						quotNo = genericUtility.getColumnValue("quot_no", dom);
+						BaseLogger.log("3", getUserInfo(), null,  "quotNo ["+quotNo+"]");
+						if(quotNo == null || quotNo.trim().length() == 0)
+						{
+							errCode="VTINVQNO";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
+						}
+						else
+						{
+							sql="SELECT COUNT(*) FROM SALES_QUOT WHERE QUOT_NO = ? AND CONFIRMED = 'Y'";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, quotNo);
+							rs = pstmt.executeQuery();
+							if(rs.next())
+							{
+								cnt = rs.getInt(1);
+							}
+							if(rs != null)
+							{
+								rs.close();
+								rs = null;
+							}
+							if(pstmt != null)
+							{
+								pstmt.close();
+								pstmt = null;
+							}
+
+							if(cnt==0)
+							{
+								errCode="VTINVQNO";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}
+					}
+					else if(childNodeName.equalsIgnoreCase("cust_code"))
 					{
 						custCode = genericUtility.getColumnValue("cust_code", dom);
 
-						BaseLogger.log("3", getUserInfo(), null,  "custCode ["+custCode+"]");
+						BaseLogger.log("3", getUserInfo(), null,  "custCode<<<< ["+custCode+"]");
 						if(custCode == null || custCode.trim().length() == 0)
 						{
 							errCode="VMCUSTCD1";
@@ -203,27 +242,31 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							}
 						}
 					}
-					else if (childNodeName.equalsIgnoreCase("emp_code__conf")) {
+					else if (childNodeName.equalsIgnoreCase("emp_code__conf"))
+					{
 						empCodeConf = genericUtility.getColumnValue("em_code__conf", dom);
-
-						if (empCodeConf != null && empCodeConf.trim().length() > 0) {
+						if (empCodeConf != null && empCodeConf.trim().length() > 0) 
+						{
 							sql = "select count(*) from employee where emp_code=? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, empCodeConf);
 							rs = pstmt.executeQuery();
-							if (rs.next()) {
+							if (rs.next()) 
+							{
 								cnt = rs.getInt(1);
 							}
-							if (rs != null) {
+							if (rs != null) 
+							{
 								rs.close();
 								rs = null;
 							}
-							if (pstmt != null) {
+							if (pstmt != null) 
+							{
 								pstmt.close();
 								pstmt = null;
 							}
-
-							if (cnt == 0) {
+							if (cnt == 0) 
+							{
 								errCode = "VMEMP1";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
@@ -357,29 +400,35 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							}
 						}
 					}
-					else if (childNodeName.equalsIgnoreCase("oppr_id")) {
+					else if (childNodeName.equalsIgnoreCase("oppr_id")) 
+					{
 						opprId = genericUtility.getColumnValue("oppr_id", dom);
 						BaseLogger.log("3", getUserInfo(), null,  "opprId 362 ["+opprId+"]");
 						
 
-						if (opprId != null && opprId.trim().length() > 0) {
+						if (opprId != null && opprId.trim().length() > 0) 
+						{
 							sql = "select count(*) from opportunity where oppr_id= ? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, opprId);
 							rs = pstmt.executeQuery();
-							if (rs.next()) {
+							if (rs.next()) 
+							{
 								cnt = rs.getInt(1);
 							}
-							if (rs != null) {
+							if (rs != null) 
+							{
 								rs.close();
 								rs = null;
 							}
-							if (pstmt != null) {
+							if (pstmt != null) 
+							{
 								pstmt.close();
 								pstmt = null;
 							}
 
-							if (cnt == 0) {
+							if (cnt == 0) 
+							{
 								errCode = "VTOPPRID";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
@@ -389,11 +438,14 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 					//Added By Sakshi P on 29/Oct/2025
 				
 					// tax_class
-					else if (childNodeName.equalsIgnoreCase("tax_class")) {
+					else if (childNodeName.equalsIgnoreCase("tax_class")) 
+					{
 						taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
 						BaseLogger.log("3", getUserInfo(), null,  "taxClass: " + taxClass);
-						if (taxClass.trim().length() != 0) {
-							if (!(isExist(conn, "taxclass", "tax_class", taxClass))) {
+						if (taxClass.trim().length() != 0) 
+						{
+							if (!(isExist(conn, "taxclass", "tax_class", taxClass))) 
+							{
 								errCode = "VTTCLASS1";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
@@ -402,11 +454,14 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 						}
 					}
 					// tax_chap
-					else if (childNodeName.equalsIgnoreCase("tax_chap")) {
+					else if (childNodeName.equalsIgnoreCase("tax_chap")) 
+					{
 						taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
 						BaseLogger.log("3", getUserInfo(), null,  "taxChap: " + taxChap);
-						if (taxChap.trim().length() > 0) {
-							if (!(isExist(conn, "taxchap", "tax_chap", taxChap))) {
+						if (taxChap.trim().length() > 0) 
+						{
+							if (!(isExist(conn, "taxchap", "tax_chap", taxChap))) 
+							{
 								errCode = "VTTCHAP1";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
@@ -415,15 +470,29 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 						}
 					}
 					// tax_env
-					else if (childNodeName.equalsIgnoreCase("tax_env")) {
+					else if (childNodeName.equalsIgnoreCase("tax_env")) 
+					{
 						taxEnv = checkNull(genericUtility.getColumnValue("tax_env", dom));
-						quotDate = Timestamp.valueOf(
-								genericUtility.getValidDateString(genericUtility.getColumnValue("quot_date", dom),
-										genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
-								+ " 00:00:00.0");
+						String quotDateStr = genericUtility.getColumnValue("quot_date", dom);
+						if(quotDateStr != null && quotDateStr.trim().length() > 0)
+						{
+						    quotDate = Timestamp.valueOf(
+						        genericUtility.getValidDateString(
+						            quotDateStr,
+						            genericUtility.getApplDateFormat(),
+						            genericUtility.getDBDateFormat()
+						        ) + " 00:00:00.0"
+						    );
+						}
+						else
+						{
+						    quotDate = null; // or handle default value
+						}
 
-						if (taxEnv.trim().length() != 0) {
-							if (!(isExist(conn, "taxenv", "tax_env", taxEnv))) {
+						if (taxEnv.trim().length() != 0) 
+						{
+							if (!(isExist(conn, "taxenv", "tax_env", taxEnv))) 
+							{
 								errCode = "VTTENV1";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
@@ -1111,37 +1180,6 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 
 					quotNo = checkNull(genericUtility.getColumnValue("quot_no", dom));
 					BaseLogger.log("3", getUserInfo(), null, "INSIDE IC quot_no .... "+quotNo);
-					if(currentColumn.equalsIgnoreCase("quot_no"))
-					{
-					    if(quotNo.length() > 0)
-					    {
-					    	String sqlObj = "SELECT COUNT(*) FROM SALES_QUOT WHERE QUOT_NO = ? AND CONFIRMED = 'Y'";
-					        pstmt = conn.prepareStatement(sqlObj);
-					        pstmt.setString(1, quotNo);
-					        rs = pstmt.executeQuery();
-
-					        int count = 0;
-					        if(rs.next())
-					        {
-					            count = rs.getInt(1);
-					        }
-
-					        if(count == 0)
-					        {
-					            String errCode = "VTINVQNO";
-					            errString = itmDBAccessEJB.getErrorString("", errCode, "", "", conn);
-
-					            if(rs != null) { rs.close(); rs = null; }
-					            if(pstmt != null) { pstmt.close(); pstmt = null; }
-
-					            return errString;
-					        }
-
-					        if(rs != null) { rs.close(); rs = null; }
-					        if(pstmt != null) { pstmt.close(); pstmt = null; }
-					    }
-					}
-
 					if(currentColumn.equalsIgnoreCase("quot_no") && quotNo.length() > 0)
 					{
 						sql = " select quot_date, quot_type, cust_code, inq_date, inq_source, valid_upto, " +
@@ -1159,7 +1197,7 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 							quotDateTs = rs.getTimestamp("quot_date");
 							quotType = checkNull(rs.getString("quot_type"));
 							custCode = checkNull(rs.getString("cust_code"));
-							inqDateTs = rs.getTimestamp("inq_date");
+							inqDateTs = checkNull(rs.getTimestamp("inq_date"));
 							inqSource = checkNull(rs.getString("inq_source"));
 							validUptoTs = rs.getTimestamp("valid_upto");
 							empCodeConf1 = checkNull(rs.getString("emp_code__conf"));
@@ -1904,6 +1942,10 @@ public class SalesQuotationAmdIC extends ValidatorEJB implements ValidatorLocal,
 
 
 
+	private Timestamp checkNull(Timestamp timestamp) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	public String checkNull(String inputStr) throws ITMException
 	{
 		try

Saburi/13Mar-Sales_quot_amd/sql/sales_quot_amd.sql

@@ -238,3 +238,22 @@ Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,AR
 Insert into messages (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values 
 ('VTINVQNO ','Invalid Quotation Number','Please Enter Valid Quotation Number','E','Y',null,null,null,to_date('25-03-26','DD-MM-RR'),'System    ','System',null,null);
 
+--17 March 2026
+Insert into SYSTEM_EVENTS (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT,FIELD_NAME,FORM_NO) values ('sales_quot_amd','pre_validate','1','prv_sales_quot_amd',null,'0',to_date('04-12-07','DD-MM-RR'),'System    ','user3','2','JB','ibase.webitm.ejb.dis.SalesQuotationAmdIC',null,null,null);
+
+
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',1,'COMPONENT_TYPE','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE','JB');
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',2,'COMPONENT_NAME','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE','ibase.webitm.ejb.dis.SalesQuotationAmdIC');
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',3,'XML_DATA','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),null,'BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',4,'XML_DATA_1','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',5,'XML_DATA_2','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',6,'OBJ_CONTEXT','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',7,'EDIT_FLAG','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_sales_quot_amd',8,'XTRA_PARAMS','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+
+
+Insert into SYSTEM_EVENT_SERVICES (SERVICE_CODE,SERVICE_DESCR,SERVICE_URI,SERVICE_PROVIDER,METHOD_NAME,RETURN_VALUE,RETURN_TYPE,RETURN_DESCR,RETURN_XFRM,CHG_DATE,CHG_USER,CHG_TERM,SERVICE_NAMESPACE,RES_ELEM,SOAP_ACTION,SERVICE_TYPE,SERVICE_HANDLER,DESCR) values ('prv_sales_quot_amd','val checker','http://localhost:9090/axis/services/ValidatorService',null,'wfValData','String','S',null,null,to_date('29-11-22','DD-MM-RR'),'base      ','Base',null,null,null,null,null,null);
+
+
+
+

Saburi/27-02-26#CUSTOMER_PREF_DIST/SQL/CUSTOMER_PREF_DIST.sql

@@ -97,6 +97,22 @@ update MESSAGES set MSG_STR='Invalid Customer', MSG_DESCR='Please Enter Valid Cu
 update MESSAGES set MSG_STR='Invalid Stockist', MSG_DESCR='Please Enter Valid Stockist' where MSG_NO='VCCUSTSTK';
 update MESSAGES set MSG_STR='Invalid Distributor', MSG_DESCR='Please Enter Valid Distributor' where MSG_NO='VCUSTDIST';
 
+-- 27 March 2026
+
+Insert into system_events (OBJ_NAME,EVENT_CODE,EVENT_CONTEXT,SERVICE_CODE,METHOD_RULE,OVERWRITE_CORE,CHG_DATE,CHG_USER,CHG_TERM,RESULT_HANDLE,COMP_TYPE,COMP_NAME,COMM_FORMAT,FIELD_NAME,FORM_NO) values ('customer_pref_dist','pre_validate','1','prv_cust_pref',null,'0',to_date('04-12-07','DD-MM-RR'),'System    ','user3','2','JB','ibase.webitm.ejb.dis.CustomerPrefDistIC',null,null,null);
+
+Insert into system_event_services (SERVICE_CODE,SERVICE_DESCR,SERVICE_URI,SERVICE_PROVIDER,METHOD_NAME,RETURN_VALUE,RETURN_TYPE,RETURN_DESCR,RETURN_XFRM,CHG_DATE,CHG_USER,CHG_TERM,SERVICE_NAMESPACE,RES_ELEM,SOAP_ACTION,SERVICE_TYPE,SERVICE_HANDLER,DESCR) values ('prv_cust_pref','val checker','http://localhost:9090/axis/services/ValidatorService',null,'wfValData','String','S',null,null,to_date('29-11-22','DD-MM-RR'),'base      ','Base',null,null,null,null,null,null);
+
+
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',1,'COMPONENT_TYPE','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE','JB');
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',2,'COMPONENT_NAME','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE','ibase.webitm.ejb.dis.CustomerPrefDistIC');
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',3,'XML_DATA','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),null,'BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',4,'XML_DATA_1','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',5,'XML_DATA_2','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',6,'OBJ_CONTEXT','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',7,'EDIT_FLAG','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+Insert into SYSTEM_SERVICE_ARGS (SERVICE_CODE,LINE_NO,ARG_NAME,ARG_MODE,DESCR,ARG_TYPE,ARG_XFRM,CHG_DATE,CHG_USER,CHG_TERM,ARG_VALUE) values ('prv_cust_pref',8,'XTRA_PARAMS','I',null,'S',null,to_date('29-11-22','DD-MM-RR'),'BASE      ','BASE',null);
+
 
 
 

Saburi/27-02-26#CUSTOMER_PREF_DIST/java file/CustomerPrefDistIC.java

@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
@@ -84,7 +85,6 @@ public class CustomerPrefDistIC extends ValidatorEJB implements ValidatorLocal,V
 		SimpleDateFormat sdf = null;
 		String currentDateTime = "", loginSite = "", loginCode = "";
 		String quotNo = "";
-
 		String custCode = "";
 		String custCodeStk = "";
 		String custCodeDist = "";
@@ -218,27 +218,6 @@ public class CustomerPrefDistIC extends ValidatorEJB implements ValidatorLocal,V
 
 		            if (currentColumn.equalsIgnoreCase("cust_code"))
 		            {
-		                int custCount = 0;
-
-		                if (custCode != null && custCode.trim().length() > 0)
-		                {
-		                    String sqlType = "SELECT COUNT(*) AS CUST_CODE_COUNT FROM CUSTOMER WHERE CUST_CODE = ?";
-		                    pstmt = conn.prepareStatement(sqlType);
-		                    pstmt.setString(1, custCode);
-		                    rs = pstmt.executeQuery();
-
-		                    if (rs.next())
-		                    {
-		                        custCount = rs.getInt("CUST_CODE_COUNT");
-		                    }
-		                }
-
-		                if (custCount == 0)
-		                {
-		                    errString = itmDBAccessEJB.getErrorString("", "VCCUSTCODE", "", "", conn);
-		                    return errString;
-		                }
-
 		                valueXmlString.append("<cust_name>")
 		                    .append("<![CDATA[" + custName + "]]>")
 		                    .append("</cust_name>");
@@ -250,27 +229,6 @@ public class CustomerPrefDistIC extends ValidatorEJB implements ValidatorLocal,V
 		            
 		            if (currentColumn.equalsIgnoreCase("cust_code__stk"))
 		            {
-		                String custTypeStk = "";
-
-		                if (custCodeStk != null && custCodeStk.trim().length() > 0)
-		                {
-		                    String sqlType = "SELECT CUST_TYPE FROM CUSTOMER WHERE CUST_CODE = ?";
-		                    pstmt = conn.prepareStatement(sqlType);
-		                    pstmt.setString(1, custCodeStk);
-		                    rs = pstmt.executeQuery();
-
-		                    if (rs.next())
-		                    {
-		                        custTypeStk = rs.getString("CUST_TYPE");
-		                    }
-		                }
-
-		                if (!"S".equalsIgnoreCase(custTypeStk))
-		                {
-		                    errString = itmDBAccessEJB.getErrorString("", "VCCUSTSTK", "", "", conn);
-		                   return errString;
-		                }
-
 		                valueXmlString.append("<cust_name_1>")
 		                    .append("<![CDATA[" + stockCustName + "]]>")
 		                    .append("</cust_name_1>");
@@ -278,27 +236,6 @@ public class CustomerPrefDistIC extends ValidatorEJB implements ValidatorLocal,V
 
 		            if (currentColumn.equalsIgnoreCase("cust_code__dist"))
 		            {
-		                String custTypeDist = "";
-
-		                if (custCodeDist != null && custCodeDist.trim().length() > 0)
-		                {
-		                    String sqlType = "SELECT CUST_TYPE FROM CUSTOMER WHERE CUST_CODE = ?";
-		                    pstmt = conn.prepareStatement(sqlType);
-		                    pstmt.setString(1, custCodeDist);
-		                    rs = pstmt.executeQuery();
-
-		                    if (rs.next())
-		                    {
-		                        custTypeDist = rs.getString("CUST_TYPE");
-		                    }
-		                }
-
-		                if (!"D".equalsIgnoreCase(custTypeDist))
-		                {
-		                    errString = itmDBAccessEJB.getErrorString("", "VCUSTDIST", "", "", conn);
-		                    return errString;
-		                }
-
 		                valueXmlString.append("<cust_name_2>")
 		                    .append("<![CDATA[" + distCustName + "]]>")
 		                    .append("</cust_name_2>");
@@ -350,6 +287,178 @@ public class CustomerPrefDistIC extends ValidatorEJB implements ValidatorLocal,V
 		return valueXmlString.toString();
 	}
 
+	public String wfValData(String xmlString, String xmlString1,String xmlString2, String objContext, String editFlag,String xtraParams) throws RemoteException, ITMException
+	{
+		String retString = "";
+		Document dom = null;
+		Document dom1 = null;
+		Document dom2 = null;
+		BaseLogger.log("3", getUserInfo(), null,  "xmlString............." + xmlString);
+		BaseLogger.log("3", getUserInfo(), null,  "xmlString1............" + xmlString1);
+		BaseLogger.log("3", getUserInfo(), null,  "xmlString2............" + xmlString2);
+
+		try
+		{
+			if (xmlString != null && xmlString.trim().length() != 0) 
+			{
+				dom = genericUtility.parseString(xmlString);
+			}
+			if (xmlString1 != null && xmlString1.trim().length() != 0)
+			{
+				dom1 = genericUtility.parseString(xmlString1);
+			}
+			if (xmlString2 != null && xmlString2.trim().length() != 0) 
+			{
+				dom2 = genericUtility.parseString(xmlString2);
+			}
+			retString = wfValData(dom, dom1, dom2, objContext, editFlag,xtraParams);
+			BaseLogger.log("3", getUserInfo(), null,  "ErrString :" + retString);
+		}
+		catch(Exception e)
+		{
+			BaseLogger.log("3", getUserInfo(), null,  "Exception --["+e.getMessage()+"]");
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		return retString;
+	}
+	
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException
+	{
+	    Connection conn = null;
+	    PreparedStatement pstmt = null;
+	    ResultSet rs = null;
+
+	    String custCode = "";
+	    String custCodeStk = "";
+	    String custCodeDist = "";
+	    String custType = "";
+	    int cnt = 0;
+
+	    ArrayList<String> errList = new ArrayList<String>();
+	    ArrayList<String> errFields = new ArrayList<String>();
+
+	    try
+	    {
+	        conn = getConnection();
+	        int currentFormNo = 0;
+	    	BaseLogger.log("3", getUserInfo(), null,  "Inside wfValdata***********");
+	        if (objContext != null && objContext.trim().length() > 0)
+	        {
+	            currentFormNo = Integer.parseInt(objContext);
+	        	BaseLogger.log("3", getUserInfo(), null,  "Inside currentFormNo***********"+currentFormNo);
+	        }
+
+	        if(currentFormNo == 1)
+	        {
+	            custCode = genericUtility.getColumnValue("cust_code", dom);
+
+	            if(custCode == null || custCode.trim().length() == 0)
+	            {
+	                errList.add("VCCUSTCODE");
+	                errFields.add("cust_code");
+	            }
+	            else
+	            {
+	                String sql = "SELECT COUNT(*) FROM CUSTOMER WHERE CUST_CODE = ?";
+	                pstmt = conn.prepareStatement(sql);
+	                pstmt.setString(1, custCode);
+	                rs = pstmt.executeQuery();
+
+	                if(rs.next())
+	                {
+	                    cnt = rs.getInt(1);
+	                }
+
+	                if(cnt == 0)
+	                {
+	                    errList.add("VCCUSTCODE");
+	                    errFields.add("cust_code");
+	                }
+
+	                if(rs != null) rs.close();
+	                if(pstmt != null) pstmt.close();
+	            }
+
+	            custCodeStk = genericUtility.getColumnValue("cust_code__stk", dom);
+	            if(custCodeStk != null && custCodeStk.trim().length() > 0)
+	            {
+	                String sql = "SELECT CUST_TYPE FROM CUSTOMER WHERE CUST_CODE = ?";
+	                pstmt = conn.prepareStatement(sql);
+	                pstmt.setString(1, custCodeStk);
+	                rs = pstmt.executeQuery();
+
+	                if(rs.next())
+	                {
+	                    custType = rs.getString("CUST_TYPE");
+	                }
+	                else
+	                {
+	                    custType = "";
+	                }
+
+	                if(!"S".equalsIgnoreCase(custType))
+	                {
+	                    errList.add("VCCUSTSTK");
+	                    errFields.add("cust_code__stk");
+	                }
+
+	                if(rs != null) rs.close();
+	                if(pstmt != null) pstmt.close();
+	            }
+
+	            custCodeDist = genericUtility.getColumnValue("cust_code__dist", dom);
+	            if(custCodeDist != null && custCodeDist.trim().length() > 0)
+	            {
+	                String sql = "SELECT CUST_TYPE FROM CUSTOMER WHERE CUST_CODE = ?";
+	                pstmt = conn.prepareStatement(sql);
+	                pstmt.setString(1, custCodeDist);
+	                rs = pstmt.executeQuery();
+
+	                if(rs.next())
+	                {
+	                    custType = rs.getString("CUST_TYPE");
+	                }
+	                else
+	                {
+	                    custType = "";
+	                }
+
+	                if(!"D".equalsIgnoreCase(custType))
+	                {
+	                    errList.add("VCUSTDIST");
+	                    errFields.add("cust_code__dist");
+	                }
+
+	                if(rs != null) rs.close();
+	                if(pstmt != null) pstmt.close();
+	            }
+	        }
+
+	        if(errList != null && errList.size() > 0)
+	        {
+	            return itmDBAccessEJB.getErrorString("", errList.get(0), "", "", conn);
+	        }
+	        else
+	        {
+	            return "";
+	        }
+	    }
+	    catch(Exception e)
+	    {
+	        throw new ITMException(e);
+	    }
+	    finally
+	    {
+	        try
+	        {
+	            if(rs != null) rs.close();
+	            if(pstmt != null) pstmt.close();
+	            if(conn != null) conn.close();
+	        }
+	        catch(Exception e){}
+	    }
+	}
 
 
 	public String checkNull(String inputStr) throws ITMException