Skip to content

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

Bank receipt, ref_no column in packing credit/adv booking to be changed 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203986 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8c6bd28b
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 19 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ c181be87
......@@ -1636,9 +1636,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if (childNodeName.equalsIgnoreCase("ref_no"))
// if (childNodeName.equalsIgnoreCase("ref_no"))
if (childNodeName.equalsIgnoreCase("rcpadv_ref_no"))
{
refNo = this.genericUtility.getColumnValue("ref_no", dom);
// refNo = this.genericUtility.getColumnValue("ref_no", dom);
refNo = this.genericUtility.getColumnValue("rcpadv_ref_no", dom);
if(refNo != null && refNo.trim().length() > 0)
{
refSer = this.genericUtility.getColumnValue("ref_ser", dom);
......@@ -1705,7 +1707,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
else if (childNodeName.equalsIgnoreCase("adj_amt"))
{
adjAmt = Double.parseDouble(this.genericUtility.getColumnValue("adj_amt", dom));
refNo = this.genericUtility.getColumnValue("ref_no", dom);
refNo = this.genericUtility.getColumnValue("rcpadv_ref_no", dom);
refSer = this.genericUtility.getColumnValue("ref_ser", dom);
sql = "select tot_amt - adj_amt from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1743,9 +1745,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if (childNodeName.equalsIgnoreCase("ref_no"))
// if (childNodeName.equalsIgnoreCase("ref_no"))
if (childNodeName.equalsIgnoreCase("rcpepc_ref_no"))
{
refNo = this.genericUtility.getColumnValue("ref_no", dom);
//refNo = this.genericUtility.getColumnValue("ref_no", dom);
refNo = this.genericUtility.getColumnValue("rcpepc_ref_no", dom);
if(refNo != null && refNo.trim().length() > 0)
{
refSer = this.genericUtility.getColumnValue("ref_ser", dom);
......@@ -1789,8 +1793,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close();
pstmt = null;
if (Math.abs(totAmt - adjAmt) < Math.abs(amount))
if(Math.abs(totAmt - adjAmt) < Math.abs(amount))
{
errCode = "VTINVPCAMT";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
......@@ -1872,7 +1877,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
else if(childNodeName.equalsIgnoreCase("amount"))
{
amount = doublevalue(this.genericUtility.getColumnValue("amount", dom));
refNo = this.genericUtility.getColumnValue("ref_no", dom);
refNo = this.genericUtility.getColumnValue("rcpepc_ref_no", dom);
htranId = this.genericUtility.getColumnValue("tran_id", dom1);
if (amount == 0.0)
{
......@@ -1890,6 +1895,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
balAmt = rs.getDouble(1);
}
System.out.println("baklance amt"+balAmt);
rs.close();
rs = null;
pstmt.close();
......@@ -1908,7 +1914,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
Amt = 0.0;
}
System.out.println("amount is amount:::"+Amt);
rs.close();
rs = null;
pstmt.close();
......@@ -3272,7 +3278,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCodeAr + "]]>").append("</acct_code__ar>");
valueXmlString.append("<cctr_code__ar>").append("<![CDATA[" + cctrCodeAr + "]]>").append("</cctr_code__ar>");
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
//valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCodeBase + "]]>").append("</curr_code>");
bankName = (bankName== null ? "" : bankName);
valueXmlString.append("<cust_bank_ref>").append("<![CDATA[" + bankName + "]]>").append("</cust_bank_ref>");
valueXmlString.append("<acct_code__adv>").append("<![CDATA[" + acctCodeAdv + "]]>").append("</acct_code__adv>");
......@@ -3416,7 +3423,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
sql = "select std_exrt from currency where curr_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode);
// pstmt.setString(1, currCode);
pstmt.setString(1, currCodeBase);
rs = pstmt.executeQuery();
if (rs.next())
{
......@@ -4050,9 +4058,11 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
}
else if (currentColumn.trim().equalsIgnoreCase("ref_no"))
//else if (currentColumn.trim().equalsIgnoreCase("ref_no"))//commented by monika salla-23-07-2019
else if(currentColumn.trim().equalsIgnoreCase("rcpadv_ref_no"))//added by monika salla-23-07-2019
{
refNo = genericUtility.getColumnValue("ref_no", dom);
//refNo = genericUtility.getColumnValue("ref_no", dom);//commented by monika salla-23-07-2019
refNo = genericUtility.getColumnValue("rcpadv_ref_no", dom);//added by monika salla-23-07-2019
refSer = genericUtility.getColumnValue("ref_ser", dom);
sql = "select curr_code, exch_rate, acct_code, cctr_code, tot_amt, tot_amt - adj_amt from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
......@@ -4088,7 +4098,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<sale_order>").append("<![CDATA[" + saleOrder + "]]>").append("</sale_order>");
}
else if (currentColumn.trim().equalsIgnoreCase("adj_amt"))
else if(currentColumn.trim().equalsIgnoreCase("adj_amt"))
{
adv = doublevalue(genericUtility.getColumnValue("adj_amt", dom));
hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
......@@ -4123,12 +4133,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
if (currentColumn.trim().equalsIgnoreCase("itm_default"))
{
}
else if (currentColumn.trim().equalsIgnoreCase("ref_no"))
// else if (currentColumn.trim().equalsIgnoreCase("ref_no"))//commented by-Monika salla-23-july-2019
else if (currentColumn.trim().equalsIgnoreCase("rcpepc_ref_no"))//added by monika salla-23-july-2019
{
refNo = genericUtility.getColumnValue("ref_no", dom);
//refNo = genericUtility.getColumnValue("ref_no", dom); //changes done by monika-on-23 july-2019
refNo = genericUtility.getColumnValue("rcpepc_ref_no", dom);
refSer = genericUtility.getColumnValue("ref_ser", dom);
if ((refNo == null) || (refNo.trim().length() == 0)) refNo = "";
System.out.println("rcpepc_ref_no"+refNo);
if ((refNo == null) || (refNo.trim().length() == 0)) refNo = "";
{
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.setString(1, refNo);
......@@ -4152,7 +4165,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close();
pstmt = null;
sql = "select descr from currency where currency.curr_code = ?";
sql = "select descr from currency where curr_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode);
rs = pstmt.executeQuery();
......@@ -4164,7 +4177,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
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>");
......
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