change in ejb for period validation

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

webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java

@@ -2,6 +2,7 @@ package ibase.webitm.ejb.fin;
 
 import ibase.system.config.ConnDriver;
 import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.fin.FinCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -25,6 +26,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	String winName = null;
 	FinCommon finCommon = null;
+	DistCommon  disCommon = null;
 	ValidatorEJB validator = null;
 
 	public String wfValData(String xmlString, String xmlString1, String xmlString2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException
@@ -144,6 +146,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 		try
 		{
 			this.finCommon = new FinCommon();
+			this.disCommon = new DistCommon();
 			this.validator = new ValidatorEJB();
 			conn = connDriver.getConnectDB("DriverITM");
 			userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
@@ -168,9 +171,18 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					if (childNodeName.equalsIgnoreCase("tran_date"))
 					{
 						tranDateS=this.genericUtility.getColumnValue("tran_date", dom);
+						siteCode = this.genericUtility.getColumnValue("site_code", dom);
+						
 						if (tranDateS != null && !tranDateS.matches("\\d{4}-[01]\\d-[0-3]\\d"))
 						{
 							tranDate = dateFormat2.parse(tranDateS);
+						/*	errCode = this.checkPeriod("FIN", siteCode, tranDate, conn);
+							
+							if(errCode != null && errCode.trim().length() >0)
+							{
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}*/
 						}
 						else
 						{
@@ -311,6 +323,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						}
 						if ((errCode == null) ||  (errCode.trim().length() == 0))
 						{
+							System.out.println("prioddddddddd");
 							tranDate = dateFormat2.parse(this.genericUtility.getColumnValue("tran_date", dom));
 							errCode = checkPeriod("FIN", siteCode, tranDate, conn);
 							if(errCode != null && errCode.trim().length() >0)
@@ -1326,11 +1339,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					else if (childNodeName.equalsIgnoreCase("cctr_code"))
 					{
 						cctrCode = this.genericUtility.getColumnValue("cctr_code", dom);
+						System.out.println("CTTC CODE "+cctrCode);
 						if(cctrCode != null && cctrCode.trim().length() > 0)
 						{
 							acctCode = this.genericUtility.getColumnValue("acct_code", dom);
-							if(acctCode == null || acctCode.trim().length() == 0){acctCode="";}
-							errCode = validateCctrCode(cctrCode , acctCode, conn);
+							//if(acctCode == null || acctCode.trim().length() == 0){acctCode="";}
+							System.out.println("CTTC CODE 111["+cctrCode+""+acctCode);
+							errCode = validateCctrCode(cctrCode, acctCode,  conn);
 							if(errCode != null && errCode.trim().length() > 0)
 							{
 								errList.add(errCode);
@@ -1343,6 +1358,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 					else if (childNodeName.equalsIgnoreCase("anal_code"))
 					{
 						analCode = this.genericUtility.getColumnValue("anal_code", dom);
+						System.out.println("CTTC CODE "+cctrCode);
 						if(analCode != null && analCode.trim().length() > 0)
 						{
 							sql = "select count(*) from analysis where anal_code = ?";
@@ -3637,6 +3653,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
 						errorCode = "VTPRDTFIN";
 					}
 				}
+				else
+				{
+					errorCode = "VMSTATSND";
+				}
+					
 
 				pst.close();
 				pst = null;