Commit 2b063b33 authored by msalla's avatar msalla

On confirmation of bank receipt coin difference error is coming.

This receipt is created for invoice for which bill discounting is done.(pont no:661)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209819 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8ae33821
...@@ -349,12 +349,15 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -349,12 +349,15 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
//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 //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= ? " ; 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
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,bdAmt ); /* pstmt.setDouble(1,bdAmt );
pstmt.setString(2,tranId ); pstmt.setString(2,tranId );*/
pstmt.setString(1,tranId);
//Changes and Commented by Ajay on 23/01/2018:END //Changes and Commented by Ajay on 23/01/2018:END
cnt = pstmt.executeUpdate(); cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
...@@ -371,7 +374,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -371,7 +374,7 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
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 = ? " ; //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 = ? " ;
...@@ -388,10 +391,11 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa ...@@ -388,10 +391,11 @@ public class ReceiptAdvPostSave extends ValidatorEJB implements ReceiptAdvPostSa
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//System.out.println("netAMOUNT ["+netAmt+"]" ); System.out.println("netAMOUNT ["+netAmt+"]" );
netAmt = netAmt - bdAmt; //netAmt = netAmt - bdAmt;
netAmtBc = netAmt * exchRateHdr; //netAmtBc = ( netAmt ) * exchRateHdr;
//System.out.println("netAMOUNT ["+netAmt+"] netAMOUNT ["+netAmtBc +"]"); netAmtBc = ( netAmt - bdAmt) * 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) , "
......
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