Skip to content

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

Gimatex- Auto adjust dr/cr note against invoice. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216671 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f9effcff
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 7 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java
View file @ 3f4ea27f
......@@ -2642,6 +2642,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{
status = "P";
}
System.out.println("AdjAmount ["+totAdjAmount+"] status[ "+status+" ] transer["+refSer+" ]ref_no["+refNo );
sql="update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + ? ),status=? where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
// pstmt.setDouble(1,amount);//commented byb monika 19 dec 2019
......@@ -2729,7 +2730,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{
pstmt.close();pstmt = null;
}
//System.out.println("@@@1@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
System.out.println("@@@1@@@update crdrrcp "+adjAmt+"total adj "+totalAmount+ "ref_ser-"+refSer+" ref_no "+refNo);
//ADDED BY MONIKA 20 DEC 19
//totalAmountCRN=adjAmt+amounthdr;
......@@ -3114,6 +3115,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
allInvAdj = 0;
invTot = 0;
invAdj = 0;
System.out.println(" REceivables adj ]111--> transer["+adjTranSer+" ]ref_no["+invoiceID );
sql = " select tot_amt, adj_amt from receivables where tran_ser = ? and ref_no = ? and (tot_amt - adj_amt) <> 0 ";
pstmt = conn.prepareStatement(sql);
......@@ -3228,10 +3230,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
//System.out.println("diffAmount"+diffAmount+"tranSer---"+tranSer);
if(diffAmount <= 0)
{
System.out.println(" REceivables adj ]222--> transer["+adjTranSer+" ]ref_no["+invoiceID );
//System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+pendAmount+"transer--"+adjTranSer);
System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+pendAmount+"transer--"+adjTranSer);
status = "A";
sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
// sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, pendAmount);
pstmt1.setString(2, status);
......@@ -3245,10 +3249,15 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
}
else
{ //System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+crAmount+"transer--"+adjTranSer);
{
System.out.println(" REceivables adj ]333--> transer["+adjTranSer+" ]ref_no["+invoiceID );
System.out.println("inside diiamount crnrcp222222"+diffAmount+"adjamount--"+crAmount+"transer--"+adjTranSer);
status = "U";
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
// sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, crAmount);
pstmt1.setString(2, status);
......@@ -3274,9 +3283,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{
status = "A";
}
//System.out.println("inside diiamount crnrcp222222 status "+status+"adjamount--"+crAmount+"transer--"+adjTranSer);
System.out.println("inside diiamount crnrcp222222 status "+status+"adjamount--"+crAmount+"transer--"+adjTranSer);
System.out.println(" REceivables adj ]444--> transer["+adjTranSer+" ]ref_no["+invoiceID );
//sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and tran_id = ? and line_no__ref = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, crAmount);
pstmt1.setString(2, status);
......
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