Commit 718365ad authored by vdhoble's avatar vdhoble

added changes for tran_date itemchange -vishakha


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99176 ce508802-f39f-4f6c-b175-0d175dae99d5
parent da1c8747
......@@ -360,13 +360,13 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
{
refSer=this.genericUtility.getColumnValue("ref_ser", domAll);
System.out.println("refSer---"+refSer);
if(refSer == null)
/* if(refSer == null)
{
errCode = "VTREFSREMP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
}*/
if(refSer != null)
{
refSer=refSer.trim();
sql="select count(*) from receivables where tran_ser=?";
......@@ -407,13 +407,13 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
System.out.println("lineNo---"+lineNo);
System.out.println("refSer---"+refSer);
if(refNo == null)
/*if(refNo == null)
{
errCode = "VTREFNOEMP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
}*/
if(refNo != null)
{
refNo=refNo.trim();
sql="select count(*) from receivables where ref_no=?";
......@@ -474,7 +474,10 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
}
else if(childNodeName.equalsIgnoreCase("rcp_amt"))
{
refNo=this.genericUtility.getColumnValue("ref_no", domAll);
refSer=this.genericUtility.getColumnValue("ref_ser", domAll);
System.out.println("refNo>>>>> :"+refNo);
System.out.println("refSer>>>>> :"+refSer);
System.out.println("rcp_amt!! "+this.genericUtility.getColumnValue("rcp_amt", domAll));
if(!(isNumeric(this.genericUtility.getColumnValue("rcp_amt", domAll))))
......@@ -490,12 +493,21 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
}
System.out.println("rcpAmt---"+rcpAmt);
/*if(rcpAmt == 0)
{
errCode = "VRCPAMTEMP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}*/
if(rcpAmt == 0)
{
if(refNo != null || refSer != null)
{
errCode = "VRCPAMTEMP";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
if(rcpAmt < 0)
{
errCode = "VTRCPATVLD";
......@@ -503,14 +515,15 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
errFields.add(childNodeName.toLowerCase());
}
//removed validation for total receipt amount less than cheque amount.
/*if(checkAmtvalidation(dom1))
//added checkAmtvalidation by mahendra on dated 03-09-2015
if(checkAmtvalidation(dom1))
{
errCode = "VTCHQATINV";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}*/
}
System.out.println("ref_ser :"+genericUtility.getColumnValue("ref_ser",domAll));
System.out.println("ref_no :"+genericUtility.getColumnValue("ref_no",domAll));
......@@ -718,6 +731,7 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
//Timestamp discDate=null;
java.util.Date discountDate = null, tranDate = null;
double discAmt=0;
String rcpDate = "";
double chequeAmt = 0,rcpAmt = 0,commAmt = 0;
DistCommon distCommon = new DistCommon();
double custDocAmt=0,discAppr=0,finChg=0;
......@@ -888,7 +902,16 @@ public class GenReceiptIC extends ValidatorEJB implements GenReceiptICLocal, Gen
pstmt.close();
pstmt = null;
}
else if( currentColumn.trim().equalsIgnoreCase( "tran_date" ) )
{
System.out.println("Enter in tran_date");
rcpDate = checkNull(genericUtility.getColumnValue("tran_date",currDom));
System.out.println("Receipt date ==== "+rcpDate);
valueXmlString.append("<eff_date>").append("<![CDATA["+rcpDate+"]]>").append("</eff_date>\r\n");
}
else if( currentColumn.trim().equalsIgnoreCase( "cust_code" ) )
{
System.out.println("Enter in cust_code");
......
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