Skip to content

B
business-java
Commit 4d8654c8 authored by manohar's avatar manohar
Browse files
Options

In details 2 rounding to 3 decimals done in order to avoid scientific notation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96892 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fcc27459
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 11 deletions
webitm-fin/ibase/webitm/ejb/fin/ReceiptAdv.java
View file @ 4d8654c8
......@@ -3280,20 +3280,21 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
{
valueXmlString.append("<due_date/>");
}
valueXmlString.append("<disc_amt>").append("<![CDATA[" + discount + "]]>").append("</disc_amt>");
valueXmlString.append("<tax_amt>").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA[" + totAmt + "]]>").append("</net_amt>");
valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + badDebtAmt + "]]>").append("</bad_debt_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("<net_amt>").append("<![CDATA[" + getReqDecimal(totAmt, 3) + "]]>").append("</net_amt>");
valueXmlString.append("<bad_debt_amt>").append("<![CDATA[" + getReqDecimal(badDebtAmt, 3) + "]]>").append("</bad_debt_amt>");
advAmt = doublevalue(genericUtility.getColumnValue("adv_amt", dom1));
Double diffvalue = Double.valueOf(totAmt - adjAmt);
if((advAmt < diffvalue.doubleValue()) && (advAmt != 0.0) && (Sing(advAmt) == Sing(diffvalue.doubleValue())))
{
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + advAmt + "]]>").append("</rcp_amt>");
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal(advAmt, 3) + "]]>").append("</rcp_amt>");
rcpAmt = advAmt;
}
else
{
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + (totAmt - adjAmt) + "]]>").append("</rcp_amt>");
valueXmlString.append("<rcp_amt>").append("<![CDATA[" + getReqDecimal((totAmt - adjAmt), 3) + "]]>").append("</rcp_amt>");
rcpAmt = totAmt - adjAmt;
}
valueXmlString.append("<acct_code__ar>").append("<![CDATA[" + acctCode + "]]>").append("</acct_code__ar>");
......@@ -3310,12 +3311,12 @@ 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
//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
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
}
else
{
diffAmtExch = rcpAmt * exchRate - rcpAmt * hexchRate;
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
}
System.out.println("rcpAmt["+rcpAmt+"]exchRate["+exchRate+"]discExchRate["+discExchRate+"]diffAmtExch["+diffAmtExch+"]");
......@@ -3396,7 +3397,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
discountLc = finChg;
}
discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>");
valueXmlString.append("<fin_chg>").append("<![CDATA[" + getReqDecimal(discountLc, 3) + "]]>").append("</fin_chg>");
}
rs.close();
rs = null;
......@@ -3474,7 +3475,7 @@ 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);
System.out.println("rcp_amt change calculating diff_amt__exch rcpAmt [" + rcpAmt + "] exchRate[" + exchRate + "] hexchRate ["+ hexchRate+ "]" );
diffAmtExch = (rcpAmt * exchRate) - (rcpAmt * hexchRate);
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + diffAmtExch + "]]>").append("</diff_amt__exch>");
valueXmlString.append("<diff_amt__exch>").append("<![CDATA[" + getReqDecimal(diffAmtExch, 3) + "]]>").append("</diff_amt__exch>");
}
//valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
......@@ -3560,7 +3561,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
discountLc = finChg;
}
discountLc = Math.round(discountLc) * -1L;
valueXmlString.append("<fin_chg>").append("<![CDATA[" + discountLc + "]]>").append("</fin_chg>");
valueXmlString.append("<fin_chg>").append("<![CDATA[" + getReqDecimal(discountLc, 3) + "]]>").append("</fin_chg>");
}
......@@ -4386,4 +4387,22 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
}
}
private double getReqDecimal(double actVal, int prec)
{
String fmtStr = "############0";
String strValue = null;
double retVal = 0;
if (prec > 0)
{
fmtStr = fmtStr + "." + "000000000".substring(0, prec);
}
DecimalFormat decFormat = new DecimalFormat(fmtStr);
retVal = Double.parseDouble(decFormat.format(actVal));
if (Math.abs(retVal) == 0)
{
retVal = 0;
}
return retVal;
}
}
\ No newline at end of file
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