Skip to content

B
business-java
Commit 46b28b12 authored by msalla's avatar msalla
Browse files
Options

Single payment received against multiple code. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204429 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 402fed6a
Show whitespace changes
Inline Side-by-side
Showing with 419 additions and 116 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ 46b28b12
...@@ -153,8 +153,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -153,8 +153,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
double totAmt = 0.0D; double totAmt = 0.0D;
double pendingAmt = 0.0D; double pendingAmt = 0.0D;
double adjAmt = 0.0D; double adjAmt = 0.0D;
Timestamp rfDate=null; Timestamp rfDate=null,today = null;
Timestamp today=null; String tranIdHdr=null,advBkId=null,currCodeHdr=null,chaqueAmtStr=null,exchRatestr=null,amt=null,amountBcStr=null,diffAmtBcStr=null;
int ctr = 0; int ctr = 0;
int currentFormNo = 0; int currentFormNo = 0;
int cnt = 0; int cnt = 0;
...@@ -171,7 +171,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -171,7 +171,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
ArrayList errFields = new ArrayList(); ArrayList errFields = new ArrayList();
//SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy"); //SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy");
//SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-mm-dd"); //SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-mm-dd");
SimpleDateFormat dateFormat2 = null;
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
...@@ -179,6 +179,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -179,6 +179,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
String effBankStr="",rcpacctAmt=""; String effBankStr="",rcpacctAmt="";
String refType = "",guid = ""; String refType = "",guid = "";
double rcpacctAmtdbl=0; double rcpacctAmtdbl=0;
//Calendar currentDate = Calendar.getInstance();--by monika //Calendar currentDate = Calendar.getInstance();--by monika
...@@ -929,8 +930,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -929,8 +930,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
bankCode = this.genericUtility.getColumnValue("bank_code", dom); bankCode = this.genericUtility.getColumnValue("bank_code", dom);
sql = "select count(*) from advbking where confirmed = 'Y' and bal_amt > 0 and (? between to_char(eff_date,'yyyy-mm-dd') and to_char(valid_upto,'yyyy-mm-dd'))and bank_code = ? tran_id = ? and status = 'A' "; sql = "select count(*) from advbking where confirmed = 'Y' and bal_amt > 0 and (? between to_char(eff_date,'yyyy-mm-dd') and to_char(valid_upto,'yyyy-mm-dd'))and bank_code = ? tran_id = ? and status = 'A' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, tranDate.toString());
pstmt.setString(2, tranDate.toString()); pstmt.setString(2, bankCode);
pstmt.setString(3, tranIdAdvbking); pstmt.setString(3, tranIdAdvbking);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
...@@ -1264,12 +1265,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1264,12 +1265,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
refSer = this.genericUtility.getColumnValue("ref_ser", dom); refSer = this.genericUtility.getColumnValue("ref_ser", dom);
if(refDateS != null && !refDateS.equals("DD/MM/YY")) if(refDateS != null && !refDateS.equals("DD/MM/YY"))
{ {
System.out.println("Before tran type condition"); refDate = sdf.parse(refDateS);
htranDate = sdf.parse(this.genericUtility.getColumnValue("tran_date", dom1));
//added by manish mhatre on 23-july-2019[validation for bank receipt and receivable jv] //added by manish mhatre on 23-july-2019[validation for bank receipt and receivable jv]
//start manish //start manish
System.out.println("RefDate Validation::tranType["+tranType+"]refSer["+refSer+"]refDate["+refDate+"]today["+today+"]"); System.out.println("RefDate Validation::tranType["+tranType+"]refSer["+refSer+"]refDate["+refDate+"]today["+today+"]");
if(tranType.equals("A") || tranType.equals("J") ) /*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("MDRCRC".equals(refSer.trim()) || "R-ADV".equals(refSer.trim()) || "P-ADV".equals(refSer.trim()) || "CRNRCP".equals(refSer.trim()))
{ {
if(refDate.after(today)) if(refDate.after(today))
...@@ -1280,9 +1282,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1280,9 +1282,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
} /*}*/
//end manish //end manish
if (!htranDate.before(refDate)) if (!htranDate.before(refDate))
continue; continue;
errCode = "VXVOUDATE"; errCode = "VXVOUDATE";
...@@ -1673,43 +1674,57 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1673,43 +1674,57 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
hsiteCode = this.genericUtility.getColumnValue("site_code", dom1); hsiteCode = this.genericUtility.getColumnValue("site_code", dom1);
hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1); hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1);
htranDate = sdf.parse(this.genericUtility.getColumnValue("tran_date", dom1)); htranDate = sdf.parse(this.genericUtility.getColumnValue("tran_date", dom1));
sql = "select cust_code, site_code, curr_code, due_date from receivables where tran_ser = ? and ref_no = ?"; //commented by monika-31-july-2019
// sql = "select cust_code, site_code, curr_code, due_date from receivables where tran_ser = ? and ref_no = ?";
//added by monika-31-july-2019
sql = "select cust_code, site_code, curr_code, due_date,ref_date from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer); pstmt.setString(1, refSer);
pstmt.setString(2, refNo); pstmt.setString(2, refNo);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
custCode = rs.getString(1); custCode = rs.getString("cust_code");
siteCode = rs.getString(2); siteCode = rs.getString("site_code");
currCode = rs.getString(3); currCode = rs.getString("curr_code");
dueDate = rs.getDate(4); //commented by -monika-july-31-2019
//dueDate = rs.getDate("due_date");
dueDate = getTimeStamp("due_date");
refDate=rs.getTimeStamp("ref_date");
if(!custCode.trim().equals(hcustCode.trim())) if(!custCode.trim().equals(hcustCode.trim()))
{ {
errCode = "VTCGRP1"; errCode = "VTCGRP1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else if(!siteCode.trim().equals(hsiteCode.trim())) if(!siteCode.trim().equals(hsiteCode.trim()))
{ {
errCode = "VTSITE1"; errCode = "VTSITE1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else if(!currCode.trim().equals(hcurrCode.trim())) if(!currCode.trim().equals(hcurrCode.trim()))
{ {
errCode = "VTCURR1"; errCode = "VTCURR1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
else {
if (dueDate.after(htranDate)) if (dueDate.after(htranDate))
{ {
errCode = "VTADVDT"; errCode = "VTADVDT";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} //added by monika on 31-july-2019
if(refDate.after(today))
{
System.out.println("In after condition");
errCode = "VTPRDFDALW";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}//end
} }
else else
{ {
...@@ -2151,8 +2166,179 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2151,8 +2166,179 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
valueXmlString.append("</Detail5>"); valueXmlString.append("</Detail5>");
break;
//added by monika-29-july-2019
case 6:
parentNodeList = dom.getElementsByTagName("Detail6");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
valueXmlString.append("<Detail6>");
childNodeListLength = childNodeList.getLength();
for (ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if (childNodeName.equalsIgnoreCase("rcpadvbking_ref_no"))
{
advBkId=this.genericUtility.getColumnValue("rcpadvbking_ref_no", dom);
tranDateS=this.genericUtility.getColumnValue("tran_date", dom1);
bankCode=this.genericUtility.getColumnValue("bank_code", dom1);
sql="select count(*) from advbking where tran_id=? and confirmed = 'Y' and bal_amt > 0 and tran_date >= eff_date and tran_date <= valid_upto and bank_code =? and status = 'A' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, advBkId);
pstmt.setString(1, bankCode);
rs = pstmt.executeQuery();
if (rs.next())
{
cnt = rs.getInt(1);
}
if (cnt == 0)
{
errCode = "VTADVBKID";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
else if(childNodeName.equalsIgnoreCase("curr_code"))
{
currCode=this.genericUtility.getColumnValue("curr_code", dom);
currCodeHdr=this.genericUtility.getColumnValue("curr_code", dom1);
exchRatestr=this.genericUtility.getColumnValue("exch_rate", dom);
if(exchRatestr != null && exchRatestr.trim().length()>0)
{
exchRate=Double.parseDouble(exchRatestr);
}
else
{
exchRate=0;
}
if((!currCode.equals(currCodeHdr)) && (exchRate!=1))
{
errCode="VTCUR3";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else if (childNodeName.equalsIgnoreCase("amount"))
{
amount = doublevalue(this.genericUtility.getColumnValue("amount", dom));
refNo = this.genericUtility.getColumnValue("rcpadvbking_ref_no", dom);
htranId = this.genericUtility.getColumnValue("tran_id", dom1);
if (amount == 0.0)
{
errCode = "VTLNAMT";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
{
sql = "select bal_amt from advbking where tran_id=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refNo);
rs = pstmt.executeQuery();
if (rs.next())
{
balAmt = rs.getDouble("bal_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select sum(case when a.amount is null then 0.0 else a.amount end) from receipt r, rcpadvbking_adj a where r.tran_id = a.tran_id and r.tran_id != ? and a.ref_no = ? and (case when r.confirmed is null then 'N' else r.confirmed end) != 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, htranId);
pstmt.setString(2, refNo);
rs = pstmt.executeQuery();
if (rs.next())
{
Amt = rs.getDouble(1);
}
else
{
Amt = 0.0;
}
System.out.println("amount is amount:::"+Amt);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (Math.abs(amount) + Math.abs(Amt) > balAmt)
{
errCode = "VTINVPCAMT";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
{
if((Math.abs(amount) + Math.abs(pendingAmt))>balAmt)
{
errCode="VTADVBKAMT";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
{
amountBc = doublevalue(this.genericUtility.getColumnValue("amount__bc", dom));
amountBc = (amountBc+doublevalue(this.genericUtility.getColumnValue("diff_amt__exch", dom)));
chaqueAmtStr = this.genericUtility.getColumnValue("cheque_amt", dom1);
exchRate = doublevalue(this.genericUtility.getColumnValue("exch_rate", dom1));
if(chaqueAmtStr != null && chaqueAmtStr.trim().length()>0)
{
chequeAmt=Double.parseDouble(chaqueAmtStr);
}
else
{
chequeAmt=0;
}
if (exchRate == 0.0D)
{
exchRate = 1.0D;
}
chequeAmt = chequeAmt * exchRate;
}
for (crt = 1; crt <= parentNodeList.getLength(); crt++)
{
amountBc += Math.abs(doublevalue(this.genericUtility.getColumnValue("amount__bc", dom)));
amountBc += doublevalue(this.genericUtility.getColumnValue("diff_amt__exch", dom));
}
if (crt > 0)
{
amountBc += Math.abs(doublevalue(this.genericUtility.getColumnValue("amount__bc", dom)));
amountBc += doublevalue(this.genericUtility.getColumnValue("diff_amt__exch", dom));
}
if (chequeAmt - amountBc < 0.0D)
{
errCode = "VTAMT1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
}
}
}
valueXmlString.append("</Detail6>");
break;
//end
}
int errListSize = errList.size(); int errListSize = errList.size();
cnt = 0; cnt = 0;
String errFldName = null; String errFldName = null;
...@@ -3747,7 +3933,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3747,7 +3933,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
valueXmlString.append("<ref_date/>"); valueXmlString.append("<ref_date/>");
} }
if ( hCurrCode.trim().equals(currCode.trim()) ) if(hCurrCode.trim().equals(currCode.trim()))
{ {
valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + hexchRate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA[" + hexchRate + "]]>").append("</exch_rate>");
} }
...@@ -3756,7 +3942,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3756,7 +3942,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + hexchRate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + hexchRate + "]]>").append("</exch_rate>");
} }
valueXmlString.append("<exch_rate__rcv>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate__rcv>"); valueXmlString.append("<exch_rate__rcv>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate__rcv>");
if (dueDate != null ) if(dueDate != null )
{ {
valueXmlString.append("<due_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate)+ "]]>").append("</due_date>"); valueXmlString.append("<due_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate)+ "]]>").append("</due_date>");
} }
...@@ -3782,14 +3968,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3782,14 +3968,13 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
System.out.println("Rcp Amt from else" + rcpAmt); System.out.println("Rcp Amt from else" + rcpAmt);
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal((totAmt - adjAmt), 3) + "]]>").append("</rcp_amt>"); valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal((totAmt - adjAmt), 3) + "]]>").append("</rcp_amt>");
rcpAmt = totAmt - adjAmt; rcpAmt = totAmt - adjAmt;
} }
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__ar>"); valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__ar>");
valueXmlString.append("<accounts_descr>").append("<![CDATA[" + accDescr + "]]>").append("</accounts_descr>"); valueXmlString.append("<accounts_descr>").append("<![CDATA[" + accDescr + "]]>").append("</accounts_descr>");
valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__ar>"); valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCode + "]]>").append("</cctr_code__ar>");
valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>");
bdFluctuationCf = finCommon.getFinparams("999999", "BD_FLUCTUATION_CF",conn); bdFluctuationCf = finCommon.getFinparams("999999", "BD_FLUCTUATION_CF",conn);
if (bdFluctuationCf.equals("") || bdFluctuationCf == null) if(bdFluctuationCf.equals("") || bdFluctuationCf == null)
{ {
bdFluctuationCf = "N"; bdFluctuationCf = "N";
} }
...@@ -3818,11 +4003,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3818,11 +4003,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
rcpAutoFinchg = finCommon.getFinparams("999999", "RCP_AUTO_FINCHG",conn).trim(); rcpAutoFinchg = finCommon.getFinparams("999999", "RCP_AUTO_FINCHG",conn).trim();
if (rcpAutoFinchg.equals("") || rcpAutoFinchg == null ) if(rcpAutoFinchg.equals("") || rcpAutoFinchg == null )
{ {
rcpAutoFinchg = "N"; rcpAutoFinchg = "N";
} }
if (rcpAutoFinchg.equals("Y")) if(rcpAutoFinchg.equals("Y"))
{ {
sql = "select count(*) from receivables where tran_ser = ? and ref_ser__org = ? and ref_no = ?"; sql = "select count(*) from receivables where tran_ser = ? and ref_ser__org = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -3839,7 +4024,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3839,7 +4024,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if ((tranSer == "S-INV") || (ctr == 1)) // if((tranSer == "S-INV") || (ctr == 1))commented by monika-30-july-2019
//added by monika salla-30-07-2019-
if((tranSer.equals("S-INV")) || (ctr == 1))//end
{ {
sql = "select due_date,cr_term from invoice where invoice_id = ?"; sql = "select due_date,cr_term from invoice where invoice_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -3918,7 +4105,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3918,7 +4105,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt = null; pstmt = null;
if (billDisc == null) billDisc = "N"; if (billDisc == null) billDisc = "N";
if (billDisc == "Y") // if (billDisc == "Y")//commeneted by monika-30 july-19
//added bt monika 30 july-19
if (billDisc.equals("Y"))
{ {
sql = "select export_fund.exch_rate from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y') and( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ?) )"; sql = "select export_fund.exch_rate from export_fund, export_fundet where ( export_fund.tran_id = export_fundet.tran_id ) and ( export_fund.confirmed = 'Y') and( ( export_fundet.ref_ser = ? ) and ( export_fundet.ref_no = ?) )";
...@@ -3998,7 +4187,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3998,7 +4187,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt = null; pstmt = null;
rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom)); rcpAmt = Double.parseDouble(genericUtility.getColumnValue("rcp_amt", dom));
if ((tranSer == "S-INV") || (ctr == 1)) //if ((tranSer == "S-INV") || (ctr == 1))//commeneted by monika-30 july-19
//added by monika 30 july-19
if ((tranSer.equals("S-INV")) || (ctr == 1))//end
{ {
sql = "select due_date,cr_term from invoice where invoice_id = ?"; sql = "select due_date,cr_term from invoice where invoice_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4039,7 +4230,10 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4039,7 +4230,10 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (finChg == 0.0D) finChg = 0.0D; if (finChg == 0.0D) finChg = 0.0D;
if (discountLc == 0.0D) discountLc = 0.0D; if (discountLc == 0.0D) discountLc = 0.0D;
if (fchgType == "P") //if (fchgType == "P")
//commeneted by monika-30 july-19
//added bt monika 30 july-19
if (fchgType.equals("P"))
{ {
discountLc = rcpAmt * (finChg / 36500.0D) * days; discountLc = rcpAmt * (finChg / 36500.0D) * days;
} }
...@@ -4108,6 +4302,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4108,6 +4302,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<exch_rate__vouch>").append("<![CDATA[" + exch + "]]>").append("</exch_rate__vouch>"); valueXmlString.append("<exch_rate__vouch>").append("<![CDATA[" + exch + "]]>").append("</exch_rate__vouch>");
valueXmlString.append("<tot_amt>").append("<![CDATA[" + totAmt + "]]>").append("</tot_amt>"); valueXmlString.append("<tot_amt>").append("<![CDATA[" + totAmt + "]]>").append("</tot_amt>");
...@@ -4165,7 +4360,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4165,7 +4360,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
refNo = genericUtility.getColumnValue("rcpepc_ref_no", dom); refNo = genericUtility.getColumnValue("rcpepc_ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom); refSer = genericUtility.getColumnValue("ref_ser", dom);
System.out.println("rcpepc_ref_no"+refNo); System.out.println("rcpepc_ref_no"+refNo);
if ((refNo == null) || (refNo.trim().length() == 0)) refNo = ""; // if((refNo == null) || (refNo.trim().length() == 0)) refNo = "";//commented by-Monika salla-30-july-2019
if((refNo!=null) && (refNo.trim().length() > 0))//added by monika salla-30-july-2019
{ {
sql = "select ref_no,ref_date,curr_code,exch_rate,due_date,tot_amt,sundry_type,sundry_code,case when adj_amt is null then 0 else adj_amt end,ACCT_CODE,CCTR_CODE from misc_payables where ref_no = ? and tran_ser = 'E-FUND'"; sql = "select ref_no,ref_date,curr_code,exch_rate,due_date,tot_amt,sundry_type,sundry_code,case when adj_amt is null then 0 else adj_amt end,ACCT_CODE,CCTR_CODE from misc_payables where ref_no = ? and tran_ser = 'E-FUND'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4173,17 +4369,17 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4173,17 +4369,17 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
refNo = rs.getString(1); refNo = rs.getString("ref_no");
refDate = rs.getDate(2); refDate = rs.getDate("ref_date");
currCode = rs.getString(3); currCode = rs.getString("curr_code");
exchRate = rs.getDouble(4); exchRate = rs.getDouble("exch_rate");
dueDate = rs.getDate(5); dueDate = rs.getDate("due_date");
totAmt = rs.getDouble(6); totAmt = rs.getDouble("tot_amt");
sundryType = rs.getString(7); sundryType = rs.getString("sundry_type");
sundryCode = rs.getString(8); sundryCode = rs.getString("sundry_code");
adjAmt = rs.getDouble(9); adjAmt = rs.getDouble(9);
acctCode = rs.getString(10); acctCode = rs.getString("ACCT_CODE");
cctrCode = rs.getString(11); cctrCode = rs.getString("CCTR_CODE");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -4223,8 +4419,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4223,8 +4419,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + ((amount * hexchRate )- (amount * exchRate)) + "]]>").append("</diff_amt__exch>"); valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + ((amount * hexchRate )- (amount * exchRate)) + "]]>").append("</diff_amt__exch>");
} }
} }
else if ((currentColumn.trim().equalsIgnoreCase("exch_rate")) || (currentColumn.trim().equalsIgnoreCase("amount"))) else if ((currentColumn.trim().equalsIgnoreCase("exch_rate")) || (currentColumn.trim().equalsIgnoreCase("amount")))
{ {
...@@ -4232,7 +4426,10 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4232,7 +4426,10 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
exchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom)); exchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom));
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1)); hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>"); valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>");
if(amount < 0.0) {amount = Math.abs(amount);} if(amount < 0.0)
{
amount = Math.abs(amount);
}
if (exchRate != 1.0D) if (exchRate != 1.0D)
{ {
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + (amount * hexchRate - amount * exchRate) + "]]>").append("</diff_amt__exch>"); valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + (amount * hexchRate - amount * exchRate) + "]]>").append("</diff_amt__exch>");
...@@ -4260,8 +4457,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4260,8 +4457,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
ctr++; ctr++;
} }
while ((ctr < childNodeListLength) && (! while ((ctr < childNodeListLength) && (!childNodeName.equals(currentColumn)));
childNodeName.equals(currentColumn)));
if (currentColumn.trim().equalsIgnoreCase("itm_default")) if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
hTranId = genericUtility.getColumnValue("tran_id", dom1); hTranId = genericUtility.getColumnValue("tran_id", dom1);
...@@ -4320,7 +4516,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4320,7 +4516,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt = null; pstmt = null;
} }
else if (currentColumn.trim().equalsIgnoreCase("curr_code")) else if(currentColumn.trim().equalsIgnoreCase("curr_code"))
{ {
currCode = genericUtility.getColumnValue("curr_code", dom); currCode = genericUtility.getColumnValue("curr_code", dom);
htranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1)); htranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1));
...@@ -4352,7 +4548,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4352,7 +4548,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect = \"0\">").append("<![CDATA[" + mexchrate + "]]>").append("</exch_rate>");
} }
int lineNo= Integer.parseInt(genericUtility.getColumnValue("line_no", dom)); int lineNo= Integer.parseInt(genericUtility.getColumnValue("line_no", dom));
if(lineNo > 0){deteditflag = "E"; }else{ deteditflag = "A" ;} if(lineNo > 0)
{
deteditflag = "E";
}
else
{
deteditflag = "A" ;
}
if (hcurrCode.trim().equalsIgnoreCase(currCode.trim())) if (hcurrCode.trim().equalsIgnoreCase(currCode.trim()))
{ {
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1)); hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
...@@ -4369,8 +4572,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4369,8 +4572,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
amount = Double.parseDouble(genericUtility.getColumnValue("amount", dom)); amount = Double.parseDouble(genericUtility.getColumnValue("amount", dom));
exchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom)); exchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom));
valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>"); valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>");
} }
else if ((currentColumn.trim().equalsIgnoreCase("amount")) || (currentColumn.trim().equalsIgnoreCase("exch_rate"))) else if ((currentColumn.trim().equalsIgnoreCase("amount")) || (currentColumn.trim().equalsIgnoreCase("exch_rate")))
{ {
...@@ -4379,8 +4580,107 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4379,8 +4580,107 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<amount__bc>").append("<![CDATA[" + amount * exchRate + "]]>").append("</amount__bc>"); valueXmlString.append("<amount__bc>").append("<![CDATA[" + amount * exchRate + "]]>").append("</amount__bc>");
} }
valueXmlString.append("</Detail5>"); valueXmlString.append("</Detail5>");
break;
//added by monika-29-july-2019
case 6:
parentNodeList = dom.getElementsByTagName("Detail6");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
valueXmlString.append("<Detail6>");
childNodeListLength = childNodeList.getLength();
do
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if (childNodeName.equals(currentColumn))
{
if (childNode.getFirstChild() != null)
{
columnValue = childNode.getFirstChild().getNodeValue().trim();
}
}
ctr++;
}
while ((ctr < childNodeListLength) && (!childNodeName.equals(currentColumn)));
if(currentColumn.trim().equalsIgnoreCase("rcpadvbking_ref_no"))
{
refNo = genericUtility.getColumnValue("rcpadvbking_ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom);
System.out.println("rcpepc_ref_no"+refNo);
if((refNo!=null) && (refNo.trim().length()>0))
{
sql="select tran_date,curr_code__from,exch_rate,tot_amt into from advbking where tran_id=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refNo);
rs=pstmt.executeQuery();
if(rs.next())
{
refDate = rs.getDate("tran_date");
currCode = rs.getString("curr_code__from");
exchRate = rs.getDouble("exch_rate");
totAmt = rs.getDouble("tot_amt");
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select descr from currency where curr_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode);
rs = pstmt.executeQuery();
if (rs.next())
{
currDescr = rs.getString("descr");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>");
valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
valueXmlString.append("<tran_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate) + "]]>").append("</tran_date>");
valueXmlString.append("<amount>").append("<![CDATA[" + (adjAmt - totAmt) + "]]>").append("</amount>");
valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>");
tranDate = dateFormat1.parse(genericUtility.getColumnValue("tran_date", dom1));
amount = doublevalue(genericUtility.getColumnValue("amount", dom));
exchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom));
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
if (amount < 0.0D)
{
amount = Math.abs(amount);
}
if (exchRate != 1.0D)
{
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + ((amount * hexchRate )-(amount * exchRate)) + "]]>").append("</diff_amt__exch>");
}
}
}
else if ((currentColumn.trim().equalsIgnoreCase("exch_rate")) || (currentColumn.trim().equalsIgnoreCase("amount")))
{
amount = doublevalue(genericUtility.getColumnValue("amount", dom));
exchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom));
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>");
if(amount < 0.0)
{
amount = Math.abs(amount);
}
if (exchRate != 1.0D)
{
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + (amount * hexchRate - amount * exchRate) + "]]>").append("</diff_amt__exch>");
}
}
valueXmlString.append("</Detail6>");
}//end
valueXmlString.append("</Root>"); valueXmlString.append("</Root>");
} }
catch (Exception e) catch (Exception e)
...@@ -4737,7 +5037,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4737,7 +5037,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
badRev = badAmt; badRev = badAmt;
} }
else { else
{
badRev = rcpAmt; badRev = rcpAmt;
} }
...@@ -4763,13 +5064,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4763,13 +5064,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
errCode = "VTBAMTREV"; errCode = "VTBAMTREV";
} }
} }
else if (badRev != rcpAmt) else if (badRev != rcpAmt)
{ {
errCode = "VTBAMTREV"; errCode = "VTBAMTREV";
} }
} }
else else
{ {
...@@ -4777,11 +5076,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4777,11 +5076,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (badRev > badAmtMax) if (badRev > badAmtMax)
{ {
errCode = "VTBAMTREV"; errCode = "VTBAMTREV";
valueXmlString.append("").append("<![CDATA[" + badRev + "]]>").append("</bad_debt_amt>"); valueXmlString.append("").append("<![CDATA[" + badRev + "]]>").append("</bad_debt_amt>");
} }
} }
} }
} }
catch (Exception e) catch (Exception e)
......
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ 46b28b12
...@@ -445,7 +445,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -445,7 +445,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ArrayList ADetList = new ArrayList(); ArrayList ADetList = new ArrayList();
ArrayList miscRcpDetList = new ArrayList(); ArrayList miscRcpDetList = new ArrayList();
PreparedStatement pstmt = null, pstmt1 = null; PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null; ResultSet rs = null,rs1=null;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon finCommon = null; FinCommon finCommon = null;
DistCommon disCommon = null; DistCommon disCommon = null;
...@@ -696,36 +696,42 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -696,36 +696,42 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
detListSize = DetList.size(); detListSize = DetList.size();
// } // }
//changes made by monika-22-july-2019
//sql = "select ref_ser, ref_no,adj_amt,acct_code,cctr_code,exch_rate__vouch from rcpadv where tran_id = ?"; sql = "select ref_ser,ref_no,adj_amt,acct_code,cctr_code,exch_rate__vouch from rcpadv where tran_id = ?";
//added by -monika-22-july-2019
sql = "select tran_ser,ref_no,adj_amt,cust_code,acct_code,cctr_code,exch_rate from receivables where tran_id = ?";
//end
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
ADetMap = new HashMap(); ADetMap = new HashMap();
//commented by monika-22-july-2019
// ADetMap.put("ref_ser", rs.getString("ref_ser")); ADetMap.put("ref_ser", rs.getString("ref_ser"));
//changes made by monika-22-july-2019
ADetMap.put("ref_ser", rs.getString("tran_ser"));//end
ADetMap.put("ref_no", rs.getString("ref_no")); ADetMap.put("ref_no", rs.getString("ref_no"));
ADetMap.put("adj_amt", rs.getDouble("adj_amt")); ADetMap.put("adj_amt", rs.getDouble("adj_amt"));
ADetMap.put("sundry_type", "C"); ADetMap.put("sundry_type", "C");
//commented by monika-22-july-2019 //commented by monika -31-july-2019
//ADetMap.put("sundry_code", (String) RcpHdrMap.get("sundry_code")); //ADetMap.put("sundry_code", (String) RcpHdrMap.get("sundry_code"));
//changes made by monika-22-july-2019 //changes made by monika-31-july-2019
ADetMap.put("sundry_code",rs.getString("cust_code"));//end sql = "select cust_code from receivables where tran_ser=? and ref_no=?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,rs.getString("ref_ser"));
pstmt1.setString(2, rs.getString("ref_no"));
rs1= pstmt1.executeQuery();
if(rs.next())
{
ADetMap.put("sundry_code",rs.getString("cust_code"));
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
//end
ADetMap.put("acct_code", rs.getString("acct_code")); ADetMap.put("acct_code", rs.getString("acct_code"));
ADetMap.put("cctr_code", rs.getString("cctr_code")); ADetMap.put("cctr_code", rs.getString("cctr_code"));
//commented by monika-22-july-2019 ADetMap.put("exch_rate__vouch", rs.getDouble("exch_rate__vouch"));
//ADetMap.put("exch_rate__vouch", rs.getDouble("exch_rate__vouch"));
//changes made by monika-22-july-2019
ADetMap.put("exch_rate__vouch", rs.getDouble("exch_rate"));//end
ADetList.add(ADetMap); ADetList.add(ADetMap);
System.out.println(" receipt Adv Map.........."); System.out.println("receipt Adv Map..........");
System.out.println(ADetMap.toString()); System.out.println(ADetMap.toString());
} }
rs.close(); rs.close();
......
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