Skip to content

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

We created bank receipt and mention the contract number in header. But When... 

We created bank receipt and mention the contract number in header. But When bank receipt is confirmed then balance amount of advance booking is not updating. 4) system should not allow to use advance booking if balance is not available 5) receipt dishnor is created for receipt where advance booking is used then amount used in receipt needs to be reversed from balance amount.(ponit no 610)

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@209188 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a7503a3c
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 114 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ 49786aa7
......@@ -46,7 +46,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
try
{
retString = confirm( tranID, xtraParams, forcedFlag, conn ,isPreview);
System.out.println("retString--123-- ["+retString+"]");
//System.out.println("retString--123-- ["+retString+"]");
//Modified by Anjali R. on [05/10/2018][In case of success prompt,system should not throw exception][Start]
//if ( retString != null && retString.length() > 0 )
//Commented by sarita on 23 NOV 2018 [START]
......@@ -63,7 +63,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else if(retString != null && retString.length() > 0 && retString.indexOf("VTCICONF3") < 0)
{
retString = getErrorXmlString(Fcommon, retString, tranID);
System.out.println("ReturnString : ["+retString+"]");
//System.out.println("ReturnString : ["+retString+"]");
}
//Commented by sarita on 23 NOV 2018 [END]
}
......@@ -87,7 +87,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
try
{
retString = confirm( tranID, xtraParams, forcedFlag, conn ,isPreview);
System.out.println("retString--1234 [\"+retString+\"]");
//System.out.println("retString--1234 [\"+retString+\"]");
//Modified by Anjali R. on [05/10/2018][In case of success prompt,system should not throw exception][Start]
//if ( retString != null && retString.length() > 0 )
//Commented by sarita on 23 NOV 2018 [START]
......@@ -103,13 +103,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else if(retString != null && retString.length() > 0 && retString.indexOf("VTCICONF3") < 0)
{
retString = getErrorXmlString(Fcommon, retString, tranID);
System.out.println("ReturnString : ["+retString+"]");
// System.out.println("ReturnString : ["+retString+"]");
}
//Commented by sarita on 23 NOV 2018 [END]
}
catch(Exception exception)
{
System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
//System.out.println("Exception in [InvHoldConfEJB] getCurrdateAppFormat " + exception.getMessage());
//Modified by Anjali R. on[05/10/2018][Throw exception][Start]
exception.printStackTrace();
throw new ITMException(exception);
......@@ -119,7 +119,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
public String confirm(String tranId,String xtraParams,String forcedFlag, Connection conn, boolean isPreview) throws RemoteException,ITMException
{
System.out.println("confirm called........");
//System.out.println("confirm called........");
String sql = "";
String confirm = "";
String siteCode = "";
......@@ -135,7 +135,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = null;
System.out.println("tran id = "+tranId);
//System.out.println("tran id = "+tranId);
boolean connStatus=false;
String chgUser="";
try
......@@ -165,7 +165,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
loginEmpCode =validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
runMode =validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "runMode");
System.out.println("Printing loginEmpCode---1-----"+loginEmpCode+"--");
//System.out.println("Printing loginEmpCode---1-----"+loginEmpCode+"--");
......@@ -202,7 +202,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Printing loginEmpCode---2-----"+loginEmpCode+"--");
//System.out.println("Printing loginEmpCode---2-----"+loginEmpCode+"--");
}
......@@ -215,7 +215,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if((confirm == null || "N".equalsIgnoreCase(confirm)) || ("Y".equalsIgnoreCase(confirm) && "B".equalsIgnoreCase(runMode)))
{
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
System.out.println("err String from gdfRetrieveMiscRcp ="+errString);
//System.out.println("err String from gdfRetrieveMiscRcp ="+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -249,14 +249,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
loginEmpCode="E03952";
}
System.out.println("loginEmpCode--3-"+loginEmpCode);
//System.out.println("loginEmpCode--3-"+loginEmpCode);
sql = "update receipt set confirmed = 'Y', conf_date = ?,emp_code__aprv = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDate(1, new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(2, loginEmpCode);
pstmt.setString(3, tranId);
int updateCoount = pstmt.executeUpdate();
System.out.println("no of row update = "+updateCoount);
//System.out.println("no of row update = "+updateCoount);
pstmt.close();
pstmt = null;
if(updateCoount > 0)
......@@ -272,11 +272,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
else
{
System.out.println("The Selected transaction is already confirmed");
//System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
System.out.println("115 err String from confirm method.....");
//System.out.println("115 err String from confirm method.....");
}
}
catch( Exception e)
......@@ -295,13 +295,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
catch (SQLException ex)
{
System.out.println("Exception : "+e);
//System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
}
}
System.out.println("Exception : "+e);
//System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
}
......@@ -341,7 +341,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
catch(Exception e)
{
System.out.println("Exception : "+e);
//System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
}
......@@ -359,7 +359,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{
System.out.println("gdf Retrieve Receipt Called...........");
//System.out.println("gdf Retrieve Receipt Called...........");
String errString = "";
String sundryCode = "";
String sql = "";
......@@ -522,7 +522,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString;
}
System.out.println("rcpClubPost>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+rcpClubPost);
//System.out.println("rcpClubPost>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+rcpClubPost);
itmDBAccessEJB = new ITMDBAccessEJB();
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
......@@ -563,7 +563,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
java.text.SimpleDateFormat simpleDateFormat = new java.text.SimpleDateFormat(genericUtility.getDBDateFormat());
date = simpleDateFormat.parse(today.toString());
today = java.sql.Timestamp.valueOf(simpleDateFormat.format(date).toString() + " 00:00:00.0");
System.out.println("Date : [ "+date+" ] today : [ "+today+" ] ");
//System.out.println("Date : [ "+date+" ] today : [ "+today+" ] ");
//Ended by varsha v for truncating time from tran_date on 07-05-18
sql = "select tran_id, tran_date, cust_code, tran_type, rcp_mode, bank_code, ref_no, ref_date, remarks, net_amt, curr_code," +
" exch_rate, net_amt__bc, fin_entity, acct_code__ar, cctr_code__ar, acct_code__bal, cctr_code__bal, site_code," +
......@@ -614,8 +614,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpHdrMap.put("cctr_code__adv",rs.getString("cctr_code__adv")==null?" ":rs.getString("cctr_code__adv"));
RcpHdrMap.put("tax_amt",rs.getDouble("tax_amt"));
RcpHdrMap.put("item_ser",rs.getString("item_ser"));
System.out.println(" Header Map..........");
System.out.println(RcpHdrMap.toString());
//System.out.println(" Header Map..........");
//System.out.println(RcpHdrMap.toString());
}
pstmt.close();
pstmt = null;
......@@ -688,7 +688,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetMap.put("eff_bank", rs.getString("eff_bank")); // 03/02/14 Manoj
DetList.add(DetMap);
//System.out.println(" receipt Acct Map..........");
System.out.println("DetList initial [" + DetList.toString() + "]");
// System.out.println("DetList initial [" + DetList.toString() + "]");
}
rs.close();
rs = null;
......@@ -731,8 +731,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ADetMap.put("cctr_code", rs.getString("cctr_code"));
ADetMap.put("exch_rate__vouch", rs.getDouble("exch_rate__vouch"));
ADetList.add(ADetMap);
System.out.println("receipt Adv Map..........");
System.out.println(ADetMap.toString());
//System.out.println("receipt Adv Map..........");
//System.out.println(ADetMap.toString());
}
rs.close();
rs = null;
......@@ -758,8 +758,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
EpcAdjMap.put("sundry_type", rs.getString("sundry_type"));
EpcAdjMap.put("sundry_code", rs.getString("sundry_code"));
EpcAdjList.add(EpcAdjMap);
System.out.println(" Rcpepc Adj Map..........");
System.out.println(EpcAdjList.toString());
//System.out.println(" Rcpepc Adj Map..........");
//System.out.println(EpcAdjList.toString());
}
rs.close();
......@@ -789,8 +789,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpDetMap.put("bill_disc_amt", rs.getDouble("bill_disc_amt")); //ADDED BY RITESH ON 24/05/13
RcpDetList.add(RcpDetMap);
System.out.println(" DetMap Map..........");
System.out.println(RcpDetMap.toString());
//System.out.println(" DetMap Map..........");
//System.out.println(RcpDetMap.toString());
}
......@@ -926,7 +926,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
// populate bill if bill is discounted
// then credit the amount to the BD
System.out.println("DetList*****************************811******************"+DetList.toString());
//System.out.println("DetList*****************************811******************"+DetList.toString());
total=0;
for(i=0 ; i<RcpDetList.size() ; i++)
{
......@@ -1100,7 +1100,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
}
System.out.println("DetList*****************984******************************"+DetList.toString());
//System.out.println("DetList*****************984******************************"+DetList.toString());
//adjust for advances adjusted
for(i=0 ; i<ADetList.size() ; i++)
......@@ -1115,7 +1115,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
amount = (double) Double.parseDouble( "" + ADetMap.get("adj_amt"));
total = total + amount;
System.out.println("LINE NO 743"+total);
//System.out.println("LINE NO 743"+total);
if(rcpClubPost.equals("Y"))
{
findIndex = findExistingIndex(DetList, acct, cctr, exch);
......@@ -1226,7 +1226,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(tFin != 0)
{
total = total + tFin;
System.out.println("LINE NO 812"+total);
// System.out.println("LINE NO 812"+total);
acct = acctFin==null?"":acctFin;
......@@ -1352,12 +1352,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// insert data for advance
advAmt = (double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"));
System.out.println("ADVAMT*********"+advAmt);
//System.out.println("ADVAMT*********"+advAmt);
if(advAmt!= 0)
{
total = total + advAmt;
System.out.println("LINE NO 874"+total);
//System.out.println("total in adv"+total);
System.out.println("total in adv"+total);
acct = (String)RcpHdrMap.get("acct_code__adv")==null?"":(String)RcpHdrMap.get("acct_code__adv");
cctr = (String)RcpHdrMap.get("cctr_code__adv")==null?" ":(String)RcpHdrMap.get("cctr_code__adv");
exch = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate"));
......@@ -1366,7 +1366,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(rcpClubPost.equals("Y"))
{
findIndex = findExistingIndex(DetList, acct, cctr, exch);
System.out.println("FINDINDEX>>>>>>>1243>>>>>"+findIndex);
// System.out.println("FINDINDEX>>>>>>>1243>>>>>"+findIndex);
}
else
{
......@@ -1385,6 +1385,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs=null;
pstmt.close();
pstmt=null;
System.out.println("total in adv"+amtNoBankEffect);
if (findIndex > -1)
{
detMap = (HashMap) DetList.get(findIndex);
......@@ -1394,7 +1395,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
else
{
System.out.println("Into Else part of findIndex > -1>>>>");
// System.out.println("Into Else part of findIndex > -1>>>>");
detMap = new HashMap();
/*sql="select sum(amount*exch_rate/?) from rcpacct where tran_id=? and eff_bank='N'";
pstmt=conn.prepareStatement(sql);
......@@ -1424,8 +1425,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
System.out.println("1273---DetList.toString()----"+DetList.toString());
// System.out.println("1273---DetList.toString()----"+DetList.toString());
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acct);
......@@ -1523,7 +1523,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
totEpcBc = totEpcBc + (hexchRate * amount);
}
//added to by monika
System.out.println("epccurrsame value:::"+isEpcCurrSame);
// System.out.println("epccurrsame value:::"+isEpcCurrSame);
if(rcpClubPost.equals("Y"))
{
......@@ -1781,7 +1781,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
System.out.println("badDebtAmt>>>>>>1642>>>>>>>"+badDebtAmt);
// System.out.println("badDebtAmt>>>>>>1642>>>>>>>"+badDebtAmt);
if(badDebtAmt > 0)
{
sql = "select tran_id, acct_code__dr,cctr_code__dr, acct_code__cr, cctr_code__cr, amt_prov, case when amt_revrsed is null then 0 else amt_revrsed end from bad_debts_prov where tran_ser = ? and ref_no = ? and amt_prov <> 0 order by tran_date";
......@@ -2025,7 +2025,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
total = (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt"));
totBc = (double) Double.parseDouble( "" + RcpHdrMap.get("net_amt__bc"));
//total = total-(double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt"));--Mismatch Amount 21/03/17
System.out.println("Final total ["+ total + "] totBc [" + totBc + "]");
//System.out.println("Final total ["+ total + "] totBc [" + totBc + "]");
//total = 0;
......@@ -2039,14 +2039,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
if(bdFluctuationCf.equalsIgnoreCase("N"))
{
totBc = totBc + totbdDiff;
System.out.println("bdFluctuationCf [" + bdFluctuationCf + "] totBc ["+totBc + "]");
//System.out.println("bdFluctuationCf [" + bdFluctuationCf + "] totBc ["+totBc + "]");
}
// if EPC is adjusted in diff currency then update the net amount bc.
if(isEpcCurrSame == true)
{
System.out.println("total ["+total+"] totEpc ["+totEpc+"] totEpcBc ["+totEpcBc + "]");
//System.out.println("total ["+total+"] totEpc ["+totEpc+"] totEpcBc ["+totEpcBc + "]");
total = total + totEpc;
totBc = totBc +totEpcBc;
}
......@@ -2082,7 +2082,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// if EPC adjusted in same currency then
//added by monika 8 aug-2019
System.out.println("before amount added with efund +++"+chq);
//System.out.println("before amount added with efund +++"+chq);
if(isEpcCurrSame == true)
{
chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ;
......@@ -2091,7 +2091,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//System.out.println("chq and ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]");
//if(Math.abs(chq - total) > 1)
//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)
//added by monika on 14 sept 2019 for accounting effect--
othAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt")));
......@@ -2106,7 +2106,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
RcpHdrMap.put("net_amt", total);
RcpHdrMap.put("net_amt__bc", totBc);
System.out.println("net_amt ["+total+"] net_amt__bc ["+totBc + "]");
//System.out.println("net_amt ["+total+"] net_amt__bc ["+totBc + "]");
// 14/01/14 manoharan details has to be inserted
sql = "select max(line_no) from rcpacct where tran_id = ?";
......@@ -2121,10 +2121,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Max Line>>>"+maxline);
//System.out.println("Max Line>>>"+maxline);
if(!isPreview )
{
System.out.println(" >>>>>>>>>>>>>"+isPreview);
//System.out.println(" >>>>>>>>>>>>>"+isPreview);
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
for(i = detListSize ; i<DetList.size() ; i++)
......@@ -2326,7 +2326,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
private String gbfPostReceipt(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DDetList, ArrayList RcpDetList,ArrayList ADetList,ArrayList EpcAdjList,double amtNoBankEffect, Connection conn,boolean isPreview)throws RemoteException,ITMException
{
System.out.println("gbfPostReceipt Called..........");
//System.out.println("gbfPostReceipt Called..........");
String errString = "";
String ledgPostConf = "";
String sql = "";
......@@ -2338,10 +2338,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ArrayList DetList = new ArrayList();
double netAmount = 0.0;
double amount = 0.0;
double amountadvbking=0.0;
double debit = 0.0;
double credit = 0.0;
PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;
PreparedStatement pstmt2 = null;
ResultSet rs2 = null;
ResultSet rs = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon finCommon = null;
......@@ -2396,7 +2399,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// header posting
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,amtNoBankEffect,conn,isPreview);
System.out.println("ERROR......................"+errString);
//System.out.println("ERROR......................"+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -2404,7 +2407,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
errString=gbfPostRcpdet(tranId,xtraParams,RcpHdrMap,DDetList,RcpDetList,ADetList,EpcAdjList,conn,isPreview);//Changed by Manoj dtd 15/01/2014 to return errString from method
System.out.println("errString while posting rcpdet......................"+errString);
// System.out.println("errString while posting rcpdet......................"+errString);
}
if(errString != null && errString.trim().length() > 0)
{
......@@ -2423,7 +2426,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Max Line:--"+maxline);
//System.out.println("Max Line:--"+maxline);
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,AMOUNT,EXCH_RATE,EFFECT_PARTY,AMOUNT__BC,EFF_BANK,CURR_CODE) values (?,?,?,?,?,?,?,?,?,?)";
pstmt1 = conn.prepareStatement(sql);
......@@ -2468,12 +2471,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt=null;
// System.out.println("netAmountBc+taxAmt amount --------->"+netAmount);
System.out.println("netAmountBc+taxAmt amount --------->"+amount);
//System.out.println("netAmountBc+taxAmt amount --------->"+amount);
//end
if(! isPreview)//if isPreview is false
{
sql ="SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
//sql ="SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";//commented by monika 4 oct 2019
//added by monika to check advbking balance amt on 4oct 2019
sql ="SELECT ref_no , amount FROM rcpadvbking_adj WHERE tran_id = ?";//end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -2487,7 +2492,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
if(amount > 0)
{
sql = "update advbking set bal_amt = bal_amt - ? where tran_id = ?";
//System.out.println("advbking amount=["+amount+"]");
// sql = "update advbking set bal_amt=bal_amt - ? where tran_id=?";
sql = "update advbking set bal_amt = (case when bal_amt is null then 0 else bal_amt end -?) where tran_id = ?";
/*pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setString(2,refNo);
......@@ -2495,15 +2502,18 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
*/ //COMMENTED BY MONIKA-same pstmt statement used
*/ //COMMENTED BY MONIKA-same pstmt statement used
//changes by monika on 07 august 2019
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,amount);
// pstmt1.setDouble(1,amountadvbking);//commented by monika on 4 oct 2019
pstmt1.setDouble(1,amount);//added by monika 4 oct 2019
pstmt1.setString(2,refNo);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
//System.out.println("balamount in advbking=[");
}
}
rs.close();
......@@ -2536,7 +2546,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//COMMENTED BY MONIKA-same pstmt statement used
//changes by monika on 07 august 2019
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,amount);
pstmt1.setDouble(1,amountadvbking);
pstmt1.setString(2,refNo);
pstmt1.executeUpdate();
......@@ -2567,12 +2577,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
return errString;
}
commCalcOnOff = finCommon.getFinparams("999999", "COMM_CALC_ON_OFF", conn);
if(commCalcOnOff.equalsIgnoreCase("Y"))
{
//nvo_commission_calculation lnvo_commission
///lnvo_commission = create nvo_commission_calculation
......@@ -2585,9 +2592,6 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
CalculateCommission calCommission = new CalculateCommission();
errString = calCommission.CalCommission("","R", tranId, confDrcrOpt, confJvOpt,xtraParams, conn);
return errString;
}
}//end of isPreview condition**vishakha
}//end of try
......@@ -2600,11 +2604,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
throw new ITMException(e);
}
return errString;
}
private String gbfPostRcphdr(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList RcpDetList,double amtNoBankEffect,Connection conn,boolean isPreview)throws RemoteException,ITMException
{
System.out.println("gbfPostRcphdr called........");
//System.out.println("gbfPostRcphdr called........");
String errString = "";
String currCode = "";
String siteCode = "";
......@@ -2694,7 +2697,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn);
}
System.out.println("net_amt AND net_amt__bc 1"+RcpHdrMap.get("net_amt")+""+RcpHdrMap.get("net_amt__bc"));
//System.out.println("net_amt AND net_amt__bc 1"+RcpHdrMap.get("net_amt")+""+RcpHdrMap.get("net_amt__bc"));
tranId = (String)RcpHdrMap.get("tran_id");
tranType = (String)RcpHdrMap.get("tran_type");
// if(tranType.equalsIgnoreCase("J"))
......@@ -2829,7 +2832,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt=null;
System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc);
//System.out.println("netAmountBc+taxAmt amount --------->"+netAmountBc);
//ended by akhilesh on 31/july/13 for tax provision
......@@ -2858,11 +2861,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("anal_code", "");
System.out.println("AMOUTTTTTTTTTTTTTTT"+(Double)RcpHdrMap.get("net_amt")+""+netAmountBc);
//System.out.println("AMOUTTTTTTTTTTTTTTT"+(Double)RcpHdrMap.get("net_amt")+""+netAmountBc);
if(isInBaseCurr == true)
{
//netAmountBc = netAmountBc+taxAmt;//added by akhilesh on 31/july/13 for tax provision
System.out.println("IN TRUE!!!!!!!!!!!!!!!!!");
//System.out.println("IN TRUE!!!!!!!!!!!!!!!!!");
glTraceMap.put("curr_code", basecurrCode);
glTraceMap.put("exch_rate", 1.0);
......@@ -2881,7 +2884,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
//netAmt = netAmt+taxAmt;//added by akhilesh on 31/july/13 for tax provision
System.out.println("IN FALSE!!!!!!!!!!!!!!!!!");
//System.out.println("IN FALSE!!!!!!!!!!!!!!!!!");
glTraceMap.put("curr_code", currCode);
glTraceMap.put("exch_rate", exchRate);
......@@ -2907,10 +2910,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("chg_term", chgTermstr);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace)
System.out.println("1766 glTraceUpdate Called........isPreview value......"+isPreview);
System.out.println("the vslue for CR AMT**********************"+glTraceMap.get("cr_amt"));
//System.out.println("1766 glTraceUpdate Called........isPreview value......"+isPreview);
//System.out.println("the vslue for CR AMT**********************"+glTraceMap.get("cr_amt"));
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>"+errString);
//System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>"+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -2969,7 +2972,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//Added by Sharon as instructed by Shiri madam on 29-July-2004
if (chqAmt != 0 || advAmt > 0 )
{
System.out.println("In 1826 SUNDRY-BAL !!!!!!!!!!!!!!!!!!!!!!!!!!");
//System.out.println("In 1826 SUNDRY-BAL !!!!!!!!!!!!!!!!!!!!!!!!!!");
if (! isPreview)//if isPreview is false *****vishakha
{
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
......@@ -3033,7 +3036,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//bankTranLogMap.put("exch_rate", exchRate);
bankTranLogMap.put("entry_batch_no",(String)RcpHdrMap.get("entry_batch_no") );
//ls_errcode = gbf_banktranlog_upd(lstr_banktranlog)
System.out.println("545 bankTranLogUpdateeUpdate Called..............");
//System.out.println("545 bankTranLogUpdateeUpdate Called..............");
errString = finCommon.bankTranLogUpdate(bankTranLogMap, xtraParams, conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3092,7 +3095,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("chg_term", chgTermstr);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace)
System.out.println("1938 glTraceUpdate Called..............");
//System.out.println("1938 glTraceUpdate Called..............");
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
//errString=finCommon.gl
if(errString != null && errString.trim().length() > 0)
......@@ -3160,7 +3163,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
receivablesMap.put("cust_ref_date",null);
receivablesMap.put("cust_ref_amt","");
System.out.println("In 1997 receivablesMap [" + receivablesMap + "]");
//System.out.println("In 1997 receivablesMap [" + receivablesMap + "]");
errString = finCommon.gbfReceivablesUpd(receivablesMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3184,7 +3187,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("adv_amt", ((double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"))));
contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
sundryBalMap.put("contact_code",contactCode );
System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]");
//System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
......@@ -3322,7 +3325,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
private String gbfPostRcpdet(String tranId,String xtraParams,HashMap RcpHdrMap,ArrayList DetList, ArrayList RcpDetList ,ArrayList ADetList,ArrayList EpcAdjList,Connection conn,boolean isPreview)throws RemoteException,ITMException
{
System.out.println("gbfPostRcpdet called.............."+RcpDetList);
//System.out.println("gbfPostRcpdet called.............."+RcpDetList);
String errString = "";
String currCode = "";
String siteCode = "";
......@@ -3421,7 +3424,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
hexchRate = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate"));
remarks = (String)RcpHdrMap.get("remarks");
System.out.println("DetList SIZE ["+DetList.size() + "] DetList [" +DetList + "]");
// System.out.println("DetList SIZE ["+DetList.size() + "] DetList [" +DetList + "]");
for (int ctr =0; ctr < DetList.size(); ctr++)
......@@ -3431,7 +3434,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//DetMap = new HashMap();
DetMap = (HashMap) DetList.get(ctr);
System.out.println(" DetMap ctr [" + ctr + "] ["+DetMap + "]");
// System.out.println(" DetMap ctr [" + ctr + "] ["+DetMap + "]");
/* sundryType = (String)detListMap.get("sundry_type");
sundryCode = (String)detListMap.get("sundry_code");
......@@ -3485,11 +3488,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("chg_date", new Timestamp(tranDate.getTime()));
glTraceMap.put("chg_user", loginEmpCode);
glTraceMap.put("chg_term", chgTermstr);
System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]");
// System.out.println("848 glTraceUpdate Called..ctr [" + ctr + "] glTraceMap [" + glTraceMap + "]");
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("ERROR IN GLTRACE ........... errString [" + errString + "]");
// System.out.println("ERROR IN GLTRACE ........... errString [" + errString + "]");
return errString;
}
......@@ -3501,7 +3504,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
/// update sundrybal for customer code
if((String)glTraceMap.get("sundry_type") != null && !((String)glTraceMap.get("sundry_type")).trim().equalsIgnoreCase("O") && (! isPreview))//if is Preview is false **vishakha
{
System.out.println("COMES INTO CONDITION ...........");
// System.out.println("COMES INTO CONDITION ...........");
sundryBalMap = new HashMap();
......@@ -3530,20 +3533,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("adv_amt", 0.0);
contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
sundryBalMap.put("contact_code",contactCode );
System.out.println("2366 sundryBaleUpdate Called..............");
//System.out.println("2366 sundryBaleUpdate Called..............");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is sundryBaleUpdate ..........."+errString);
// System.out.println("error is sundryBaleUpdate ..........."+errString);
return errString;
}
}
System.out.println("last ...........3316");
//System.out.println("last ...........3316");
}
System.out.println("@V@ isPreview :- ["+isPreview+"]");
//System.out.println("@V@ isPreview :- ["+isPreview+"]");
if(! isPreview) // if isPreview is false ****vishakha
{
for (int ctr =0; ctr < RcpDetList.size(); ctr++)
......@@ -3590,13 +3593,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
System.out.println("05/04/14 manoharan totAmt [" + totAmt + "] adjAmt [ " + adjAmt + "] amount [" + amount + "]" +
" Math.abs(totAmt - adjAmt) [" + Math.abs(totAmt - adjAmt) + "] Math.abs(amount) [" + Math.abs(amount) + "]");
//System.out.println("05/04/14 manoharan totAmt [" + totAmt + "] adjAmt [ " + adjAmt + "] amount [" + amount + "]" +
// " Math.abs(totAmt - adjAmt) [" + Math.abs(totAmt - adjAmt) + "] Math.abs(amount) [" + Math.abs(amount) + "]");
double tempAmt=distCommon.getRequiredDecimal(Math.abs(totAmt - adjAmt), 3);
System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]");
//System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
///System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
//System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]");
// if(getReqDecimal(Math.abs(totAmt - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
......@@ -3693,11 +3696,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
System.out.println("05/04/14 manoharan 2 adjAmt [ " + adjAmt + "] amount [" + amount + "] Math.abs(amount - adjAmt) [" + Math.abs(amount - adjAmt) + "] Math.abs(adjAmt) [" + Math.abs(adjAmt) + "]");
//System.out.println("05/04/14 manoharan 2 adjAmt [ " + adjAmt + "] amount [" + amount + "] Math.abs(amount - adjAmt) [" + Math.abs(amount - adjAmt) + "] Math.abs(adjAmt) [" + Math.abs(adjAmt) + "]");
double tempAmt=distCommon.getRequiredDecimal(Math.abs(amount - adjAmt), 3);
System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
System.out.println("@V@ getReqDecimal(Math.abs(adjAmt),2) :- ["+getReqDecimal(Math.abs(adjAmt),2)+"]");
//System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
//System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
//System.out.println("@V@ getReqDecimal(Math.abs(adjAmt),2) :- ["+getReqDecimal(Math.abs(adjAmt),2)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(adjAmt),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(adjAmt),2))
{
......@@ -3743,7 +3746,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sundryBalMap.put("adv_amt", (double) Double.parseDouble( "" + ADetMap.get("adj_amt")));
contactCode = finCommon.getContactCode((String)sundryBalMap.get("sundry_type"),(String) sundryBalMap.get("sundry_code"), conn);
sundryBalMap.put("contact_code",contactCode );
System.out.println("884 sundryBaleUpdate Called..............");
//System.out.println("884 sundryBaleUpdate Called..............");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3802,11 +3805,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
System.out.println("05/04/14 manoharan 3 adjAmt [ " + adjAmt + "] amount [" + amount + "] Math.abs(amount - adjAmt) [" + Math.abs(amount - adjAmt) + "] Math.abs(amount) [" + Math.abs(amount) + "]");
//System.out.println("05/04/14 manoharan 3 adjAmt [ " + adjAmt + "] amount [" + amount + "] Math.abs(amount - adjAmt) [" + Math.abs(amount - adjAmt) + "] Math.abs(amount) [" + Math.abs(amount) + "]");
double tempAmt=distCommon.getRequiredDecimal(Math.abs(amount - adjAmt), 3);
System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]");
//System.out.println("@V@ TempAmt :- ["+tempAmt+"]");
//System.out.println("@V@ getReqDecimal(tempAmt,2) :- ["+getReqDecimal(tempAmt,2)+"]");
//System.out.println("@V@ getReqDecimal(Math.abs(amount),2) :- ["+getReqDecimal(Math.abs(amount),2)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
......@@ -3843,7 +3846,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null;
//ADDED BY MONIKA FOR EXPORT_FUND
sql = "update export_fund set bal_amt = (bal_amt-?),amount__epcadj=? where tran_id = ? ";
sql = "update export_fund set bal_amt = (case when bal_amt is null then 0 else bal_amt end-?),amount__epcadj=? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
// pstmt.setDouble(1,adjAmt);
pstmt.setDouble(1,(amount * -1));
......@@ -3860,7 +3863,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = taxPost(tranId,xtraParams,RcpHdrMap, conn);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
//System.out.println("error is taxPost ..........."+errString);
return errString;
}
......@@ -3880,7 +3883,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//added by akhilesh on 31/july/13 for tax provision
private String taxPost(String tranId,String xtraParams,HashMap RcpHdrMap,Connection conn)throws RemoteException,ITMException
{
System.out.println("taxPost called.............."+RcpHdrMap);
//System.out.println("taxPost called.............."+RcpHdrMap);
String errString = "";
......@@ -3934,7 +3937,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
System.out.println("cctrCode:" +cctrCode + ":");
// System.out.println("cctrCode:" +cctrCode + ":");
amount = rs.getDouble("tax_amt");
......@@ -3973,16 +3976,16 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
glTraceMap.put("analysis2",anal2);
glTraceMap.put("analysis3",anal3);
System.out.println("glTraceUpdate before update "+glTraceMap);
// System.out.println("glTraceUpdate before update "+glTraceMap);
glTraceMap.put("chg_date", new Timestamp(tranDate.getTime()));
glTraceMap.put("chg_user", loginEmpCode);
glTraceMap.put("chg_term", chgTermstr);
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
System.out.println("glTraceUpdate errString "+errString);
//System.out.println("glTraceUpdate errString "+errString);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
//System.out.println("error is taxPost ..........."+errString);
return errString;
}
}
......
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