Skip to content

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

Gimatex- Auto adjust dr/cr note against invoice. 

//COMMENT ADDED

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216674 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 24ed4a1e
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 81 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java
View file @ 45301096
......@@ -1088,7 +1088,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
roundAdj = (Double) hdrMap.get("round_adj");
// System.out.println("@@roundAdj["+roundAdj+"]@@amount["+hdrMap.get("amount")+"]@@amountbc--"+hdrMap.get("amount__bc"));
// System.out.println("@@roundAdj["+roundAdj+"]@@amount["+hdrMap.get("amount")+"]@@amountbc--"+hdrMap.get("amount__bc"));
if(roundAdj != 0)
{
......@@ -1103,7 +1103,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
//System.out.println("@@cctrRnd["+cctrRnd+"]");
// System.out.println("detailList1213 ["+detailList+"]=="+ detailList.size());
// System.out.println("detailList1213 ["+detailList+"]=="+ detailList.size());
if(cctrRnd == null || cctrRnd.length() == 0 || " ".equals(cctrRnd))
{
cctrRnd=" ";
......@@ -1150,7 +1150,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap = (HashMap) detailList.get(x);
amountDet = (Double) detMap.get("amount");
// System.out.println("amountDet from detail["+detMap.get("amount")+"]"+"amountDet["+amountDet+"]");
// System.out.println("amountDet from detail["+detMap.get("amount")+"]"+"amountDet["+amountDet+"]");
total = total + amountDet;
......@@ -1315,7 +1315,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountHdr = (Double)hdrMap.get("amount");
// System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]");
// System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{
......@@ -1652,12 +1652,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
//end
// System.out.println("After POST_ON_LINE retString["+retString+"] RunMode["+gs_run_mode+"]");
//System.out.println("After POST_ON_LINE retString["+retString+"] RunMode["+gs_run_mode+"]");
if("I".equals(gs_run_mode) && (retString == null || retString.trim().length() == 0))
{
invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn));
// System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
//System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen))
{
......@@ -2642,7 +2642,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
{
status = "P";
}
System.out.println("AdjAmount ["+totAdjAmount+"] status[ "+status+" ] transer["+refSer+" ]ref_no["+refNo );
//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
......@@ -2730,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;
......@@ -3115,7 +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 );
//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);
......@@ -3142,7 +3142,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null;
}
System.out.println("allInvTot["+allInvTot+"] allInvAdj["+allInvAdj+"] diffAmount["+diffAmount+"] invTot["+invTot+"] invAdj["+invAdj+"]");
//System.out.println("allInvTot["+allInvTot+"] allInvAdj["+allInvAdj+"] diffAmount["+diffAmount+"] invTot["+invTot+"] invAdj["+invAdj+"]");
if(allInvTot == 0 && allInvAdj == 0)
{
......@@ -3206,8 +3206,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
cnt = 0;
sql = " select tot_amt, adj_amt from receivables where tran_ser = ? and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,tranSer);
// 13-Feb-2020 monika salla -invoice list being adjusted so it has to be S-INV
//pstmt.setString(1,tranSer);
//13-Feb-2020 monika salla -invoice list being adjusted so it has to be S-INV
pstmt.setString(1,adjTranSer); // 13-Feb-2020 monika- invoice list being adjusted so it has to be S-INV
pstmt.setString(2,invoiceID);
rs = pstmt.executeQuery();
......@@ -3230,9 +3230,8 @@ 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(" REceivables adj ]222--> transer["+adjTranSer+" ]ref_no["+invoiceID );
//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 = ? ";
//COMMENTED BY MONIKA ON 17 FEB 2020 AS COLOUMN NAME DEFINE WRONG IT SHOULD TAKE FROM REF_NO AS INVOICE _ID IS PASSED.
......@@ -3251,9 +3250,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
else
{
System.out.println(" REceivables adj ]333--> transer["+adjTranSer+" ]ref_no["+invoiceID );
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 = ? ";
......@@ -3285,8 +3283,8 @@ 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(" REceivables adj ]444--> transer["+adjTranSer+" ]ref_no["+invoiceID );
//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 = ? ";
//COMMENTED BY MONIKA ON 17 FEB 2020 AS COLOUMN NAME DEFINE WRONG IT SHOULD TAKE FROM REF_NO AS INVOICE _ID IS PASSED.
......
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