Site master validation of site code Exc.

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

webitm-sys/src/ibase/webitm/ejb/sys/SiteIC.java

@@ -59,7 +59,8 @@ public class SiteIC extends ValidatorEJB implements SiteICLocal, SiteICRemote
 		}
 		return(errString);
 	}
-	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
+	
+	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException
 	{
 		NodeList parentNodeList = null;
 		NodeList childNodeList = null;	
@@ -558,12 +559,26 @@ public class SiteIC extends ValidatorEJB implements SiteICLocal, SiteICRemote
 							 }
 					     }
 				     }
+				
 					else if(childNodeName.equalsIgnoreCase("site_code__exc"))
 					 {
 						 System.out.println(">>>>>>site_code__exc validation:");
-						 siteCodeExc = genericUtility.getColumnValue("site_code__exc", dom);
-						 if(siteCodeExc!= null && siteCodeExc.trim().length() > 0)
+						 siteCodeExc = checkNull( genericUtility.getColumnValue("site_code__exc", dom));
+						 siteCode =  checkNull(genericUtility.getColumnValue("site_code", dom)); // added By Vrushabh on 23-1-20 Start                                                             
+						 
+						 if(siteCodeExc != null && siteCodeExc.trim().length()> 0)
+						 {	 
+							 if("A".equals(editFlag))
+							 {
+								 if(!(siteCodeExc.equalsIgnoreCase(siteCode)))
 								 {
+									 errCode = "VMEXCSITD";
+									 errList.add(errCode);
+									 errFields.add(childNodeName.toLowerCase());
+								 } 
+							 }else {  // added By Vrushabh on 23-1-20 End 
+							 //if(siteCodeExc!= null && siteCodeExc.trim().length() > 0) //  commented By Vrushabh on 23-1-20 
+							 //{
 								existFlag = isExist("site", "site_code", siteCodeExc, conn);
 								if ("FALSE".equals(existFlag))
 								{
@@ -572,7 +587,8 @@ public class SiteIC extends ValidatorEJB implements SiteICLocal, SiteICRemote
 									errFields.add(childNodeName.toLowerCase());
 								}
 							 }
-						 //added by manish mhatre on 2-jan-2020
+							 //} 
+						 } //added by manish mhatre on 2-jan-2020
 						 else if(siteCodeExc == null || siteCodeExc.trim().length() == 0)
 						 {
 							 		errCode = "VMEXCSTCDN";
@@ -734,6 +750,7 @@ public class SiteIC extends ValidatorEJB implements SiteICLocal, SiteICRemote
 		return errString;
 	}//end of validation
 
+	
 	// method for item change
 	public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
 	{
@@ -1073,4 +1090,3 @@ public class SiteIC extends ValidatorEJB implements SiteICLocal, SiteICRemote
 	}
 }  
 
-