Skip to content

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

In Bank receipt if user adds the charges in 4th screen and keep the flag... 

In Bank receipt if user adds the charges in 4th screen and keep the flag effect to Y then accounting effect is not posting properly

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207438 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e9747b4d
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 52 deletions
webitm-fin/src/ibase/webitm/ejb/fin/ReceiptAdvPostSave.java
View file @ b95c3627
...@@ -77,14 +77,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -77,14 +77,14 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
String bdFluctuationCf=""; String bdFluctuationCf="";
String sql1 =""; String sql1 ="";
String errorString=""; String errorString="";
double rcpAmt=0,finChg=0, diffAmtExchDet = 0, diffAmtExchAdv = 0, diffAmtExchEpc = 0, newAdvAmt = 0,epcAdjAmount=0; double rcpAmt=0,finChg=0, diffAmtExchDet = 0, diffAmtExchAdv = 0, diffAmtExchEpc = 0, newAdvAmt = 0,epcAdjAmount=0;
double billAmtDet = 0, advAmtHdr = 0, adjAmtAdv = 0, bdAmt =0, advAmtRact = 0, othAmt = 0.0,exchRateHdr = 0.0, taxAmt = 0,amount = 0.0,othAmttemp =0.0; double billAmtDet = 0, advAmtHdr = 0, adjAmtAdv = 0, bdAmt =0, advAmtRact = 0, othAmt = 0.0,exchRateHdr = 0.0, taxAmt = 0,amount = 0.0,othAmttemp =0.0;
int cnt=0; int cnt=0;
try try
{ {
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
// GenericUtility genericUtility = GenericUtility.getInstance(); // GenericUtility genericUtility = GenericUtility.getInstance();
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
dom = genericUtility.parseString(domString); dom = genericUtility.parseString(domString);
...@@ -106,7 +106,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -106,7 +106,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
bdFluctuationCf=checkNull(finCommon.getFinparams("999999","BD_FLUCTUATION_CF",conn));//added by sagar on 21/08/14.. bdFluctuationCf=checkNull(finCommon.getFinparams("999999","BD_FLUCTUATION_CF",conn));//added by sagar on 21/08/14..
System.out.println(">>>>>>>>>>>>>>Finparam varValue:"+varValue); System.out.println(">>>>>>>>>>>>>>Finparam varValue:"+varValue);
if(bdFluctuationCf == null || bdFluctuationCf.trim().equalsIgnoreCase("NULLFOUND")) if(bdFluctuationCf == null || bdFluctuationCf.trim().equalsIgnoreCase("NULLFOUND"))
...@@ -116,8 +116,8 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -116,8 +116,8 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
if("N".equals(bdFluctuationCf.trim())) //Condition added by sagar on 21/08/14.. if("N".equals(bdFluctuationCf.trim())) //Condition added by sagar on 21/08/14..
{ {
sql="UPDATE rcpdet set exch_rate = ? " sql="UPDATE rcpdet set exch_rate = ? "
+" WHERE tran_id = ? " +" WHERE tran_id = ? "
+ " and (curr_code = ? or exch_rate is null) "; + " and (curr_code = ? or exch_rate is null) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,exchRateHdr ); pstmt.setDouble(1,exchRateHdr );
pstmt.setString(2,tranId ); pstmt.setString(2,tranId );
...@@ -125,10 +125,10 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -125,10 +125,10 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql="UPDATE rcpdet set diff_amt__exch = (rcp_amt * EXCH_RATE__RCV) - (rcp_amt * exch_rate) " sql="UPDATE rcpdet set diff_amt__exch = (rcp_amt * EXCH_RATE__RCV) - (rcp_amt * exch_rate) "
+" WHERE tran_id = ? " +" WHERE tran_id = ? "
+ " and (curr_code = ? or exch_rate is null) "; + " and (curr_code = ? or exch_rate is null) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId ); pstmt.setString(1,tranId );
pstmt.setString(2,currCode ); pstmt.setString(2,currCode );
...@@ -136,7 +136,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -136,7 +136,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
sql="select sum(diff_amt__exch), sum(tax_amt),sum(fin_chg) from rcpdet WHERE tran_id = ? " ; sql="select sum(diff_amt__exch), sum(tax_amt),sum(fin_chg) from rcpdet WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId ); pstmt.setString(1,tranId );
...@@ -146,7 +146,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -146,7 +146,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
diffAmtExchDet = rs.getDouble(1); diffAmtExchDet = rs.getDouble(1);
taxAmt = rs.getDouble(2); taxAmt = rs.getDouble(2);
finChg = rs.getDouble(3); finChg = rs.getDouble(3);
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -196,13 +196,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -196,13 +196,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
//Added by sarita as preparestatement not closed on 20 AUG 18 [END] //Added by sarita as preparestatement not closed on 20 AUG 18 [END]
sql1 ="select sum(amount * exch_rate ) oth_amt from rcpacct WHERE tran_id = ? AND eff_bank <> 'N'"; sql1 ="select sum(amount * exch_rate ) oth_amt from rcpacct WHERE tran_id = ? AND eff_bank <> 'N'";
pstmt = conn.prepareStatement(sql1); pstmt = conn.prepareStatement(sql1);
pstmt.setString(1,tranId ); pstmt.setString(1,tranId );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
othAmttemp = rs.getDouble(1); othAmttemp = rs.getDouble(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -211,13 +211,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -211,13 +211,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
System.out.println("Other Amount Temp before division>>>>" + othAmttemp); System.out.println("Other Amount Temp before division>>>>" + othAmttemp);
if(othAmttemp != 0) if(othAmttemp != 0)
{ {
othAmt = (othAmttemp /exchRateHdr); othAmt = (othAmttemp /exchRateHdr);
} }
System.out.println("ExchangeRate hdr after division>>>>>" + exchRateHdr); System.out.println("ExchangeRate hdr after division>>>>>" + exchRateHdr);
System.out.println("Other Amount after division>>>>>" + othAmt); System.out.println("Other Amount after division>>>>>" + othAmt);
sql="UPDATE receipt SET oth_amt = ?, tax_amt = ? , fin_chg = ? WHERE tran_id = ? " ; sql="UPDATE receipt SET oth_amt = ?, tax_amt = ? , fin_chg = ? WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -226,7 +226,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -226,7 +226,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
pstmt.setDouble(2,taxAmt ); pstmt.setDouble(2,taxAmt );
pstmt.setDouble(3,finChg ); pstmt.setDouble(3,finChg );
pstmt.setString(4,tranId ); pstmt.setString(4,tranId );
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -266,7 +266,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -266,7 +266,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
+ " and r.line_no__ref = d.line_no__ref " + " and r.line_no__ref = d.line_no__ref "
+ " and h.tran_id = ? " ; + " and h.tran_id = ? " ;
} }
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId ); pstmt.setString(1,tranId );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -285,18 +285,18 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -285,18 +285,18 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
// 25/02/14 manoharan if all details are dropped t6he bill_amt should be 0 // 25/02/14 manoharan if all details are dropped t6he bill_amt should be 0
//if (chqAmt != 0) //if (chqAmt != 0)
//{ //{
//sql="UPDATE receipt SET bill_amt = ?, ADVADJ_AMT = ? WHERE tran_id = ? " ; //sql="UPDATE receipt SET bill_amt = ?, ADVADJ_AMT = ? WHERE tran_id = ? " ;
//commented by monika 0n 8 aug 19 //commented by monika 0n 8 aug 19
//addedd by monika 8 aug 2019 //addedd by monika 8 aug 2019
sql="UPDATE receipt SET bill_amt = ?, ADVADJ_AMT = ?,EFUNDADJ_AMT=? WHERE tran_id = ? " ;//end sql="UPDATE receipt SET bill_amt = ?, ADVADJ_AMT = ?,EFUNDADJ_AMT=? WHERE tran_id = ? " ;//end
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,chqAmt ); pstmt.setDouble(1,chqAmt );
pstmt.setDouble(2,adjAmtAdv); pstmt.setDouble(2,adjAmtAdv);
pstmt.setDouble(3,epcAdjAmount);//added by monika to update amount-8 august 2019 pstmt.setDouble(3,epcAdjAmount);//added by monika to update amount-8 august 2019
pstmt.setString(4,tranId ); pstmt.setString(4,tranId );
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//} //}
System.out.println("05/07/14 bill_amt ["+ chqAmt +"] billAmtDet [" + billAmtDet + "] advadj_amt [" + adjAmtAdv +"] oth_amt [" + othAmt + "] taxAmt [" + taxAmt + "] diffAmtExchDet [" + diffAmtExchDet + "] diffAmtExchAdv [" + diffAmtExchAdv + "] diffAmtExchEpc [" + diffAmtExchEpc + "]" ); System.out.println("05/07/14 bill_amt ["+ chqAmt +"] billAmtDet [" + billAmtDet + "] advadj_amt [" + adjAmtAdv +"] oth_amt [" + othAmt + "] taxAmt [" + taxAmt + "] diffAmtExchDet [" + diffAmtExchDet + "] diffAmtExchAdv [" + diffAmtExchAdv + "] diffAmtExchEpc [" + diffAmtExchEpc + "]" );
// 21/03/14 manoharan update advance // 21/03/14 manoharan update advance
...@@ -306,17 +306,19 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -306,17 +306,19 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
// 30/06/14 manoharan not to deduct dbamt // 30/06/14 manoharan not to deduct dbamt
//Changes and commented by Ajay on 23/01/2018:START //Changes and commented by Ajay on 23/01/2018:START
//commented by monika-26-july-2019... //commented by monika-26-july-2019...
//sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) from receipt WHERE tran_id = ? " ; //sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) from receipt WHERE tran_id = ? " ;
//changes done-monika-26-july-2019-as tax_amt is already added //changes done-monika-26-july-2019-as tax_amt is already added
sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)) from receipt WHERE tran_id = ? " ; // sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)) from receipt WHERE tran_id = ? " ;
//CHANGES BY MONIKA 14 SEPT 2019 for accounting effect
sql="select chq_amt -((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when fin_chg is null then 0 else fin_chg end)) from receipt WHERE tran_id = ? " ;
//end //end
//sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end) + (case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) from receipt WHERE tran_id = ? " ; //Added advadjamtount in formulla by manoj dtd 27/06/2016 //sql="select chq_amt - ((case when bill_amt is null then 0 else bill_amt end) + (case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) from receipt WHERE tran_id = ? " ; //Added advadjamtount in formulla by manoj dtd 27/06/2016
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,bdAmt ); pstmt.setDouble(1,bdAmt );
pstmt.setString(2,tranId ); pstmt.setString(2,tranId );
//Changes and commented by Ajay on 23/01/2018:END //Changes and commented by Ajay on 23/01/2018:END
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -332,24 +334,23 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -332,24 +334,23 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
//Pavan R 26Jul19 commented below error msg and uncommented exception throw logic //Pavan R 26Jul19 commented below error msg and uncommented exception throw logic
//errorString=itmDBAccessEJB.getErrorString("","VTNEGADV","","",conn); //errorString=itmDBAccessEJB.getErrorString("","VTNEGADV","","",conn);
//System.out.println("errorString :"+errorString); //System.out.println("errorString :"+errorString);
// throw new Exception("Advance amount calculated is becoming negative [" + newAdvAmt + "]" ); // throw new Exception("Advance amount calculated is becoming negative [" + newAdvAmt + "]" );
// added by monika s -on 3 sept 2019-- TO CHECK HEADER AMOUNT WITH DETAIL AMOUNT // added by monika s -on 3 sept 2019-- TO CHECK HEADER AMOUNT WITH DETAIL AMOUNT
errorString=itmDBAccessEJB.getErrorString("","VTINADJAMT","","",conn); //end errorString=itmDBAccessEJB.getErrorString("","VTINADJAMT","","",conn); //end
System.out.println("errorString message:"+errorString); System.out.println("errorString message:"+errorString);
} }
// end 29/05/14 manoharan // end 29/05/14 manoharan
// 30/06/14 manoharan not to deduct dbamt // 30/06/14 manoharan not to deduct dbamt
//Changes and Commented by Ajay on 23/01/2018:START //Changes and Commented by Ajay on 23/01/2018:START
//Changes and Commented-monika-26-july-2019 //Changes and Commented-monika-26-july-2019
//sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)+ tax_amt) WHERE tran_id= ? " ; //sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)+ tax_amt) WHERE tran_id= ? " ;
//changes done-monika s-26-july-2019-as tax_amt is already added //changes done-monika s-26-july-2019-as tax_amt is already added
sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)) WHERE tran_id= ? " ; //sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? - (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end)) WHERE tran_id= ? " ;
//changes done-Monika s-14-sept-2019- for account effect
sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when fin_chg is null then 0 else fin_chg end)) WHERE tran_id= ? " ;
//end //end
//sql="UPDATE receipt SET adv_amt = chq_amt - ((case when bill_amt is null then 0 else bill_amt end) +(case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) WHERE tran_id = ? " ;//Added advadjamtount in formulla by manoj dtd 27/06/2016
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,bdAmt ); pstmt.setDouble(1,bdAmt );
...@@ -367,10 +368,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -367,10 +368,13 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
// - (case when bill_disc_amt is null then 0 else bill_disc_amt end) removed on 21/01/14 // - (case when bill_disc_amt is null then 0 else bill_disc_amt end) removed on 21/01/14
//change done by kunal on 01/feb/14 minus bill_disc_amt //change done by kunal on 01/feb/14 minus bill_disc_amt
diffAmtExchTotal = diffAmtExchDet + diffAmtExchAdv + diffAmtExchEpc; diffAmtExchTotal = diffAmtExchDet + diffAmtExchAdv + diffAmtExchEpc;
sql="select ((case when adv_amt is null then 0 else adv_amt end)+ (case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) net_amt from receipt WHERE tran_id = ? " ; sql="select ((case when adv_amt is null then 0 else adv_amt end)+ (case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) net_amt from receipt WHERE tran_id = ? " ;
//sql="select ((case when adv_amt is null then 0 else adv_amt end)+ (case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) net_amt from receipt WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//pstmt.setDouble(1,bdAmt ); //pstmt.setDouble(1,bdAmt );
...@@ -384,9 +388,10 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -384,9 +388,10 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//System.out.println("netAMOUNT ["+netAmt+"]" );
netAmt = netAmt - bdAmt; netAmt = netAmt - bdAmt;
netAmtBc = netAmt * exchRateHdr; netAmtBc = netAmt * exchRateHdr;
//System.out.println("netAMOUNT ["+netAmt+"] netAMOUNT ["+netAmtBc +"]");
/* /*
sql="UPDATE receipt SET DIFF_AMT__EXCH = ? + ? + ?, net_amt = ((case when adv_amt is null then 0 else adv_amt end)+ (case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) , " sql="UPDATE receipt SET DIFF_AMT__EXCH = ? + ? + ?, net_amt = ((case when adv_amt is null then 0 else adv_amt end)+ (case when bill_amt is null then 0 else bill_amt end)+ (case when advadj_amt is null then 0 else advadj_amt end) - ? + (case when oth_amt is null then 0 else oth_amt end) + (case when fin_chg is null then 0 else fin_chg end) + tax_amt) , "
...@@ -404,7 +409,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -404,7 +409,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/ */
sql="UPDATE receipt SET DIFF_AMT__EXCH = ? , net_amt = ? , net_amt__bc = ?, bill_disc_amt = ? WHERE tran_id = ? " ; sql="UPDATE receipt SET DIFF_AMT__EXCH = ? , net_amt = ? , net_amt__bc = ?, bill_disc_amt = ? WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -421,7 +426,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -421,7 +426,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
{ {
System.out.println("update successfully ["+cnt+"]"); System.out.println("update successfully ["+cnt+"]");
} }
if( cnt > 0) if( cnt > 0)
{ {
System.out.println("update successfully ["+cnt+"]"); System.out.println("update successfully ["+cnt+"]");
...@@ -469,7 +474,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -469,7 +474,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -489,7 +494,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -489,7 +494,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
} }
System.out.println("Out DcdetPostSaveEJB ... "); System.out.println("Out DcdetPostSaveEJB ... ");
return errorString; return errorString;
} }
private java.math.BigDecimal round(int scale ,double round) private java.math.BigDecimal round(int scale ,double round)
{ {
return new java.math.BigDecimal(round).setScale(scale, java.math.BigDecimal.ROUND_UP); return new java.math.BigDecimal(round).setScale(scale, java.math.BigDecimal.ROUND_UP);
......
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ b95c3627
...@@ -424,13 +424,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -424,13 +424,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double amtRev = 0.0; double amtRev = 0.0;
double badAmt = 0.0; double badAmt = 0.0;
double totBc = 0.0,taxAmt=0.0; double totBc = 0.0,taxAmt=0.0;
double chq = 0.0; double chq = 0.0,othAmt=0.0;
int i = 0; int i = 0;
int cnt = 0 ; int cnt = 0 ;
int maxline = 0; int maxline = 0;
int cnt1 = 0 , findIndex = -1; int cnt1 = 0 , findIndex = -1;
Date tranDate = null; Date tranDate = null;
HashMap RcpHdrMap = null; HashMap RcpHdrMap = null;
HashMap DetMap = null; HashMap DetMap = null;
HashMap RcpDetMap = null; HashMap RcpDetMap = null;
...@@ -458,7 +458,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -458,7 +458,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
java.sql.Timestamp today = null; java.sql.Timestamp today = null;
java.util.Date date = null; java.util.Date date = null;
GenericUtility genericUtility = new GenericUtility(); GenericUtility genericUtility = new GenericUtility();
//Ended by varsha v for truncating time from tran_date on 07-05-18 //Ended by varsha v for truncating time from tran_date on 07-05-18
try try
{ {
finCommon = new FinCommon(); finCommon = new FinCommon();
...@@ -2076,7 +2076,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2076,7 +2076,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//changes made-by-monika-30-may-2019 //changes made-by-monika-30-may-2019
chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) ); chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) );
//end //end
//addded by monika-27 july-2019 //addded by monika-27 july-2019 for tax amt
taxAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt")) ); taxAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt")) );
//end //end
// if EPC adjusted in same currency then // if EPC adjusted in same currency then
...@@ -2087,12 +2087,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2087,12 +2087,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ; chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ;
} }
//commented by monika -27 july-2019 //commented by monika -27 july-2019
//System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]"); //System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]");
//if(Math.abs(chq - total) > 1) //if(Math.abs(chq - total) > 1)
//changes by monika-27 july-2019 //changes by monika-27 july-2019
System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - (total -taxAmt) ) +"]"); System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - (total -taxAmt) ) +"]");
if(Math.abs(chq - (total - taxAmt)) > 1)//end //if(Math.abs(chq - (total - taxAmt)) > 1)
//added by monika on 14 sept 2019 for accounting effect--
othAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt")));
// System.out.println("chq and ["+chq+"] total ["+total + "] other_amount ]"+othAmt+" ] diff [" + Math.abs(chq - (total -taxAmt)+othAmt ) +"]");
if(Math.abs(chq - (total - taxAmt)+othAmt) > 1)//end
{ {
errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn); errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn);
conn.rollback(); conn.rollback();
......
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