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
Hide 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
......@@ -636,7 +636,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
lineNo = rs.getString("line_no");
recoAmt = rs.getDouble("reco_amount");
// System.out.println("@@acctCode ["+acctCode+"]"+"recoamt intaxtran"+recoAmt);
// System.out.println("@@acctCode ["+acctCode+"]"+"recoamt intaxtran"+recoAmt);
if(acctCode == null || acctCode.trim().length() == 0)
{
......@@ -708,7 +708,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
}
// System.out.println("@@cctrCode ["+cctrCode+"]");
// System.out.println("@@cctrCode ["+cctrCode+"]");
if(cctrCode == null || cctrCode.trim().length() == 0)
{
......@@ -717,9 +717,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
lsStr = "acct_code = '" + checkNull((acctCode)) + "' and cctr_code = '" + checkNull(cctrCode) + "'";
lineNo = String.valueOf(findLineNofromDetail(acctCode, cctrCode ,detailList));
// System.out.println("Inside detail new hashmap"+amountTotal+"recoamt@@"+recoAmt);
// System.out.println("Inside detail new hashmap"+amountTotal+"recoamt@@"+recoAmt);
// System.out.println("line No from detail"+lineNo);
// System.out.println("line No from detail"+lineNo);
if(Integer.parseInt(lineNo) == 0)
{
......@@ -735,7 +735,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap.put("amount", amountTotal - recoAmt);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
// System.out.println("Inside detail new hashmap"+amountTotal);
// System.out.println("Inside detail new hashmap"+amountTotal);
}//
else
{
......@@ -751,12 +751,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
if(Integer.parseInt(lineNo) == 0)
{
detailList.add(detMap);
// System.out.println("DetailList added MAP"+detailList);
// System.out.println("DetailList added MAP"+detailList);
}
else
{
detailList.set(Integer.parseInt(lineNo), detMap);
// System.out.println("");
// System.out.println("");
}
total = total + amount;
......@@ -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,32 +1103,32 @@ 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=" ";
}
lineNo = String.valueOf(findLineNofromDetail(acctRnd, cctrRnd ,detailList));//Need to verify this code
lineNo = String.valueOf(findLineNofromDetail(acctRnd, cctrRnd ,detailList));//Need to verify this code
if(Integer.valueOf(lineNo) == 0)
{
//li_lineno = lds_det.insertrow(0);//NVO code
lineNo = String.valueOf((detailList.size() + 1)); //Need to verify this code
}
//System.out.println("roundAdj ["+roundAdj+"]");
detMap = new HashMap();
detMap.put("tran_id", tranId);
detMap.put("line_no", lineNo);
detMap.put("acct_code", acctRnd);
detMap.put("cctr_code", cctrRnd);
detMap.put("amount", roundAdj);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
//System.out.println("detailListdetMap ["+detMap+"]");
//detailList.set(Integer.valueOf(lineNo), detMap); //commented by manish mhatre
detailList.add(detMap); //added by manish mhatre on 31-jan-2020 [For coin diff issue in salesreturn confirm]
if(Integer.valueOf(lineNo) == 0)
{
//li_lineno = lds_det.insertrow(0);//NVO code
lineNo = String.valueOf((detailList.size() + 1)); //Need to verify this code
}
//System.out.println("roundAdj ["+roundAdj+"]");
detMap = new HashMap();
detMap.put("tran_id", tranId);
detMap.put("line_no", lineNo);
detMap.put("acct_code", acctRnd);
detMap.put("cctr_code", cctrRnd);
detMap.put("amount", roundAdj);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
//System.out.println("detailListdetMap ["+detMap+"]");
//detailList.set(Integer.valueOf(lineNo), detMap); //commented by manish mhatre
detailList.add(detMap); //added by manish mhatre on 31-jan-2020 [For coin diff issue in salesreturn confirm]
//System.out.println("detailList ["+detailList+"]=="+ detailList.size());
}
......@@ -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;
......@@ -1158,7 +1158,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountHdr = (Double) hdrMap.get("amount");
// System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
// System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{
......@@ -1211,7 +1211,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
adjAmount = (Double) adjMap.get("adj_amt");
total = total + adjAmount;
// System.out.println("drcr_ADJAMOUNT--"+adjAmount+"TOTAL--"+total);
// System.out.println("drcr_ADJAMOUNT--"+adjAmount+"TOTAL--"+total);
sql = " select count(*) from receivables where cust_code = ? and tran_ser = ? and ref_no = ? " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,custCode);
......@@ -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 )
{
......@@ -1339,10 +1339,10 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Max Line>>>"+maxline);
detListSize=detailList.size();
sql="Insert into DRCR_RACCT (tran_id,line_no,acct_code,cctr_code,amount,emp_code,anal_code) values (?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
for(i = 0 ; i<detailList.size() ; i++)
......@@ -1357,7 +1357,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amount = (double) Double.parseDouble( "" +detMap.get("amount"));
empCode = (String) detMap.get("emp_code");
analCode = (String) detMap.get("anal_code");
System.out.println("Inside DRCR_RACCT insert ==>"+detMap);
pstmt.setString(1,tranId);
pstmt.setInt(2,maxline);
......@@ -1366,7 +1366,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setDouble(5,amount);
pstmt.setString(6,empCode);
pstmt.setString(7,analCode);
pstmt.addBatch();
pstmt.clearParameters();
}
......@@ -1377,8 +1377,8 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
pstmt.close();
pstmt = null;
//end manish
//end manish
errCode = postDrCrRcp(tranId, hdrMap, detailList, adjList, xtraParams, conn);
}
}
......@@ -1482,7 +1482,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
else
{
retString = postDrCrRcpDet(tranId, hdrMap, detailList , xtraParams, conn);
//System.out.println("After gbfPostRcpdet---->["+retString+"]");
}
......@@ -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))
{
......@@ -1766,7 +1766,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null;
}
sql = " select link_type, acct_code__pay, cctr_code__pay, acct_code__rcp, cctr_code__rcp "
+" from ibca_rcp_ctrl where site_code__from = ? and site_code__to = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -1792,7 +1792,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
rs.close();rs = null;
}
// System.out.println("key string ["+keyStr+"]");
// System.out.println("key string ["+keyStr+"]");
//ibcaID = generateTranId("w_rcp_ibca", loginSiteCode, currDateStr, conn);
String xmlValues = "";
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
......@@ -1988,18 +1988,18 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
return retString;
}
//update in receivblea to adjust amount
}//status close
}//closing rs.next
else {
retString = itmDBAccessEJB.getErrorString("", "VTUNCANCEL", "", "",conn);
return retString;
}//added by monika 7 dec 2019
}
}
}
}
}
}
catch(Exception e)
{
......@@ -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)
{
......@@ -3167,12 +3167,12 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
nextID = generateTranId( "w_rec_adj", siteCode, currDateStr, conn);
//System.out.println("receivables_adj"+sql);
/* sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
/* sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values(?, ?, ?, ?, ?, ?, ?, ?, ?) ";
*/
*/
sql = " insert into receivables_adj (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values(?, ?, ?, ?, ?, ?, ?, ?, ?) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, nextID);
pstmt.setString(2, tranSer);
......@@ -3183,7 +3183,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
pstmt.setString(7, adjTranSer);
pstmt.setString(8, adjRefNo);
pstmt.setString(9, tranID);
pstmt.executeUpdate();
if(pstmt!=null)
......@@ -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,11 +3230,10 @@ 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 = ? ";
// 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.
sql = " update receivables set adj_amt = adj_amt + ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";//ADDED BY MONIKA 17 FEB 2020//END
pstmt1 = conn.prepareStatement(sql);
......@@ -3251,26 +3250,25 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
else
{
System.out.println(" REceivables adj ]333--> transer["+adjTranSer+" ]ref_no["+invoiceID );
//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("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 = ? ";
//COMMENTED BY MONIKA ON 17 FEB 2020 AS COLOUMN NAME DEFINE WRONG IT SHOULD TAKE FROM REF_NO AS INVOICE _ID IS PASSED.
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";//ADDED BY MONIKA 17 FEB 2020//END
status = "U";
// 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.
sql = " update receivables set adj_amt = adj_amt - ?, status = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";//ADDED BY MONIKA 17 FEB 2020//END
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, crAmount);
pstmt1.setString(2, status);
pstmt1.setString(3, adjTranSer);
pstmt1.setString(4, invoiceID);
pstmt1.setString(5, ""+cnt);
pstmt1.executeUpdate();
if(pstmt!=null)
{
pstmt.close();pstmt = null;
}
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, crAmount);
pstmt1.setString(2, status);
pstmt1.setString(3, adjTranSer);
pstmt1.setString(4, invoiceID);
pstmt1.setString(5, ""+cnt);
pstmt1.executeUpdate();
if(pstmt!=null)
{
pstmt.close();pstmt = null;
}
}
//System.out.println("inside diiamount crnrcp33332"+diffAmount+"adjamount--"+crAmount+"transer--"+adjTranSer);
......@@ -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