Commit 48f0440e authored by mmhatre's avatar mmhatre

Bank Receipt, receivables jv validation to be added that the advance being...

Bank Receipt, receivables jv  validation to be added that the advance being adjusted should not have future ref_date

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204377 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f19b4ba3
...@@ -154,7 +154,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -154,7 +154,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
double pendingAmt = 0.0D; double pendingAmt = 0.0D;
double adjAmt = 0.0D; double adjAmt = 0.0D;
Timestamp rfDate=null; Timestamp rfDate=null;
Timestamp today=null;
int ctr = 0; int ctr = 0;
int currentFormNo = 0; int currentFormNo = 0;
int cnt = 0; int cnt = 0;
...@@ -166,6 +166,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -166,6 +166,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
java.util.Date dueDate = null; java.util.Date dueDate = null;
java.util.Date heffDate = null; java.util.Date heffDate = null;
java.util.Date htranDate = null; java.util.Date htranDate = null;
java.util.Date today1 = null;
ArrayList errList = new ArrayList(); ArrayList errList = new ArrayList();
ArrayList errFields = new ArrayList(); ArrayList errFields = new ArrayList();
//SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy"); //SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy");
...@@ -197,6 +198,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -197,6 +198,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
//System.out.println("current date:::::"+tranDateStr); //System.out.println("current date:::::"+tranDateStr);
//SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());--commemt by monika //SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());--commemt by monika
SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
today = java.sql.Timestamp.valueOf(sdf1.format(new java.util.Date()).toString() + " 00:00:00.0");
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String sysDate = sdf.format(currentDate.getTime()); String sysDate = sdf.format(currentDate.getTime());
...@@ -1254,15 +1258,36 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1254,15 +1258,36 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
else if (childNodeName.equalsIgnoreCase("ref_date")) else if (childNodeName.equalsIgnoreCase("ref_date"))
{ {
refDateS = this.genericUtility.getColumnValue("ref_date", dom); refDateS = this.genericUtility.getColumnValue("ref_date", dom);
refDate = sdf.parse(refDateS);
htranDate = sdf.parse(this.genericUtility.getColumnValue("tran_date", dom1));
tranType = genericUtility.getColumnValue("tran_type", dom1);
refSer = this.genericUtility.getColumnValue("ref_ser", dom);
if(refDateS != null && !refDateS.equals("DD/MM/YY")) if(refDateS != null && !refDateS.equals("DD/MM/YY"))
{ {
refDate = sdf.parse(refDateS); System.out.println("Before tran type condition");
htranDate = sdf.parse(this.genericUtility.getColumnValue("tran_date", dom1)); //added by manish mhatre on 23-july-2019[validation for bank receipt and receivable jv]
//start manish
System.out.println("RefDate Validation::tranType["+tranType+"]refSer["+refSer+"]refDate["+refDate+"]today["+today+"]");
if(tranType.equals("A") || tranType.equals("J") )
{
if("MDRCRC".equals(refSer.trim()) || "R-ADV".equals(refSer.trim()) || "P-ADV".equals(refSer.trim()) || "CRNRCP".equals(refSer.trim()))
{
if(refDate.after(today))
{
System.out.println("In after condition");
errCode = "VTPRDFDALW";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
//end manish
if (!htranDate.before(refDate)) if (!htranDate.before(refDate))
continue; continue;
errCode = "VXVOUDATE"; errCode = "VXVOUDATE";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
else if (childNodeName.equalsIgnoreCase("due_date")) else if (childNodeName.equalsIgnoreCase("due_date"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment