Commit ec9147da authored by msalla's avatar msalla

Error in confirmation of Bank Receipt in case of Bill discounting

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201345 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 72606941
......@@ -34,14 +34,15 @@ import javax.ejb.Stateless;
@Stateless
public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLocal,ReceiptAdvConfRemote
{
FinCommon Fcommon = new FinCommon();//Added by sarita on 23 NOV 2018
FinCommon Fcommon = new FinCommon();//Added by sarita on 23 NOV 2018
public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
{
String retString = "";
boolean isConn= false;
Connection conn = null;
boolean isPreview = false;
boolean isPreview = false;
try
{
retString = confirm( tranID, xtraParams, forcedFlag, conn ,isPreview);
......@@ -81,8 +82,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
String retString = "";
boolean isConn= false;
boolean isPreview = false;
boolean isPreview = false;
try
{
retString = confirm( tranID, xtraParams, forcedFlag, conn ,isPreview);
......@@ -131,7 +132,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
PreparedStatement pstmt = null;
ResultSet rs = null;
FinCommon finCommon = null;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = null;
System.out.println("tran id = "+tranId);
......@@ -154,7 +155,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
connStatus = true;
}
finCommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
itmDBAccessEJB = new ITMDBAccessEJB();
validatorEJB = new ValidatorEJB();
//connDriver = new ConnDriver();
......@@ -163,10 +164,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//conn.setAutoCommit(false);
loginEmpCode =validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
runMode =validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "runMode");
System.out.println("Printing loginEmpCode---1-----"+loginEmpCode+"--");
sql = "select confirmed ,site_code,chg_user from receipt where tran_id = ?";
pstmt = conn.prepareStatement(sql);
......@@ -191,7 +192,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql="select emp_code from users where code=?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,chgUser);
rs=pstmt.executeQuery();
if(rs.next())
{
......@@ -202,81 +203,81 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
System.out.println("Printing loginEmpCode---2-----"+loginEmpCode+"--");
}
if(isPreview != false){
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn,isPreview);
}
else{
//Changed By PriyankaC on 9JULY2018.
//if((confirm != null && confirm.equalsIgnoreCase("N")))
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);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
//added by akhilesh on 05/09/2013 for check cr dr amt
//sql = "select distinct(ref_ser) from gltrace where ref_id = ?";
//pstmt = conn.prepareStatement(sql);
//pstmt.setString(1,tranId);
//rs = pstmt.executeQuery();
//if(rs.next())
//{
// tranSer = rs.getString(1);
//}
//rs.close();
//rs = null;
//pstmt.close();
//pstmt = null;
//errString = finCommon.checkGlTranDrCr(tranSer,tranId,conn);
//System.out.println("err String from checkGlTranDrCr ="+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(errString == null || errString.trim().length() == 0)
//if((confirm != null && confirm.equalsIgnoreCase("N")))
if((confirm == null || "N".equalsIgnoreCase(confirm)) || ("Y".equalsIgnoreCase(confirm) && "B".equalsIgnoreCase(runMode)))
{
if("null".equalsIgnoreCase(loginEmpCode) || loginEmpCode==null || loginEmpCode.trim().length()==0)
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
System.out.println("err String from gdfRetrieveMiscRcp ="+errString);
if(errString != null && errString.trim().length() > 0)
{
loginEmpCode="E03952";
return errString;
}
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);
pstmt.close();
pstmt = null;
if(updateCoount > 0)
//added by akhilesh on 05/09/2013 for check cr dr amt
//sql = "select distinct(ref_ser) from gltrace where ref_id = ?";
//pstmt = conn.prepareStatement(sql);
//pstmt.setString(1,tranId);
//rs = pstmt.executeQuery();
//if(rs.next())
//{
// tranSer = rs.getString(1);
//}
//rs.close();
//rs = null;
//pstmt.close();
//pstmt = null;
//errString = finCommon.checkGlTranDrCr(tranSer,tranId,conn);
//System.out.println("err String from checkGlTranDrCr ="+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(errString == null || errString.trim().length() == 0)
{
if("null".equalsIgnoreCase(loginEmpCode) || loginEmpCode==null || loginEmpCode.trim().length()==0)
{
loginEmpCode="E03952";
}
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);
pstmt.close();
pstmt = null;
if(updateCoount > 0)
{
errString = itmDBAccessEJB.getErrorString("","VTCICONF3","","",conn);
}
}
else
{
errString = itmDBAccessEJB.getErrorString("","VTCICONF3","","",conn);
//errString = itmDBAccessEJB.getErrorString("","VTDESNCONF ","","",conn);
return errString;
}
}
else
else
{
//errString = itmDBAccessEJB.getErrorString("","VTDESNCONF ","","",conn);
System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
}
else
{
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)
{
......@@ -306,45 +307,45 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
finally
{
try
try
{
if(errString != null && errString.trim().length() > 0)
{
if(errString != null && errString.trim().length() > 0)
if( conn != null && !conn.isClosed() && connStatus )
{
if( conn != null && !conn.isClosed() && connStatus )
if(errString.indexOf("VTCICONF3") > -1)
{
if(errString.indexOf("VTCICONF3") > -1)
{
conn.commit();
}
else
{
conn.rollback();
}
conn.close();
conn = null;
conn.commit();
}
else
{
conn.rollback();
}
conn.close();
conn = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//conn.close();
}
catch(Exception e)
if(rs != null)
{
System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//conn.close();
}
catch(Exception e)
{
System.out.println("Exception : "+e);
e.printStackTrace();
throw new ITMException(e);
}
}
return errString;
} //end of confirm method
......@@ -352,10 +353,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn)throws RemoteException,ITMException
{
String errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn,false);
return errString;
}
private String gbfRetrieveReceipt(String tranId,String siteCode,String xtraParams,Connection conn,boolean isPreview)throws RemoteException,ITMException
{
System.out.println("gdf Retrieve Receipt Called...........");
......@@ -483,7 +484,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
errString = itmDBAccessEJB.getErrorString("","VTFINPARM ","","",conn);
return errString;
}
cctrFins = finCommon.getFinparams("999999", "ACCT_FINCHG_AR", conn);
if(cctrFins != null && ! "NULLFOUND".equalsIgnoreCase(cctrFins))
......@@ -521,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 ))
......@@ -661,7 +662,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
// populate rcpacct
// 29/01/14 manoharan effect_party considered
//if(!isPreview){ commented by vishaka for F14ISUN006 for acct receipt window
//if(!isPreview){ commented by vishaka for F14ISUN006 for acct receipt window
sql = "select sundry_type,sundry_code,acct_code,cctr_code,emp_code, anal_code,curr_code ,exch_rate,amount,party_doc_ref,case when effect_party is null then 'N' else effect_party end as effect_party,case when eff_bank is null then 'N' else eff_bank end as eff_bank from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -690,7 +691,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
detListSize = DetList.size();
// }
// }
sql = "select ref_ser, ref_no,adj_amt,acct_code,cctr_code,exch_rate__vouch from rcpadv where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -779,13 +780,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
//RcpDetMap = new HashMap();
RcpDetMap = (HashMap) RcpDetList.get(i);
if(!((String)RcpDetMap.get("ref_ser")).equals("M-INV"))
{
// to convert in terms of header currency in case multiple currency
//total = total + (Double)RcpDetMap.get("rcp_amt");
total = total + ( (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt")) * (double) Double.parseDouble( "" + RcpDetMap.get("exch_rate")) / (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate")) );
//finTotal = finTotal + (double) Double.parseDouble( "" + RcpDetMap.get("fin_chg"));
tFin = tFin + (double) Double.parseDouble( "" + RcpDetMap.get("fin_chg"));
......@@ -810,7 +811,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue
......@@ -823,7 +824,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
......@@ -866,7 +867,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{
findIndex = -1;
}
// System.out.println("findIndex>>>>>>>>>>>>>>>>>>>>>>>>>>>>773"+findIndex);
// System.out.println("findIndex>>>>>>>>>>>>>>>>>>>>>>>>>>>>773"+findIndex);
if (findIndex > -1)
{
detMap = (HashMap) DetList.get(findIndex);
......@@ -874,13 +875,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detAmount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt"));
detMap.put("amount", amountMap + detAmount );
DetList.set(findIndex, detMap);
// System.out.println("amount>>>>>>>>>>>>>>>>>>>>>>>>>>>>781"+(amountMap + detAmount));
// System.out.println("amount>>>>>>>>>>>>>>>>>>>>>>>>>>>>781"+(amountMap + detAmount));
}
else
{
detMap = new HashMap();
detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String)RcpDetMap.get("cust_code"));
detMap.put("acct_code", (String)RcpDetMap.get("acct_code__ar"));
......@@ -897,8 +898,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetList.add(detMap);
}
}
}
// populate bill if bill is discounted
// then credit the amount to the BD
......@@ -987,7 +988,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
detMap.put("sundry_type", stype);
detMap.put("sundry_code", scode);
detMap.put("acct_code", acct);
......@@ -1003,7 +1004,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
DetList.add(detMap);
}
}
/* 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);
......@@ -1020,7 +1021,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue
......@@ -1033,9 +1034,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
if(cnt1 == 0)
{
......@@ -1071,7 +1072,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
}
}*/
}
......@@ -1110,7 +1111,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
*/
*/
}
else
{
......@@ -1127,7 +1128,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String) RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct);
......@@ -1142,7 +1143,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
/*
sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1156,8 +1157,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
......@@ -1194,7 +1195,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null;
}*/
}
// System.out.println("DetList****************************1102*******************"+DetList.toString());
// System.out.println("DetList****************************1102*******************"+DetList.toString());
// insert data for finchg
//take but det and insert
......@@ -1209,8 +1210,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
cctr = cctrFin;
exch = (double) Double.parseDouble( "" + RcpHdrMap.get("exch_rate"));
/*sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue
......@@ -1223,10 +1224,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
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);
pstmt.setString(1,tranId);//issue
......@@ -1243,7 +1244,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
*/
*/
detMap = new HashMap();
detMap.put("sundry_type", "O");
detMap.put("sundry_code", null);
......@@ -1257,7 +1258,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
/*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);
......@@ -1275,7 +1276,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
*/
*/
detMap = new HashMap();
detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
......@@ -1289,7 +1290,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
/*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);
......@@ -1307,7 +1308,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
*/
*/
detMap = new HashMap();
detMap.put("sundry_type", "C");
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
......@@ -1321,11 +1322,11 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
// System.out.println("DetList**************************1231*********************"+DetList.toString());
// System.out.println("DetList**************************1231*********************"+DetList.toString());
// insert data for advance
advAmt = (double) Double.parseDouble( "" + RcpHdrMap.get("adv_amt"));
System.out.println("ADVAMT*********"+advAmt);
......@@ -1337,7 +1338,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
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"));
if(rcpClubPost.equals("Y"))
{
......@@ -1396,13 +1397,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("amount", (advAmt-amtNoBankEffect));//Changed by Manoj dtd 03/02/14
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "Y"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
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 = ?";
/*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);
pstmt.setString(2,cctr==null?"":cctr);
......@@ -1514,7 +1515,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
detMap.put("sundry_type", sundryType);
detMap.put("sundry_code", sundryCode);
detMap.put("acct_code", acctCode);
......@@ -1527,10 +1528,10 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
detMap.put("party_doc_ref", null);
detMap.put("effect_party", "N"); // 29/01/14 manoharan
detMap.put("eff_bank", "Y"); // 03/02/14 Manoj
DetList.add(detMap);
}
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acctCode);
pstmt.setString(2,cctrCode==null?"":cctrCode);
......@@ -1545,8 +1546,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
sql = "select max(LINE_NO) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue
......@@ -1559,9 +1560,9 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null;
pstmt.close();
pstmt = null;
if(cnt == 0)
{
......@@ -1620,7 +1621,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
exchRate = 1;
amount = diffAmtExch;
sql = "SELECT diff_amt__exch FROM RCPADVBKING_ADJ where tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
......@@ -1645,7 +1646,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
detMap.put("sundry_type", stype);
detMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
detMap.put("acct_code", acct);
......@@ -1791,12 +1792,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
amountMap = (double) Double.parseDouble( "" + detMap.get("amount"));
detMap.put("amount", amountMap + (amtRev * -1) );
DetList.set(findIndex, detMap);
}
else
{
detMap = new HashMap();
detMap.put("sundry_type", "O");
detMap.put("sundry_code", null);
detMap.put("acct_code", acctCodeDr);
......@@ -1861,8 +1862,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
}
*/
*/
if(rcpClubPost.equals("Y"))
{
findIndex = findExistingIndex(DetList, acctCodeCr, cctrCodeCr, exchRate);
......@@ -1873,7 +1874,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
if (findIndex > -1)
{
detMap = (HashMap) DetList.get(findIndex);
amountMap = (double) Double.parseDouble( "" + detMap.get("amount"));
detMap.put("amount", amountMap + amtRev );
......@@ -1883,7 +1884,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
else
{
detMap = new HashMap();
detMap.put("sundry_type", "O");
detMap.put("sundry_code", "");
detMap.put("acct_code", acctCodeCr);
......@@ -1900,7 +1901,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
}
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
/*sql = "select count(*) from rcpacct where acct_code = ? and cctr_code = ? and exch_rate = ? and tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acctCodeCr);
pstmt.setString(2,cctrCodeCr==null?"":cctrCodeCr);
......@@ -1947,45 +1948,45 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close();
pstmt = null;
}
*/
*/
if(!isPreview){ //if is preview is false****added by vishakha
sql = "update bad_debts_prov set amt_prov = amt_prov - ?, amt_revrsed = amt_revrsed + ? where tran_id = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,amtRev);
pstmt1.setDouble(2,amtRev);
pstmt1.setString(3,tranId);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
sql = "update bad_debts_prov set amt_prov = amt_prov - ?, amt_revrsed = amt_revrsed + ? where tran_id = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1,amtRev);
pstmt1.setDouble(2,amtRev);
pstmt1.setString(3,tranId);
pstmt1.executeUpdate();
pstmt1.close();
pstmt1 = null;
}
badDebtAmt = badDebtAmt - amtRev;
if (badDebtAmt == 0)
{
break;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
if(!isPreview){
sql = " update receivables set bad_debt_amt = bad_debt_amt - ? where tran_ser = ? and ref_no = ? and line_no__ref = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, totBad);
pstmt.setString(2,refser);
pstmt.setString(3,refNo);
pstmt.setString(4,lineNoRef);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
totBad = 0;
}
//System.out.println("aaaaaaaaaaaa"+total);
//System.out.println("BBBBBBBBBBB"+total);
if(!isPreview){
sql = " update receivables set bad_debt_amt = bad_debt_amt - ? where tran_ser = ? and ref_no = ? and line_no__ref = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, totBad);
pstmt.setString(2,refser);
pstmt.setString(3,refNo);
pstmt.setString(4,lineNoRef);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
totBad = 0;
}
//System.out.println("aaaaaaaaaaaa"+total);
//System.out.println("BBBBBBBBBBB"+total);
//System.out.println("CCCCCCCCCCCC"+total);
}
......@@ -1999,9 +2000,9 @@ if(!isPreview){
System.out.println("Final total ["+ total + "] totBc [" + totBc + "]");
//total = 0;
/// the upper block is transfer here.
//totBc = totBc + (Double)RcpHdrMap.get("net_amt__bc")+(Double)RcpHdrMap.get("tax_amt"); //change done by akhilesh on 05/sep/2013 for adjust tax amount
//System.out.println("net_amt AND net_amt__bc 1"+total+""+totBc);
......@@ -2041,8 +2042,12 @@ if(!isPreview){
rs = null;
pstmt.close();
pstmt = null;
*/
chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) ) - ((double) Double.parseDouble( "" + RcpHdrMap.get("bill_disc_amt")));// + ((double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt")) );
*/
//commented-by-Monika-30-may-2019
// chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) ) - ((double) Double.parseDouble( "" + RcpHdrMap.get("bill_disc_amt")));// + ((double) Double.parseDouble( "" + RcpHdrMap.get("oth_amt")) );
//changes made-by-monika-30-may-2019
chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) );
//end
// if EPC adjusted in same currency then
if(isEpcCurrSame == true)
......@@ -2061,7 +2066,7 @@ if(!isPreview){
RcpHdrMap.put("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 = ?";
pstmt = conn.prepareStatement(sql);
......@@ -2075,66 +2080,66 @@ if(!isPreview){
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Max Line>>>"+maxline);
if(!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++)
System.out.println("Max Line>>>"+maxline);
if(!isPreview )
{
maxline++;
detMap = (HashMap) DetList.get(i);
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++)
{
maxline++;
detMap = (HashMap) DetList.get(i);
sundryType = (String) detMap.get("sundry_type");
sundryCode = (String) detMap.get("sundry_code");
acctCode = (String) detMap.get("acct_code");
cctrCode = (String) detMap.get("cctr_code");
empCode = (String) detMap.get("emp_code");
analCode = (String) detMap.get("anal_code");
// 29/01/14 manoharan
effectParty = (String) detMap.get("effect_party");
if (effectParty == null || "null".equals(effectParty))
{
effectParty = "N";
}
if (sundryType == null || "O".equals(sundryType))
{
effectParty = "N";
}
if (sundryType != null && !"null".equals(sundryType) && !"O".equals(sundryType) && sundryCode != null && !"null".equals(sundryCode) && sundryCode.trim().length() > 0 )
{
effectParty = "Y";
}
//detMap.put("curr_code", rs.getString("curr_code"));
exchRate = (double) Double.parseDouble( "" +detMap.get("exch_rate"));
amount = (double) Double.parseDouble( "" +detMap.get("amount"));
// detMap.put("party_doc_ref", "");
sundryType = (String) detMap.get("sundry_type");
sundryCode = (String) detMap.get("sundry_code");
acctCode = (String) detMap.get("acct_code");
cctrCode = (String) detMap.get("cctr_code");
empCode = (String) detMap.get("emp_code");
analCode = (String) detMap.get("anal_code");
// 29/01/14 manoharan
effectParty = (String) detMap.get("effect_party");
if (effectParty == null || "null".equals(effectParty))
{
effectParty = "N";
}
if (sundryType == null || "O".equals(sundryType))
{
effectParty = "N";
pstmt.setString(1,tranId);
// 29/12/14 manoharan line_no is numeric not string
//pstmt.setString(2,String.valueOf(maxline));
pstmt.setInt(2,maxline);
pstmt.setString(3,acctCode);
pstmt.setString(4,cctrCode==null?"":cctrCode);
pstmt.setDouble(5,exchRate);
pstmt.setDouble(6,amount);
pstmt.setString(7,empCode);
pstmt.setString(8,analCode);
pstmt.setString(9,effectParty); // "Y"); // 29/01/14 manoharan
pstmt.setString(10,sundryType);
pstmt.setString(11,sundryCode);
pstmt.addBatch();
pstmt.clearParameters();
}
if (sundryType != null && !"null".equals(sundryType) && !"O".equals(sundryType) && sundryCode != null && !"null".equals(sundryCode) && sundryCode.trim().length() > 0 )
if (DetList.size() > 0)
{
effectParty = "Y";
pstmt.executeBatch();
}
//detMap.put("curr_code", rs.getString("curr_code"));
exchRate = (double) Double.parseDouble( "" +detMap.get("exch_rate"));
amount = (double) Double.parseDouble( "" +detMap.get("amount"));
// detMap.put("party_doc_ref", "");
pstmt.setString(1,tranId);
// 29/12/14 manoharan line_no is numeric not string
//pstmt.setString(2,String.valueOf(maxline));
pstmt.setInt(2,maxline);
pstmt.setString(3,acctCode);
pstmt.setString(4,cctrCode==null?"":cctrCode);
pstmt.setDouble(5,exchRate);
pstmt.setDouble(6,amount);
pstmt.setString(7,empCode);
pstmt.setString(8,analCode);
pstmt.setString(9,effectParty); // "Y"); // 29/01/14 manoharan
pstmt.setString(10,sundryType);
pstmt.setString(11,sundryCode);
pstmt.addBatch();
pstmt.clearParameters();
}
if (DetList.size() > 0)
{
pstmt.executeBatch();
}
pstmt.close();
pstmt = null;
pstmt.close();
pstmt = null;
}
// end 14/01/14 manoharan
......@@ -2157,11 +2162,11 @@ if(!isPreview){
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
*/
*/
}
catch(BatchUpdateException buex)
{
{
isError = true;
retString = "ERROR";
int [] updateCounts = buex.getUpdateCounts();
......@@ -2181,7 +2186,7 @@ if(!isPreview){
System.err.println(" Error code: " + ex.getErrorCode());
ex = ex.getNextException();
}
}
}
catch(Exception e)
{
System.out.println(e.getMessage());
......@@ -2211,7 +2216,7 @@ if(!isPreview){
findIndex = ctr;
break;
}
}
}
catch(Exception e)
......@@ -2242,10 +2247,19 @@ if(!isPreview){
double debit = 0.0;
double credit = 0.0;
PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;
ResultSet rs = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon finCommon = null;
DistCommon disCommon = null;
int maxline = 0;
String acctCode = "";
String cctrCode = "";
double exchRate = 0.0;
String effectParty = "";
String effectbank = "";
String curr_code="";
double taxAmount = 0.0;
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -2284,7 +2298,7 @@ if(!isPreview){
rs = null;
pstmt.close();
pstmt = null;
*/
*/
// header posting
errString = gbfPostRcphdr(tranId, xtraParams,RcpHdrMap, DDetList,amtNoBankEffect,conn,isPreview);
......@@ -2302,105 +2316,167 @@ if(!isPreview){
{
return errString;
}
if(! isPreview)//if isPreview is false
{
sql = "SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
//changes made by Monika -27-05-2019-
sql = "select max(line_no) from rcpacct where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
refNo = rs.getString(1);
amount = rs.getDouble(2);
if(amount < 0 ){amount = -amount;}
if(amount > 0)
{
sql = "update advbking set bal_amt = bal_amt - ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setString(2,refNo);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
maxline = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
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);
sql = "SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
sql =" select ACCT_CODE,CCTR_CODE, case when sum(tax_amt) is null then 0 else sum(tax_amt) end as taxAmt "
+" from taxtran where tran_code= ? and "
+" tran_id = ? and tax_amt <> 0 and effect <> 'N' group by acct_code,cctr_code";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setString(1,"RCP");
pstmt.setString(2,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
refNo = rs.getString(1);
amount = rs.getDouble(2);
if(amount < 0 )
{
amount = -amount;
}
if(amount > 0)
{
sql = "update advbking set bal_amt = bal_amt - ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setString(2,refNo);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
while(rs.next())
{
maxline++;
amount = rs.getDouble("taxAmt");
//taxAmount = taxAmount+ rs.getDouble("taxAmt");
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
effectParty = "N";
effectbank = "Y";
//detMap.put("curr_code", rs.getString("curr_code"));
exchRate = Double.parseDouble( "" +RcpHdrMap.get("exch_rate"));
curr_code =(String)RcpHdrMap.get("curr_code");
pstmt1.setString(1,tranId);
pstmt1.setInt(2,maxline);
pstmt1.setString(3,acctCode);
pstmt1.setString(4,cctrCode==null?"":cctrCode);
pstmt1.setDouble(5, -1 * amount);
pstmt1.setDouble(6,exchRate);
pstmt1.setString(7,effectParty);
pstmt1.setDouble(8, -1 * amount);
pstmt1.setString(9,effectbank);
pstmt1.setString(10,curr_code);
pstmt1.addBatch();
pstmt1.clearParameters();
}
pstmt1.executeBatch();
}
}
rs.close();
rs = null;
rs=null;
pstmt1.close();
pstmt1=null;
pstmt.close();
pstmt = null;
if(errString == null || errString.trim().length() == 0)
pstmt=null;
System.out.println("netAmountBc+taxAmt amount --------->"+netAmount);
//end
if(! isPreview)//if isPreview is false
{
/*if(Math.abs(debit - credit) >= 1)
sql ="SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
errString = itmDBAccessEJB.getErrorString("","VTAMTMIS","","",conn);
return errString;
}*/
errString = finCommon.checkGlTranDrCr("RCP",tranId,conn);
refNo = rs.getString(1);
amount = rs.getDouble(2);
if(amount < 0 )
{
amount = -amount;
}
if(amount > 0)
{
sql = "update advbking set bal_amt = bal_amt - ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setString(2,refNo);
pstmt.executeUpdate();
}
pstmt.close();
pstmt = null;
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT ref_no , amount FROM rcpepc_adj WHERE rcpepc_adj.tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
refNo = rs.getString(1);
amount = rs.getDouble(2);
if(amount < 0 )
{
amount = -amount;
}
if(amount > 0)
{
sql = "update advbking set bal_amt = bal_amt - ? where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setString(2,refNo);
pstmt.executeUpdate();
commCalcOnOff = finCommon.getFinparams("999999", "COMM_CALC_ON_OFF", conn);
if(commCalcOnOff.equalsIgnoreCase("Y"))
{
pstmt.close();
pstmt = null;
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(errString == null || errString.trim().length() == 0)
{
/*if(Math.abs(debit - credit) >= 1)
{
errString = itmDBAccessEJB.getErrorString("","VTAMTMIS","","",conn);
return errString;
}*/
errString = finCommon.checkGlTranDrCr("RCP",tranId,conn);
}
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
//nvo_commission_calculation lnvo_commission
///lnvo_commission = create nvo_commission_calculation
commCalcOnOff = finCommon.getFinparams("999999", "COMM_CALC_ON_OFF", conn);
if(commCalcOnOff.equalsIgnoreCase("Y"))
{
confDrcrOpt = finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn);
confJvOpt = finCommon.getFinparams("999999", "COMM_JV_CONF", conn);
//nvo_commission_calculation lnvo_commission
///lnvo_commission = create nvo_commission_calculation
//for Commission Calculate
confDrcrOpt = finCommon.getFinparams("999999", "COMM_DRCR_CONF", conn);
confJvOpt = finCommon.getFinparams("999999", "COMM_JV_CONF", conn);
CalculateCommission calCommission = new CalculateCommission();
errString = calCommission.CalCommission("","R", tranId, confDrcrOpt, confJvOpt,xtraParams, conn);
return errString;
//for Commission Calculate
CalculateCommission calCommission = new CalculateCommission();
errString = calCommission.CalCommission("","R", tranId, confDrcrOpt, confJvOpt,xtraParams, conn);
return errString;
}
}//end of isPreview condition**vishakha
}
}
}//end of isPreview condition**vishakha
}//end of try
catch(Exception e)
{
System.out.println(e.getMessage());
......@@ -2487,10 +2563,10 @@ if(! isPreview)//if isPreview is false
ResultSet rs = null;
FinCommon finCommon = null;
ValidatorEJB validatorEJB = new ValidatorEJB();
// GenericUtility genericUtility = new GenericUtility();
// GenericUtility genericUtility = new GenericUtility();
ITMDBAccessEJB itmDBAccessEJB = null;
String chgTermstr="";
try
{
finCommon =new FinCommon();
......@@ -2507,7 +2583,7 @@ if(! isPreview)//if isPreview is false
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"))
// if(tranType.equalsIgnoreCase("J"))
if("J".equalsIgnoreCase(tranType))
{
......@@ -2544,7 +2620,7 @@ if(! isPreview)//if isPreview is false
// errString = itmDBAccessEJB.getErrorString("","VTIBCA5","","",conn);
// //return errString;
//}
sql =" SELECT count(*) FROM rcpacct,receipt WHERE ( rcpacct.tran_id = receipt.tran_id ) and ( rcpacct.curr_code <> receipt.curr_code ) and ( ( receipt.tran_id = ? ) )";
pstmt = conn.prepareStatement(sql);
......@@ -2565,7 +2641,7 @@ if(! isPreview)//if isPreview is false
// errString = itmDBAccessEJB.getErrorString("","VTIBCA5","","",conn);
// //return errString;
//}
/// if EPC in diff currency.
if((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt")) != 0 && cnt > 0)
......@@ -2638,9 +2714,8 @@ if(! isPreview)//if isPreview is false
rs=null;
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
......@@ -2712,11 +2787,11 @@ if(! isPreview)//if isPreview is false
glTraceMap.put("ref_id", tranId);
glTraceMap.put("remarks", remarks);
glTraceMap.put("proj_code", projectCode);
glTraceMap.put("chg_date", new Timestamp(tranDate.getTime()));
glTraceMap.put("chg_user", loginEmpCode);
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"));
......@@ -2726,8 +2801,8 @@ if(! isPreview)//if isPreview is false
{
return errString;
}
debit = debit + (double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"));
credit = credit + (double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate"));
......@@ -2783,7 +2858,7 @@ if(! isPreview)//if isPreview is false
System.out.println("In 1826 SUNDRY-BAL !!!!!!!!!!!!!!!!!!!!!!!!!!");
if (! isPreview)//if isPreview is false *****vishakha
{
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
}
}
if(errString != null && errString.trim().length() > 0)
......@@ -2897,11 +2972,11 @@ if(! isPreview)//if isPreview is false
glTraceMap.put("ref_id", tranId);
glTraceMap.put("remarks", remarks);
glTraceMap.put("proj_code", projectCode);
glTraceMap.put("chg_date", new Timestamp(tranDate.getTime()));
glTraceMap.put("chg_user", loginEmpCode);
glTraceMap.put("chg_term", chgTermstr);
//ls_errcode = gbf_gltrace_upd(lstr_gltrace)
System.out.println("1938 glTraceUpdate Called..............");
errString = finCommon.glTraceUpdate(glTraceMap,conn,isPreview);
......@@ -2910,7 +2985,7 @@ if(! isPreview)//if isPreview is false
{
return errString;
}
}
debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
......@@ -2996,7 +3071,7 @@ if(! isPreview)//if isPreview is false
contactCode = finCommon.getContactCode(sundryType, sundryCode, conn);
sundryBalMap.put("contact_code",contactCode );
System.out.println("In 2021 sundryBalMap [" + sundryBalMap + "]");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3022,7 +3097,7 @@ if(! isPreview)//if isPreview is false
rs = null;
pstmt.close();
pstmt = null;
if(cnt <= 0)
{
sql = "insert into receipt_pay_in_slip ( tran_id, entry_batch_no ) values (?, ?)";
......@@ -3211,7 +3286,7 @@ if(! isPreview)//if isPreview is false
DistCommon distCommon = null;
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = new ValidatorEJB();
// GenericUtility genericUtility = new GenericUtility();
// GenericUtility genericUtility = new GenericUtility();
double nobankEffectAmt=0;
double exchRateHdr=0;
String chgTermstr="";
......@@ -3233,8 +3308,8 @@ if(! isPreview)//if isPreview is false
remarks = (String)RcpHdrMap.get("remarks");
System.out.println("DetList SIZE ["+DetList.size() + "] DetList [" +DetList + "]");
for (int ctr =0; ctr < DetList.size(); ctr++)
{
......@@ -3305,7 +3380,7 @@ if(! isPreview)//if isPreview is false
return errString;
}
debit = debit + ((double) Double.parseDouble( "" + glTraceMap.get("dr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
credit = credit + ((double) Double.parseDouble( "" + glTraceMap.get("cr_amt")) * (double) Double.parseDouble( "" + glTraceMap.get("exch_rate")));
......@@ -3355,92 +3430,92 @@ if(! isPreview)//if isPreview is false
System.out.println("last ...........3316");
}
System.out.println("@V@ isPreview :- ["+isPreview+"]");
if(! isPreview) // if isPreview is false ****vishakha
{
for (int ctr =0; ctr < RcpDetList.size(); ctr++)
if(! isPreview) // if isPreview is false ****vishakha
{
RcpDetMap = new HashMap();
RcpDetMap = (HashMap) RcpDetList.get(ctr);
for (int ctr =0; ctr < RcpDetList.size(); ctr++)
{
RcpDetMap = new HashMap();
RcpDetMap = (HashMap) RcpDetList.get(ctr);
refSer = (String)RcpDetMap.get("ref_ser");
refNo = (String)RcpDetMap.get("ref_no");
amount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt"));
lineNoPef = (String)RcpDetMap.get("line_no__ref");
refSer = (String)RcpDetMap.get("ref_ser");
refNo = (String)RcpDetMap.get("ref_no");
amount = (double) Double.parseDouble( "" + RcpDetMap.get("rcp_amt"));
lineNoPef = (String)RcpDetMap.get("line_no__ref");
itmDBAccessEJB = new ITMDBAccessEJB();
itmDBAccessEJB = new ITMDBAccessEJB();
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables WHERE tran_ser = ? and ref_no = ? and line_no__ref = ? for update ";
}
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables WHERE tran_ser = ? and ref_no = ? and line_no__ref = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables (updlock) where tran_ser = ? and ref_no = ? and line_no__ref = ? " ;
}
else
{
sql =" SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables WHERE tran_ser = ? and ref_no = ? and line_no__ref = ? for update nowait" ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
pstmt.setString(3,lineNoPef);
rs = pstmt.executeQuery();
if(rs.next())
{
totAmt = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
recoverAmt = rs.getDouble("recover_amt");
salesPers = rs.getString("sales_pers");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables (updlock) where tran_ser = ? and ref_no = ? and line_no__ref = ? " ;
}
else
{
sql =" SELECT tot_amt, adj_amt, recover_amt, sales_pers FROM receivables WHERE tran_ser = ? and ref_no = ? and line_no__ref = ? for update nowait" ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
pstmt.setString(3,lineNoPef);
rs = pstmt.executeQuery();
if(rs.next())
{
totAmt = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
recoverAmt = rs.getDouble("recover_amt");
salesPers = rs.getString("sales_pers");
}
rs.close();
rs = null;
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) + "]");
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)+"]");
// if(getReqDecimal(Math.abs(totAmt - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
return errString;
}
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)+"]");
// if(getReqDecimal(Math.abs(totAmt - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
return errString;
}
adjAmt = adjAmt + amount;
if(totAmt == adjAmt)
{
status = "A";
}
else
{
status = "P";
}
adjAmt = adjAmt + amount;
if(totAmt == adjAmt)
{
status = "A";
}
else
{
status = "P";
}
sql = "update receivables set adj_amt = ?, status = ?,stat_date = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,adjAmt);
pstmt.setString(2,status);
pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4,refSer);
pstmt.setString(5,refNo);
pstmt.setString(6,lineNoPef);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
sql = "update receivables set adj_amt = ?, status = ?,stat_date = ? where tran_ser = ? and ref_no = ? and line_no__ref = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,adjAmt);
pstmt.setString(2,status);
pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4,refSer);
pstmt.setString(5,refNo);
pstmt.setString(6,lineNoPef);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
/*if(recoverAmt > 0)
/*if(recoverAmt > 0)
{
/// filter data
recofiltMap.put("crnote_date", new Timestamp(tranDate.getTime()));//issue
......@@ -3469,184 +3544,184 @@ if(! isPreview)//if isPreview is false
recodataMap.put("tot_amt", totAmt);
recodataMap.put("adj_amt", adjAmt);*/ //open
/*ls_errcode = nvo_drcr_rcp.gbf_misc_credit_note_os_reco_dealer(lds_recofilt, lds_recodata, 'C', 'RCP', ls_tranid) */ //issue
/*ls_errcode = nvo_drcr_rcp.gbf_misc_credit_note_os_reco_dealer(lds_recofilt, lds_recodata, 'C', 'RCP', ls_tranid) */ //issue
}
}
// do the advance adjustmentopen
// do the advance adjustmentopen
for (int ctr =0; ctr < ADetList.size(); ctr++)
{
ADetMap = new HashMap();
ADetMap = (HashMap) ADetList.get(ctr);
for (int ctr =0; ctr < ADetList.size(); ctr++)
{
ADetMap = new HashMap();
ADetMap = (HashMap) ADetList.get(ctr);
refSer = (String)ADetMap.get("ref_ser");
refNo = (String)ADetMap.get("ref_no");
advAdj = (double) Double.parseDouble( "" + ADetMap.get("adj_amt"));
refSer = (String)ADetMap.get("ref_ser");
refNo = (String)ADetMap.get("ref_no");
advAdj = (double) Double.parseDouble( "" + ADetMap.get("adj_amt"));
sql ="select tot_amt, adj_amt from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
while(rs.next())
{
amount = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql ="select tot_amt, adj_amt from receivables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,refSer);
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
while(rs.next())
{
amount = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
}
rs.close();
rs = null;
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) + "]");
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)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(adjAmt),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(adjAmt),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
}
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)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(adjAmt),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(adjAmt),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
}
if (Math.abs(amount) == Math.abs(adjAmt + advAdj))
{
status = "A";
}
else
{
status = "P";
}
adjAmt = adjAmt + advAdj;
sql = "update receivables set adj_amt = adj_amt + ?,status = ?, stat_date = ? where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,advAdj);
pstmt.setString(2,status);
pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4,refSer);
pstmt.setString(5,refNo);
pstmt.executeUpdate();
if (Math.abs(amount) == Math.abs(adjAmt + advAdj))
{
status = "A";
}
else
{
status = "P";
}
adjAmt = adjAmt + advAdj;
sql = "update receivables set adj_amt = adj_amt + ?,status = ?, stat_date = ? where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,advAdj);
pstmt.setString(2,status);
pstmt.setDate(3,new java.sql.Date(new java.util.Date().getTime()));
pstmt.setString(4,refSer);
pstmt.setString(5,refNo);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
// adjusted in sunbdrybal
pstmt.close();
pstmt = null;
// adjusted in sunbdrybal
sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",new Timestamp(tranDate.getTime()));
sundryBalMap.put("eff_date",new Timestamp(effDate.getTime()));
sundryBalMap.put("fin_entity", finEntity);
sundryBalMap.put("site_code", siteCode);
sundryBalMap.put("sundry_type", "C");
sundryBalMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
sundryBalMap.put("acct_code", (String)ADetMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)ADetMap.get("cctr_code"));
sundryBalMap.put("curr_code", hcurrCode);
sundryBalMap.put("exch_rate", (double) Double.parseDouble( "" + ADetMap.get("exch_rate__vouch")));
sundryBalMap.put("dr_amt", 0.0);
sundryBalMap.put("cr_amt", 0.0);
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..............");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",new Timestamp(tranDate.getTime()));
sundryBalMap.put("eff_date",new Timestamp(effDate.getTime()));
sundryBalMap.put("fin_entity", finEntity);
sundryBalMap.put("site_code", siteCode);
sundryBalMap.put("sundry_type", "C");
sundryBalMap.put("sundry_code", (String)RcpHdrMap.get("cust_code"));
sundryBalMap.put("acct_code", (String)ADetMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)ADetMap.get("cctr_code"));
sundryBalMap.put("curr_code", hcurrCode);
sundryBalMap.put("exch_rate", (double) Double.parseDouble( "" + ADetMap.get("exch_rate__vouch")));
sundryBalMap.put("dr_amt", 0.0);
sundryBalMap.put("cr_amt", 0.0);
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..............");
errString = finCommon.gbf_sundrybal_upd(sundryBalMap, conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
for (int ctr =0; ctr < EpcAdjList.size(); ctr++)
{
EpcAdjMap = new HashMap();
EpcAdjMap = (HashMap) EpcAdjList.get(ctr);
for (int ctr =0; ctr < EpcAdjList.size(); ctr++)
{
EpcAdjMap = new HashMap();
EpcAdjMap = (HashMap) EpcAdjList.get(ctr);
refSer = (String)EpcAdjMap.get("ref_ser");
refNo = (String)EpcAdjMap.get("ref_no");
amount = (double) Double.parseDouble( "" + EpcAdjMap.get("amount"));
refSer = (String)EpcAdjMap.get("ref_ser");
refNo = (String)EpcAdjMap.get("ref_no");
amount = (double) Double.parseDouble( "" + EpcAdjMap.get("amount"));
itmDBAccessEJB = new ITMDBAccessEJB();
itmDBAccessEJB = new ITMDBAccessEJB();
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update ";
}
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt FROM receivables (updlock) where tran_ser = ? and ref_no = ? " ;
}
else
{
sql =" SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update nowait" ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"E-FUND");
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
while(rs.next())
{
totAmt = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "SELECT tot_amt, adj_amt FROM receivables (updlock) where tran_ser = ? and ref_no = ? " ;
}
else
{
sql =" SELECT tot_amt, adj_amt FROM receivables WHERE tran_ser = ? and ref_no = ? for update nowait" ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"E-FUND");
pstmt.setString(2,refNo);
rs = pstmt.executeQuery();
while(rs.next())
{
totAmt = rs.getDouble("tot_amt");
adjAmt = rs.getDouble("adj_amt");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
rs.close();
rs = null;
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) + "]");
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)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
return errString;
}
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)+"]");
// if(getReqDecimal(Math.abs(amount - adjAmt),2) < getReqDecimal(Math.abs(amount),2))
if(getReqDecimal(tempAmt,2) < getReqDecimal(Math.abs(amount),2))
{
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
return errString;
}
adjAmt = adjAmt + totAmt;
if(totAmt == adjAmt)
{
status = "A";
}
else
{
status = "P";
}
adjAmt = adjAmt + totAmt;
if(totAmt == adjAmt)
{
status = "A";
sql = "update misc_payables set adj_amt = ? where tran_ser = 'E-FUND' and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,adjAmt);
pstmt.setString(2,"E-FUND");
pstmt.setString(3,refNo);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
else
//added by akhilesh on 31/july/13 for tax provision
errString = taxPost(tranId,xtraParams,RcpHdrMap, conn);
if(errString != null && errString.trim().length() > 0)
{
status = "P";
System.out.println("error is taxPost ..........."+errString);
return errString;
}
sql = "update misc_payables set adj_amt = ? where tran_ser = 'E-FUND' and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,adjAmt);
pstmt.setString(2,"E-FUND");
pstmt.setString(3,refNo);
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
//added by akhilesh on 31/july/13 for tax provision
errString = taxPost(tranId,xtraParams,RcpHdrMap, conn);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
return errString;
}
}
}
catch(Exception e)
{
......@@ -3658,13 +3733,13 @@ if(! isPreview)//if isPreview is false
}
return errString;
}
//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);
String errString = "";
String acctCode = "";
String cctrCode = "";
......@@ -3679,7 +3754,7 @@ if(! isPreview)//if isPreview is false
double amount = 0.0;
Date effDate = null;
Date tranDate = null;
HashMap glTraceMap = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
......@@ -3688,8 +3763,8 @@ if(! isPreview)//if isPreview is false
ITMDBAccessEJB itmDBAccessEJB = null;
ValidatorEJB validatorEJB = new ValidatorEJB();
String chgTermstr="";
// GenericUtility genericUtility = new GenericUtility();
boolean isPreview = false;
// GenericUtility genericUtility = new GenericUtility();
boolean isPreview = false;
try
{
finCommon = new FinCommon();
......@@ -3697,30 +3772,30 @@ if(! isPreview)//if isPreview is false
itmDBAccessEJB = new ITMDBAccessEJB();
loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTermstr= validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
tranDate = (Date)RcpHdrMap.get("tran_date");
effDate = (Date)RcpHdrMap.get("eff_date");
//drcrFlag = (String)RcpHdrMap.get("drcr_flag");
//acctCode=(String) RcpHdrMap.get("acct_code__ar");
//cctrCode=(String) RcpHdrMap.get("cctr_code__ar");
pstmt=conn.prepareStatement("select * from taxtran where tran_id=? and tran_code='RCP' and tax_amt<>0");
pstmt.setString(1,tranId);
rs=pstmt.executeQuery();
while(rs.next())
{
glTraceMap = new HashMap();
acctCode = rs.getString("acct_code");
cctrCode = rs.getString("cctr_code");
System.out.println("cctrCode:" +cctrCode + ":");
amount = rs.getDouble("tax_amt");
glTraceMap.put("tran_date",new Timestamp(tranDate.getTime()));
glTraceMap.put("eff_date",new Timestamp(effDate.getTime()));
glTraceMap.put("fin_entity",(RcpHdrMap.get("fin_entity")));
......@@ -3735,18 +3810,18 @@ if(! isPreview)//if isPreview is false
glTraceMap.put("exch_rate",(RcpHdrMap.get("exch_rate")));
/*if("D".equalsIgnoreCase(drcrFlag))
{*/
if(amount > 0)
{
glTraceMap.put("dr_amt",0);
glTraceMap.put("cr_amt", Math.abs(amount));
}
else
{
glTraceMap.put("dr_amt", Math.abs(amount));
glTraceMap.put("cr_amt",0);
}
// }
if(amount > 0)
{
glTraceMap.put("dr_amt",0);
glTraceMap.put("cr_amt", Math.abs(amount));
}
else
{
glTraceMap.put("dr_amt", Math.abs(amount));
glTraceMap.put("cr_amt",0);
}
// }
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_id",tranId);
glTraceMap.put("ref_ser","RCP");
......@@ -3754,14 +3829,14 @@ if(! isPreview)//if isPreview is false
glTraceMap.put("analysis1",anal1);
glTraceMap.put("analysis2",anal2);
glTraceMap.put("analysis3",anal3);
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);
if(errString != null && errString.trim().length() > 0)
{
System.out.println("error is taxPost ..........."+errString);
......@@ -3772,7 +3847,7 @@ if(! isPreview)//if isPreview is false
rs=null;
pstmt.close();
pstmt=null;
}
catch(Exception e)
{
......@@ -3826,7 +3901,7 @@ if(! isPreview)//if isPreview is false
//Added by sarita on 23 NOV 2018 [START]
private String getErrorXmlString(FinCommon Fcommon, String errString, String tranId) throws RemoteException, ITMException
{
System.out.println("errString.indexOf(\"<error\"): "+errString.indexOf("<error"));
if(errString.indexOf("<error")<1)
{
......
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