Skip to content

B
business-java
Commit 4617e5b1 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@204801 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bd64de98
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 39 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ 4617e5b1
...@@ -251,10 +251,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -251,10 +251,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}*/ }*/
tranDateS = this.genericUtility.getColumnValue("tran_date", dom);
siteCode = this.genericUtility.getColumnValue("site_code", dom);
tranDate = Timestamp.valueOf(genericUtility.getValidDateString(tranDateS, tranDate = Timestamp.valueOf(genericUtility.getValidDateString(tranDateS,
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
...@@ -1720,12 +1716,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1720,12 +1716,12 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
}//end }//end
else /*else
{ {
errCode = "VMREF1"; errCode = "VMREF1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }*/
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -1955,7 +1951,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -1955,7 +1951,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (Math.abs(amount) + Math.abs(Amt) > balAmt) if ((Math.abs(amount) + Math.abs(Amt)) > Math.abs(balAmt))
{ {
errCode = "VTINVPCAMT"; errCode = "VTINVPCAMT";
errList.add(errCode); errList.add(errCode);
...@@ -2216,9 +2212,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2216,9 +2212,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{ {
exchRate=0; exchRate=0;
} }
if((!currCode.trim().equals(currCodeHdr.trim())) && (exchRate!=1)) if(!currCode.trim().equalsIgnoreCase(hcurrCode.trim()) && (exchRate != 1.0))
{ {
errCode="VMCURRCD1"; errCode = "VTCUR3";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
...@@ -2270,15 +2266,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2270,15 +2266,14 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if (Math.abs(amount) + Math.abs(Amt) > balAmt)
/*if (Math.abs(amount) + Math.abs(Amt) > Math.abs(balAmt))
{ {
errCode = "VTINVPCAMT"; errCode = "VTINVPCAMT";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }*/
else if((Math.abs(amount) + Math.abs(pendingAmt))>Math.abs(balAmt))
{
if((Math.abs(amount) + Math.abs(pendingAmt))>balAmt)
{ {
errCode="VTADVBKAMT"; errCode="VTADVBKAMT";
errList.add(errCode); errList.add(errCode);
...@@ -2327,7 +2322,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2327,7 +2322,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
} }
}
} }
} }
valueXmlString.append("</Detail6>"); valueXmlString.append("</Detail6>");
...@@ -3947,22 +3942,31 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3947,22 +3942,31 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<due_date/>"); valueXmlString.append("<due_date/>");
} }
valueXmlString.append("<disc_amt>").append("<![CDATA[" + getReqDecimal(discount, 3) + "]]>").append("</disc_amt>"); /*valueXmlString.append("<disc_amt>").append("<![CDATA[" + getReqDecimal(discount, 3) + "]]>").append("</disc_amt>");
valueXmlString.append("<tax_amt>").append("<![CDATA[" + getReqDecimal(taxAmt, 3) + "]]>").append("</tax_amt>"); valueXmlString.append("<tax_amt>").append("<![CDATA[" + getReqDecimal(taxAmt, 3) + "]]>").append("</tax_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA[" + getReqDecimal(totAmt, 3) + "]]>").append("</net_amt>"); valueXmlString.append("<net_amt>").append("<![CDATA[" + getReqDecimal(totAmt, 3) + "]]>").append("</net_amt>");
valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + getReqDecimal(badDebtAmt, 3) + "]]>").append("</bad_debt_amt>"); valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + getReqDecimal(badDebtAmt, 3) + "]]>").append("</bad_debt_amt>");*/
// added by pavan rane on 02/aug/19
valueXmlString.append("<disc_amt>").append("<![CDATA[" + utl.getReqDecString(discount, 3) + "]]>").append("</disc_amt>");
valueXmlString.append("<tax_amt>").append("<![CDATA[" + utl.getReqDecString(taxAmt, 3) + "]]>").append("</tax_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA[" + utl.getReqDecString(totAmt, 3) + "]]>").append("</net_amt>");
valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + utl.getReqDecString(badDebtAmt, 3) + "]]>").append("</bad_debt_amt>");
advAmt = doublevalue(genericUtility.getColumnValue("adv_amt", dom1)); advAmt = doublevalue(genericUtility.getColumnValue("adv_amt", dom1));
Double diffvalue = Double.valueOf(totAmt - adjAmt); Double diffvalue = Double.valueOf(totAmt - adjAmt);
if((advAmt < diffvalue.doubleValue()) && (advAmt != 0.0) && (Sing(advAmt) == Sing(diffvalue.doubleValue()))) if((advAmt < diffvalue.doubleValue()) && (advAmt != 0.0) && (Sing(advAmt) == Sing(diffvalue.doubleValue())))
{ {
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal(advAmt, 3) + "]]>").append("</rcp_amt>"); //valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal(advAmt, 3) + "]]>").append("</rcp_amt>");
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + utl.getReqDecString(advAmt, 3) + "]]>").append("</rcp_amt>"); // added by pavan rane on 02/aug/19
rcpAmt = advAmt; rcpAmt = advAmt;
System.out.println("Rcp Amt if(advAmt < diffvalue)"+ rcpAmt); System.out.println("Rcp Amt if(advAmt < diffvalue)"+ rcpAmt);
} }
else else
{ {
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>");
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + utl.getReqDecString(((totAmt - adjAmt)), 3) + "]]>").append("</rcp_amt>"); // added by pavan rane on 02/aug/19
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>");
...@@ -3979,12 +3983,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3979,12 +3983,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<exch_rate>").append("<![CDATA[" + discExchRate + "]]>").append("</exch_rate>"); // change by ritesh on 25/05/13 as per discussion with pravin valueXmlString.append("<exch_rate>").append("<![CDATA[" + discExchRate + "]]>").append("</exch_rate>"); // change by ritesh on 25/05/13 as per discussion with pravin
//diffAmtExch = (rcpAmt * exchRate - rcpAmt * discExchRate)-((Double.parseDouble(lcBillDescAmt) * exchRate) - (Double.parseDouble(lcBillDescAmt) * discExchRate)); //diffAmtExch = (rcpAmt * exchRate - rcpAmt * discExchRate)-((Double.parseDouble(lcBillDescAmt) * exchRate) - (Double.parseDouble(lcBillDescAmt) * discExchRate));
diffAmtExch = (rcpAmt * exchRate - rcpAmt * discExchRate)+((Double.parseDouble(lcBillDescAmt)-rcpAmt)*(exchRate-discExchRate));//Changed by Manoj dtd 22/08/2014 to Consider Bill Discount Exchrate difference diffAmtExch = (rcpAmt * exchRate - rcpAmt * discExchRate)+((Double.parseDouble(lcBillDescAmt)-rcpAmt)*(exchRate-discExchRate));//Changed by Manoj dtd 22/08/2014 to Consider Bill Discount Exchrate difference
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); // valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + utl.getReqDecString(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); // added by pavan rane on 02/aug/19
} }
else else
{ {
diffAmtExch = rcpAmt * exchRate - rcpAmt * hexchRate; diffAmtExch = rcpAmt * exchRate - rcpAmt * hexchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); //valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + utl.getReqDecString(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); // added by pavan rane on 02/aug/19
} }
System.out.println("rcpAmt["+rcpAmt+"]exchRate["+exchRate+"]discExchRate["+discExchRate+"]diffAmtExch["+diffAmtExch+"]"); System.out.println("rcpAmt["+rcpAmt+"]exchRate["+exchRate+"]discExchRate["+discExchRate+"]diffAmtExch["+diffAmtExch+"]");
...@@ -4147,7 +4154,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4147,7 +4154,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
hexchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom)); //finCommon.getDailyExchRateSellBuy(currCode,"",siteCode, genericUtility.getColumnValue("tran_date", dom1), "S", conn); hexchRate = Double.parseDouble(genericUtility.getColumnValue("exch_rate", dom)); //finCommon.getDailyExchRateSellBuy(currCode,"",siteCode, genericUtility.getColumnValue("tran_date", dom1), "S", conn);
System.out.println("rcp_amt change calculating diff_amt__exch rcpAmt [" + rcpAmt + "] exchRate[" + exchRate + "] hexchRate ["+ hexchRate+ "]" ); System.out.println("rcp_amt change calculating diff_amt__exch rcpAmt [" + rcpAmt + "] exchRate[" + exchRate + "] hexchRate ["+ hexchRate+ "]" );
diffAmtExch = (rcpAmt * exchRate) - (rcpAmt * hexchRate); diffAmtExch = (rcpAmt * exchRate) - (rcpAmt * hexchRate);
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); //valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + utl.getReqDecString(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>"); // added by pavan rane on 02/aug/19
} }
//valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA[" + siteCode + "]]>").append("</site_code>"); //valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
...@@ -4238,8 +4247,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4238,8 +4247,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
discountLc = finChg; discountLc = finChg;
} }
discountLc = Math.round(discountLc) * -1L; discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + getReqDecimal(discountLc, 3) + "]]>").append("</fin_chg>"); //valueXmlString.append("<fin_chg>").append("<![CDATA[" + getReqDecimal(discountLc, 3) + "]]>").append("</fin_chg>");
valueXmlString.append("<fin_chg>").append("<![CDATA[" + utl.getReqDecString(discountLc, 3) + "]]>").append("</fin_chg>"); // added by pavan rane on 02/aug/19
} }
} }
...@@ -4619,7 +4628,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4619,7 +4628,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
refDate = rs.getDate("tran_date"); refDate = rs.getTimestamp("tran_date");
currCode = rs.getString("curr_code__from"); currCode = rs.getString("curr_code__from");
exchRate = rs.getDouble("exch_rate"); exchRate = rs.getDouble("exch_rate");
totAmt = rs.getDouble("tot_amt"); totAmt = rs.getDouble("tot_amt");
...@@ -4628,7 +4637,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4628,7 +4637,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "select descr from currency where curr_code = ?"; sql = "select descr from currency where curr_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode); pstmt.setString(1, currCode);
...@@ -4646,21 +4654,20 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -4646,21 +4654,20 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>"); valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>");
valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
valueXmlString.append("<tran_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate) + "]]>").append("</tran_date>"); valueXmlString.append("<tran_date>").append("<![CDATA[" + simpleDateFormat.format(refDate) + "]]>").append("</tran_date>");
valueXmlString.append("<amount>").append("<![CDATA[" + (adjAmt - totAmt) + "]]>").append("</amount>"); valueXmlString.append("<amount>").append("<![CDATA[" + totAmt + "]]>").append("</amount>");
valueXmlString.append("<amount__bc>").append("<![CDATA[" + (amount * exchRate) + "]]>").append("</amount__bc>"); valueXmlString.append("<amount__bc>").append("<![CDATA[" + (totAmt * 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)); hexchRate = doublevalue(genericUtility.getColumnValue("exch_rate", dom1));
if (amount < 0.0D)
if (totAmt < 0.0D)
{ {
amount = Math.abs(amount); totAmt = Math.abs(totAmt);
} }
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[" + ((totAmt * hexchRate )-(totAmt * exchRate)) + "]]>").append("</diff_amt__exch>");
} }
} }
} }
......
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