Skip to content

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

At gimatex, remark given in detail screen of misc voucher is not getting... 

At gimatex, remark given in detail screen of misc voucher is not getting updated in gltrace and gltran.
find the attached detail record and gltrace record

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203310 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0f858018
Hide whitespace changes
Inline Side-by-side
Showing with 620 additions and 589 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java
View file @ 95dc6ad3
/**
* @author : Chandni Shah
* @Version : 1.0
* Date : 08/08/11
*/
* @author : Chandni Shah
* @Version : 1.0
* Date : 08/08/11
*/
package ibase.webitm.ejb.fin.adv;
......@@ -36,13 +36,13 @@ import java.util.*;
public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,MiscValConfRemote //SessionBean
{
E12GenericUtility genericUtility = new E12GenericUtility();
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException{
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException{
String errString ="";
Connection conn = null;
try{
errString = confirm(tranId, xtraParams, forcedFlag, conn);
errString = confirm(tranId, xtraParams, forcedFlag, conn);
}catch (Exception e) {
// TODO: handle exception
System.out.println("Exception in confirm() ==>"+e.getMessage());
......@@ -56,55 +56,55 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
public String confirm(String tranId,String xtraParams,String forcedFlag,Connection conn) throws RemoteException,ITMException
{
//Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
String sql = "";
ConnDriver connDriver = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
String sql = "";
ConnDriver connDriver = null;
String confirm = "" ,siteCode = "";
String errString = "" ;
FinCommon finCommon = null;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
boolean isLocalConn = false;
try
{
finCommon = new FinCommon();
// genericUtility = new GenericUtility();
finCommon = new FinCommon();
// genericUtility = new GenericUtility();
itmDBAccessEJB = new ITMDBAccessEJB();
if(conn == null){
connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
connDriver = null;
conn.setAutoCommit(false);
isLocalConn = true;
connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
connDriver = null;
conn.setAutoCommit(false);
isLocalConn = true;
}
sql =" select confirmed,site_code from MISC_VOUCHER where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
rs = pstmt.executeQuery();
if(rs.next())
{
confirm = rs.getString("confirmed");
siteCode = rs.getString("site_code");
}
rs.close();
confirm = rs.getString("confirmed");
siteCode = rs.getString("site_code");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(confirm != null && "Y".equalsIgnoreCase(confirm))
{
System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
else
{
errString = this.gbfRetriveMiscVouch(tranId,xtraParams,conn);
......@@ -145,7 +145,7 @@ conn = getConnection();
else
{
System.out.println("CONNECTION Rollbacking......................................");
conn.rollback();
conn.rollback();
System.out.println("CONNECTION Rollback......................................");
}
}
......@@ -170,7 +170,7 @@ conn = getConnection();
}
return errString;
} //end of confirm method
private String gbfRetriveMiscVouch(String tranId,String xtraParams,Connection conn)throws RemoteException,ITMException
{
PreparedStatement pstmt = null;
......@@ -181,12 +181,12 @@ conn = getConnection();
String sql = "",sqlInsert = "",sqlInner="";
ConnDriver connDriver = null;
String loginEmpCode = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
DistCommon Dcommon = new DistCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
String vouchType ="",tranType= "",sundryType = "",sundryCode="",acctCodeAp="",cctrCodeAp="",billNo="",orderRef="";
String siteCode="",finEntity="",currCode="",projCode = "",crTerm="",acctCodeAdv="",cctrCodeAdv="",autoPay="";
String payMode="",bankCode="",entryBatchNo="",analCode="",empCode="",acctCodeCf="",cctrCodeCf="",confirmed="";
......@@ -200,28 +200,28 @@ conn = getConnection();
java.sql.Timestamp resiDate = null;
java.sql.Timestamp relieveDate = null;
HashMap mischdrMap=null,miscdetMap=null,miscAdvMap=null,miscAcctMap =null,miscdetListMap=null;
ArrayList miscdetList = new ArrayList();
ArrayList miscAcctList = new ArrayList();
ArrayList miscAdvList = new ArrayList();
double taxAmt=0,rndTo=0,totAmt=0,netAmt=0,advAmt=0,netAmtBc=0,diffAmtExch=0,suppBillAmt=0,exchRate=0,rndAmt=0,billAmt=0;
String lineNo="",acctCode="",cctrCode="",analCodeDet="",empCodeDet="",applyTax="",sundryTypeFor="",sundryCodeFor="";
String acctCodeDr="",cctrCodeDr="",acctCodeCr="",prcpId="",lineNoRcp="",itemCode="",deptCode="",billNoDet="";
String taxClass="",taxChap="",taxEnv="",contractId="",lineNoCon="",projCodeDet="",analCode1="",analCode2="";
double amount=0,taxAmtDet=0,quantity=0,rate=0,rateClg=0,billAmtDet=0,taxedAdjAmt=0;
java.sql.Timestamp billDateDet = null;
String refSer="",refNo="",currCodeAdv="",acctCodeAd="",cctrCodeAd="";
double adjAmt=0,totAmtAdv=0,diffAmtExchAdv=0,taxedAdjAmtAdv=0,amtTax=0,exchRateVouch=0;
String lineNoAcct="",acctCodeAcct="",cctrCodeAcct="",analCodeAcct="",empCodeAcct="",remarksAcct="",sundryTypeAcct="";
String sundryCodeAcct="",currCodeAcct="",deptCodeAcct="";
double amountAcct=0,exchRateAcct=0;
String winName="",cctrcodeRnd="";
String ledgPostConf="",errString="",lineNoTax="",acctCodeTax="",cctrCodeTax="",taxRecoCctr="";
String lineNoReco="",acctCodeReco="",cctrCodeReco="",siteCodeFor ="";
String lineNoReco="",acctCodeReco="",cctrCodeReco="",siteCodeFor ="",remarksdet="";
double totTaxAmt=0,totRecoAmt=0,amt=0,recoAmt=0,netWr=0,rndAmtTot=0;
double totAmtPayables=0,adjAmtPayables=0,holdAmtPayables=0;
int lineInt =0,cnt = 0,lineNoDet = 0;
......@@ -232,19 +232,19 @@ conn = getConnection();
itmDBAccessEJB = new ITMDBAccessEJB();
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("loginEmpCode :: ::: "+loginEmpCode);
if(loginEmpCode == null || loginEmpCode.trim().length() == 0)
{
System.out.println("loginEmpCode is null");
errString = itmDBAccessEJB.getErrorString("","EMPAPRV","","",conn);
return errString;
}
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql =" select tran_id from misc_voucher where tran_id = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql =" select tran_id from misc_voucher (updlock) where tran_id = ? " ;
......@@ -253,7 +253,7 @@ conn = getConnection();
{
sql =" select tran_id from misc_voucher where tran_id = ? for update nowait " ;
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -261,17 +261,17 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
//lds_hdr ---> d_misc_vouch_rnd_edit
sql = " SELECT vouch_type,tran_date,tran_type,eff_date,sundry_type,sundry_code,acct_code__ap,cctr_code__ap, "
+" bill_no,bill_date,order_ref,site_code,fin_entity,curr_code,proj_code,cr_term,due_date,bill_amt, "
+" tax_amt,tot_amt,adv_amt,acct_code__adv,cctr_code__adv,net_amt,net_amt__bc,auto_pay, "
+" pay_mode,bank_code,entry_batch_no,anal_code,emp_code,diff_amt__exch,acct_code__cf,cctr_code__cf,confirmed, "
+" remarks,supp_bill_amt,exch_rate,rnd_off,rnd_to,rnd_amt,sundry_type__pay,sundry_code__pay, "
//+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen, "
+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen,site_code__pay "
+" FROM misc_voucher "
+" WHERE TRAN_ID = ? " ;
+" bill_no,bill_date,order_ref,site_code,fin_entity,curr_code,proj_code,cr_term,due_date,bill_amt, "
+" tax_amt,tot_amt,adv_amt,acct_code__adv,cctr_code__adv,net_amt,net_amt__bc,auto_pay, "
+" pay_mode,bank_code,entry_batch_no,anal_code,emp_code,diff_amt__exch,acct_code__cf,cctr_code__cf,confirmed, "
+" remarks,supp_bill_amt,exch_rate,rnd_off,rnd_to,rnd_amt,sundry_type__pay,sundry_code__pay, "
//+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen, "
+" acct_code__pay,cctr_code__pay,chq_name,mvouch_gen_tran_id,tour_id,tran_id__gen,site_code__pay "
+" FROM misc_voucher "
+" WHERE TRAN_ID = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -385,18 +385,31 @@ conn = getConnection();
//changes by Dadaso on 22-AUG-2014 [START]
mischdrMap.put("hold_amt","0");
//changes by Dadaso on 22-AUG-2014 [END]
//Added By PriyankaC on 22-MAY-2019[Start].
//Added By PriyankaC on 22-MAY-2019[Start].
mischdrMap.put("site_code__pay",sitePayment);
//Added By PriyankaC on 22-MAY-2019. [END]
//lds_det ---> d_misc_vouchdet_brow
System.out.println("added data map miscdetList.........111");
//commented by-Monika-on-12-july-2019 to add remarks
/*sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;*/
//changes made by -Monika-on-12-july-2019
sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 ,remarks"
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
//end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -434,7 +447,10 @@ conn = getConnection();
projCodeDet = rs.getString("proj_code");
analCode1 = rs.getString("anal_code__1");
analCode2 = rs.getString("anal_code__2");
System.out.println("Line no is:-"+lineNo);
//changes made by -Monika-on-12-july-2019
remarksdet=rs.getString("remarks");
//end
System.out.println("Line no is:-"+lineNo);
miscdetMap = new HashMap();
miscdetMap.put("line_no",lineNo);
miscdetMap.put("acct_code",acctCode);
......@@ -469,22 +485,25 @@ conn = getConnection();
miscdetMap.put("rate__clg",rateClg);
miscdetMap.put("anal_code__1",analCode1);
miscdetMap.put("anal_code__2",analCode2);
//changes made by -Monika-on-12-july-2019
miscdetMap.put("remarks",remarksdet);
//end
miscdetList.add(miscdetMap);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//lds_deta ---> d_misc_vouchadv_brow
sql = " SELECT ref_ser,ref_no, adj_amt,tot_amt, curr_code, diff_amt__exch, acct_code, "
+" cctr_code, exch_rate__vouch,taxed_adj_amt "
+" FROM misc_vouchadv "
+" WHERE tran_id = ? " ;
+" cctr_code, exch_rate__vouch,taxed_adj_amt "
+" FROM misc_vouchadv "
+" WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
//Changes and Commented by Ajay on 06/02/18:START
//Changes and Commented by Ajay on 06/02/18:START
//if(rs.next())
while(rs.next())
{
......@@ -498,36 +517,36 @@ conn = getConnection();
cctrCodeAd = rs.getString("cctr_code");
exchRateVouch = rs.getDouble("exch_rate__vouch");
taxedAdjAmtAdv = rs.getDouble("taxed_adj_amt");
/*rs.close();
/*rs.close();
rs = null;
pstmt.close();
pstmt = null;
*/
miscAdvMap = new HashMap();
miscAdvMap.put("ref_ser",refSer);
miscAdvMap.put("ref_no",refNo);
miscAdvMap.put("adj_amt",adjAmt);
miscAdvMap.put("tot_amt",totAmtAdv);
miscAdvMap.put("curr_code",currCodeAdv);
miscAdvMap.put("diff_amt__exch",diffAmtExchAdv);
miscAdvMap.put("acct_code",acctCodeAd);
miscAdvMap.put("cctr_code",cctrCodeAd);
miscAdvMap.put("exch_rate__vouch",exchRateVouch);
miscAdvMap.put("taxed_adj_amt",taxedAdjAmtAdv);
miscAdvList.add(miscAdvMap);
*/
miscAdvMap = new HashMap();
miscAdvMap.put("ref_ser",refSer);
miscAdvMap.put("ref_no",refNo);
miscAdvMap.put("adj_amt",adjAmt);
miscAdvMap.put("tot_amt",totAmtAdv);
miscAdvMap.put("curr_code",currCodeAdv);
miscAdvMap.put("diff_amt__exch",diffAmtExchAdv);
miscAdvMap.put("acct_code",acctCodeAd);
miscAdvMap.put("cctr_code",cctrCodeAd);
miscAdvMap.put("exch_rate__vouch",exchRateVouch);
miscAdvMap.put("taxed_adj_amt",taxedAdjAmtAdv);
miscAdvList.add(miscAdvMap);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//Changes and Commented By Ajay on 06/02/18:END
//lds_detac ---> d_misc_vouchacct_brow
sql = " SELECT line_no,acct_code, cctr_code, amount, anal_code, emp_code,remarks, "
+ " sundry_type, sundry_code,curr_code,exch_rate,dept_code "
+" FROM misc_vouchacct "
+" WHERE tran_id = ? " ;
+ " sundry_type, sundry_code,curr_code,exch_rate,dept_code "
+" FROM misc_vouchacct "
+" WHERE tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -545,7 +564,7 @@ conn = getConnection();
currCodeAcct = rs.getString("curr_code");
exchRateAcct = rs.getDouble("exch_rate");
deptCodeAcct = rs.getString("dept_code");
miscAcctMap = new HashMap();
miscAcctMap.put("line_no",lineNoAcct);
miscAcctMap.put("acct_code",acctCodeAcct);
......@@ -565,11 +584,11 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
winName = "W_MISC_VOUCHER";
java.util.Date toDay = new java.util.Date();
tranDate =new java.sql.Timestamp(toDay.getTime());
sql = "select ledg_post_conf from transetup where upper(tran_window) = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,winName);
......@@ -587,13 +606,13 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
if(ledgPostConf != null && "Y".equalsIgnoreCase(ledgPostConf))
{
if(tranDate.compareTo(toDay) > 0)
{
sql =" update misc_voucher set tran_date = ? "
+" where tran_id = ?";
+" where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDate);
pstmt.setString(2,tranId);
......@@ -612,11 +631,11 @@ conn = getConnection();
errString = itmDBAccessEJB.getErrorString("","VTAMTMIS","","",conn); // amount mismatch
return errString;
}
/*
// in std mv the tax data is added in detail table
// but for oth site ,because of jv generated with reference to detail table so that tax data is not added in the detail table
*/
*/
sql =" select site_code__for from misc_voucher where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -636,14 +655,14 @@ conn = getConnection();
+" values (?,?,?,?,?,?,?)";
System.out.println(" SQL for misc_vouchdet insert :: "+sqlInsert);
pstmtInsert = conn.prepareStatement(sqlInsert);
//Changes by mayur on 02-05-18--start
//lineInt = miscdetList.size();
sqlInner = "select MAX(line_no) from misc_vouchdet where tran_id = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
rsInner = pstmtInner.executeQuery();
System.out.println(" SQL for max line no :: "+sqlInner);
if(rsInner.next())
{
......@@ -655,14 +674,14 @@ conn = getConnection();
pstmtInner.close();
pstmtInner = null;
//Changes by mayur on 02-05-18--end
sql =" select line_no, acct_code, cctr_code, sum(tax_amt) as totTaxAmt, "
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as totRecoAmt "
+" from taxtran "
+" where tran_code = 'M-VOUC' "
+" and tran_id = ? and tax_amt <> 0 "
+" and effect <> 'N' "
+" group by line_no,acct_code,cctr_code " ;
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as totRecoAmt "
+" from taxtran "
+" where tran_code = 'M-VOUC' "
+" and tran_id = ? and tax_amt <> 0 "
+" and effect <> 'N' "
+" group by line_no,acct_code,cctr_code " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -674,7 +693,7 @@ conn = getConnection();
totTaxAmt = rs.getDouble("totTaxAmt");
totRecoAmt = rs.getDouble("totRecoAmt");
amt = totTaxAmt - totRecoAmt;
if(acctCodeTax == null)
{
sqlInner = "select acct_code from misc_vouchdet where tran_id = ? and line_no = ? ";
......@@ -708,17 +727,39 @@ conn = getConnection();
pstmtInner = null;
}
if (cctrCodeTax == null) cctrCodeTax = " ";
//for (int ctr =0; ctr < miscdetList.size(); ctr++)
// {
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
System.out.println("line no ::"+lineNo);
System.out.println("lineNoTax ::"+lineNoTax);
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
// {
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
System.out.println("line no ::"+lineNo);
System.out.println("lineNoTax ::"+lineNoTax);
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeTax);
pstmtInner.setString(3,cctrCodeTax);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
cnt = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeTax);
......@@ -726,99 +767,77 @@ conn = getConnection();
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
cnt = rsInner.getInt(1);
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeTax);
pstmtInner.setString(3,cctrCodeTax);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
}
System.out.println("acctCodeTax is equals to ::"+acctCodeTax);
System.out.println("acctCode is equals to ::"+acctCode);
System.out.println("cctrCodeTax is equals to ::"+cctrCodeTax);
System.out.println("cctrCodeTax is equals to ::"+cctrCode);
System.out.println("lineInt is equals to ::"+lineInt);
if(cnt == 0 )
{
lineInt++ ;
System.out.println(" SQL for insert :: "+sql);
pstmtInsert.setString(1,tranId);
//pstmtInsert.setString(2,lineNo);
pstmtInsert.setInt(2,lineInt);
pstmtInsert.setString(3,acctCodeTax);
pstmtInsert.setString(4,cctrCodeTax);
pstmtInsert.setDouble(5,amt);
pstmtInsert.setString(6,"");
pstmtInsert.setString(7,"");
pstmtInsert.addBatch();
pstmtInsert.executeBatch();
}
else
{
sqlInner =" update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
//pstmtInner.setDouble(1,amtTax);
pstmtInner.setDouble(1,amt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,acctCodeTax);
pstmtInner.setString(4,cctrCodeTax);
pstmtInner.setInt(5,lineNoDet);
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amtTax = 0;
// } // for
}
System.out.println("acctCodeTax is equals to ::"+acctCodeTax);
System.out.println("acctCode is equals to ::"+acctCode);
System.out.println("cctrCodeTax is equals to ::"+cctrCodeTax);
System.out.println("cctrCodeTax is equals to ::"+cctrCode);
System.out.println("lineInt is equals to ::"+lineInt);
if(cnt == 0 )
{
lineInt++ ;
System.out.println(" SQL for insert :: "+sql);
pstmtInsert.setString(1,tranId);
//pstmtInsert.setString(2,lineNo);
pstmtInsert.setInt(2,lineInt);
pstmtInsert.setString(3,acctCodeTax);
pstmtInsert.setString(4,cctrCodeTax);
pstmtInsert.setDouble(5,amt);
pstmtInsert.setString(6,"");
pstmtInsert.setString(7,"");
pstmtInsert.addBatch();
pstmtInsert.executeBatch();
}
else
{
sqlInner =" update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
//pstmtInner.setDouble(1,amtTax);
pstmtInner.setDouble(1,amt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,acctCodeTax);
pstmtInner.setString(4,cctrCodeTax);
pstmtInner.setInt(5,lineNoDet);
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amtTax = 0;
// } // for
} // while
rs.close();
rs = null;
pstmt.close();
pstmt = null;
taxRecoCctr = Fcommon.getAcctDetrTtype(" "," ","TAXRECO",tranType,conn);
if(taxRecoCctr.trim().length() > 1)
{
String[] ary =this.string2StringArray(taxRecoCctr , ",");
taxAcct = ary[0].toString();
taxCctr = ary[1].toString();
}
sql =" select line_no, acct_code__reco,cctr_code__reco, "
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount "
+" from taxtran "
+" where tran_code= 'M-VOUC' and "
+" tran_id = ? and "
+" reco_amount <> 0 and effect <> 'N' "
+" group by line_no,acct_code__reco,cctr_code__reco" ;
+" case when sum(reco_amount) is null then 0 else sum(reco_amount) end as recoAmount "
+" from taxtran "
+" where tran_code= 'M-VOUC' and "
+" tran_id = ? and "
+" reco_amount <> 0 and effect <> 'N' "
+" group by line_no,acct_code__reco,cctr_code__reco" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -828,7 +847,7 @@ conn = getConnection();
acctCodeReco = rs.getString("acct_code__reco");
cctrCodeReco = rs.getString("cctr_code__reco");
recoAmt = rs.getDouble("recoAmount");
if(acctCodeReco == null || acctCodeReco.trim().length() == 0 )
{
cctrCodeReco = taxCctr;
......@@ -845,15 +864,37 @@ conn = getConnection();
}
//for (int ctr =0; ctr< miscdetList.size(); ctr++)
//{
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
// amt = amount+recoAmt;
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
// amt = amount+recoAmt;
sqlInner = "select count(1) from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeReco);
pstmtInner.setString(3,cctrCodeReco);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
cnt = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeReco);
......@@ -861,70 +902,48 @@ conn = getConnection();
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
cnt = rsInner.getInt(1);
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
sqlInner = "select line_no from misc_vouchdet where tran_id = ? and acct_code = ? and cctr_code = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
pstmtInner.setString(2,acctCodeReco);
pstmtInner.setString(3,cctrCodeReco);
rsInner = pstmtInner.executeQuery();
if(rsInner.next())
{
lineNoDet = rsInner.getInt(1);
}
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
}
//Modified by Anjali R. on [11/01/2019][In case of misc_vouchdet has no record then system should insert record in misc_vouchdet table][Start]
//if(cnt > 0)
if(cnt == 0)
}
//Modified by Anjali R. on [11/01/2019][In case of misc_vouchdet has no record then system should insert record in misc_vouchdet table][Start]
//if(cnt > 0)
if(cnt == 0)
//Modified by Anjali R. on [11/01/2019][In case of misc_vouchdet has no record then system should insert record in misc_vouchdet table][End]
{
lineInt = lineInt +1;
pstmtInsert.setString(1,tranId);
pstmtInsert.setInt(2,lineInt);
pstmtInsert.setString(3,acctCodeReco);
pstmtInsert.setString(4,cctrCodeReco);
pstmtInsert.setDouble(5,recoAmt);
pstmtInsert.setString(6,"");
pstmtInsert.setString(7,"");
pstmtInsert.addBatch();
}
else
{
sqlInner = "update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setDouble(1,recoAmt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,acctCodeReco);
pstmtInner.setString(4,cctrCodeReco);
//Modified by Anjali R. on [11/01/2019][Parameter set on wrong index number][Start]
//pstmtInner.setInt(3,lineNoDet);
pstmtInner.setInt(5,lineNoDet);
//Modified by Anjali R. on [11/01/2019][Parameter set on wrong index number][End]
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amt = 0;
{
lineInt = lineInt +1;
pstmtInsert.setString(1,tranId);
pstmtInsert.setInt(2,lineInt);
pstmtInsert.setString(3,acctCodeReco);
pstmtInsert.setString(4,cctrCodeReco);
pstmtInsert.setDouble(5,recoAmt);
pstmtInsert.setString(6,"");
pstmtInsert.setString(7,"");
pstmtInsert.addBatch();
}
else
{
sqlInner = "update misc_vouchdet set amount = amount + ? where tran_id = ? and acct_code = ? and cctr_code = ? and line_no = ? ";
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setDouble(1,recoAmt);
pstmtInner.setString(2,tranId);
pstmtInner.setString(3,acctCodeReco);
pstmtInner.setString(4,cctrCodeReco);
//Modified by Anjali R. on [11/01/2019][Parameter set on wrong index number][Start]
//pstmtInner.setInt(3,lineNoDet);
pstmtInner.setInt(5,lineNoDet);
//Modified by Anjali R. on [11/01/2019][Parameter set on wrong index number][End]
int updCnt = pstmtInner.executeUpdate();
pstmtInner.close();
pstmtInner = null;
}
amt = 0;
//}
}//while
rs.close();
......@@ -943,11 +962,11 @@ conn = getConnection();
System.out.println("netWr--->>["+netWr+"]");
System.out.println("netAmt--->>["+netAmt+"]");
System.out.println("rndAmtTot--->>["+rndAmtTot+"]");
if(rndAmtTot != 0)
{
cctrcodeRnd = Fcommon.getFinparams("999999","RND_ACCT",conn);
/* if(cctrcodeRnd != null)
/* if(cctrcodeRnd != null)
{
String[] arry =this.string2StringArray(cctrcodeRnd , ";");
acctRnd = arry[0].toString();
......@@ -969,8 +988,8 @@ conn = getConnection();
}
if( arry.length > 1)
{
cctrRnd = arry[1];
System.out.println("cctrRnd["+cctrRnd+"]");
cctrRnd = arry[1];
System.out.println("cctrRnd["+cctrRnd+"]");
}
else
{
......@@ -991,31 +1010,39 @@ conn = getConnection();
pstmtInsert.setString(6,"");
pstmtInsert.setString(7,"");
pstmtInsert.addBatch();
}
pstmtInsert.executeBatch();
pstmtInsert.close();
} //end rndOff != N
//Chnages by nandkumar gadkari on 24/04/18 ----------------Start--------------------------
//added by Dadaso pawar [if round off value R then first miscdetList clear and create again ]
if(miscdetList !=null){
System.out.println("miscdetList Cleared................");
miscdetList.clear();
miscdetList.clear();
}
// misc_vouchdet inserted and updated many time...so create new list for passing it into next method, below code is done
System.out.println("added data in map miscdetList------------------222");
sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
//commented by monika-12-july-2019
/*sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
+" WHERE TRAN_ID = ? " ;*/
//changes made by monika-on-12-july-2019-to add remark
sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2,remarks "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
//end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1053,7 +1080,9 @@ conn = getConnection();
projCodeDet = rs.getString("proj_code");
analCode1 = rs.getString("anal_code__1");
analCode2 = rs.getString("anal_code__2");
//changes made by monika-on-12-july-2019-to add remark
remarksdet=rs.getString("remarks");
//end
miscdetMap = new HashMap();
miscdetMap.put("line_no",lineNo);
miscdetMap.put("acct_code",acctCode);
......@@ -1088,6 +1117,7 @@ conn = getConnection();
miscdetMap.put("rate__clg",rateClg);
miscdetMap.put("anal_code__1",analCode1);
miscdetMap.put("anal_code__2",analCode2);
miscdetMap.put("remarks",remarksdet);
miscdetList.add(miscdetMap);
}
rs.close();
......@@ -1097,12 +1127,12 @@ conn = getConnection();
mischdrMap.put("rnd_amt",rndAmtTot);
System.out.println("mischdrMap["+mischdrMap+"]");
sql =" update misc_payables set adj_amt = adj_amt + "+adjAmt+", status = ?,status_date =? "
+" where tran_ser =? and ref_no =? ";
+" where tran_ser =? and ref_no =? ";
//amt = Double.parseDouble((String)journalMap.get("dr_amt"));
netAmtBc =(Double.parseDouble(mischdrMap.get("net_amt").toString())) * exchRate;
sql ="update misc_voucher set net_amt =net_amt + "+rndAmtTot+", "
+" net_amt__bc = ?, rnd_amt = ? where tran_id = ? ";
+" net_amt__bc = ?, rnd_amt = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,netAmtBc);
pstmt.setDouble(2,rndAmtTot);
......@@ -1110,7 +1140,7 @@ conn = getConnection();
int upd = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
//Chnages by nandkumar gadkari on 24/04/18 ----------------end--------------------------
if(errString != null && errString.trim().length() > 0)
......@@ -1130,7 +1160,7 @@ conn = getConnection();
if(("E").equalsIgnoreCase(sundryType.trim()))
{
sql =" select resi_date,relieve_date from employee "
+" where emp_code = ?";
+" where emp_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sundryCode);
rs = pstmt.executeQuery();
......@@ -1143,12 +1173,12 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
if(resiDate != null && relieveDate != null)
{
sql =" select tot_amt, adj_amt,(case when hold_amt is null then 0 else hold_amt end) as holdamt "
+" from misc_payables where tran_ser = 'M-VOUC' "
+" and ref_no = ? ";
+" from misc_payables where tran_ser = 'M-VOUC' "
+" and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1163,7 +1193,7 @@ conn = getConnection();
pstmt.close();
pstmt = null;
}
if((totAmtPayables - adjAmtPayables) == 0)
{
errString = itmDBAccessEJB.getErrorString("","VTBAL2","","",conn); // already paid off
......@@ -1177,7 +1207,7 @@ conn = getConnection();
else if(holdAmtPayables > 0)
{
sql =" update misc_payables set hold_amt = 0 "
+" where tran_ser = 'M-VOUC' and ref_no = ? ";
+" where tran_ser = 'M-VOUC' and ref_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
int upd1 = pstmt.executeUpdate();
......@@ -1187,7 +1217,7 @@ conn = getConnection();
else if (holdAmtPayables == 0)
{
sql =" update misc_payables set hold_amt = ? "
+" where tran_ser = 'M-VOUC' and ref_no =? ";
+" where tran_ser = 'M-VOUC' and ref_no =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1,totAmtPayables);
pstmt.setString(2,tranId);
......@@ -1248,7 +1278,7 @@ conn = getConnection();
System.out.println("mischdrMap------>["+mischdrMap+"]");
System.out.println("miscdetList------>["+miscdetList+"]");
System.out.println("miscAdvList------>["+miscAdvList+"]");
PreparedStatement pstmt = null;
PreparedStatement pstmtInner = null;
ResultSet rs = null;
......@@ -1256,10 +1286,10 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
String runMode="I",chgUser="",chgTerm="",tranType="",refType="",siteCodeFor="";
String sundryType="",supp="",siteCode="",sitePayment="",winName="",finEntFr="",keyString="";
......@@ -1276,12 +1306,12 @@ conn = getConnection();
SimpleDateFormat sdf = null;
//autoConf Added by Pavan R on 18/OCT/17
String autoConf = "";
try
{
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
itmDBAccessEJB = new ITMDBAccessEJB();
errString = this.gbfPostMiscVouhdr(tranId,mischdrMap,miscAdvList,xtraParams,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -1295,18 +1325,18 @@ conn = getConnection();
return errString;
}
}
errString = Fcommon.checkGlTranDrCr("M-VOUC",tranId,conn);
System.out.println("errString in checkGlTranDrCr ::"+errString);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
//Added By PriyankaC on 22MAY2019 [Start].
sundryType = (String)mischdrMap.get("sundry_type");
suppPay =(String)mischdrMap.get("sundry_code__pay");
......@@ -1316,7 +1346,7 @@ conn = getConnection();
supp =(String)mischdrMap.get("sundry_code");
System.out.println("sitePayment " +sitePayment);
//Added By PriyankaC on 22MAY2019 [END].
/* if("S".equalsIgnoreCase(sundryType))
/* if("S".equalsIgnoreCase(sundryType))
{
supp =(String)mischdrMap.get("sundry_code");
//Added By PriyankaC on 21MAY2019.
......@@ -1351,7 +1381,7 @@ conn = getConnection();
pstmtInner = null;
System.out.println("Else sitePayment"+sitePayment);
}
rs.close();
rs = null;
pstmt.close();
......@@ -1369,7 +1399,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_transporter "+sitePayment);
}
else
{
System.out.println("Else Condition transporter");
......@@ -1391,9 +1421,9 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt =null;
}
}// S-sundry Type
else if("T".equalsIgnoreCase(sundryType))
{
......@@ -1424,7 +1454,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_transporter "+sitePayment);
}
else
{
System.out.println("Else Condition transporter");
......@@ -1477,7 +1507,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_tax_authority"+sitePayment);
}
else
{
System.out.println("Else Condition TAX_AUTHORITY");
......@@ -1530,7 +1560,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_strg_customer"+sitePayment);
}
else
{
System.out.println("Else Condition strg_customer");
......@@ -1583,7 +1613,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_sales_per"+sitePayment);
}
else
{
System.out.println("Else Condition sales_per");
......@@ -1636,7 +1666,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_customer"+sitePayment);
}
else
{
System.out.println("Else Condition customer");
......@@ -1688,7 +1718,7 @@ conn = getConnection();
sitePayment = rs.getString("site_code__pay");
System.out.println( "Site Payment site_loanparty"+sitePayment);
}
else
{
System.out.println("Else Condition customer");
......@@ -1746,14 +1776,14 @@ conn = getConnection();
pstmt =null;
}
}//End by Abhijit Gaikwad
*/
*/
System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
System.out.println("sundryTypePay"+sundryTypePay+" !=suppPay"+suppPay);
if(sitePayment== null || sitePayment.trim().length() == 0 ) // Condition added by Nandkumar Gadkari on 26/07/18
{
sitePayment=siteCode;
}
if((!sitePayment.trim().equals(siteCode.trim())) && (("I").equalsIgnoreCase(runMode)))
{
System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
......@@ -1770,7 +1800,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
sql ="select fin_entity from site where site_code = ? ";
pstmt =conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
......@@ -1783,7 +1813,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt= null;
sql =" select fin_entity from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sitePayment);
......@@ -1798,7 +1828,7 @@ conn = getConnection();
pstmt= null;
int count = 0;
sql =" select link_type, acct_code__pay, cctr_code__pay, acct_code__rcp, cctr_code__rcp, auto_confirm"
+" from ibca_pay_ctrl where site_code__from = ? and site_code__to = ? ";
+" from ibca_pay_ctrl where site_code__from = ? and site_code__to = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,sitePayment);
......@@ -1831,12 +1861,12 @@ conn = getConnection();
}
//Ended by Varsha V on 04-12-18 for returning error if no records found or link type null
tDay = new java.sql.Timestamp(toDay.getTime());
String xmlStringIbca = "<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<tran_date>"+sdf.format(new java.util.Date(tDay.getTime()))+"</tran_date>"+
"\r\n<site_code__from>"+siteCode+"</site_code__from>"+
"\r\n<link_type>"+link+"</link_type></Detail1></Root>";
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<tran_date>"+sdf.format(new java.util.Date(tDay.getTime()))+"</tran_date>"+
"\r\n<site_code__from>"+siteCode+"</site_code__from>"+
"\r\n<link_type>"+link+"</link_type></Detail1></Root>";
CommonConstants.setIBASEHOME();
TransIDGenerator tg = new TransIDGenerator(xmlStringIbca,"SYSTEM",CommonConstants.DB_NAME);
ibcaId = tg.generateTranSeqID("P-IBCA","tran_id", keyString, conn);
......@@ -1847,12 +1877,12 @@ conn = getConnection();
return errString;
}
remarks = "Auto IBCA of voucher of " +supp;
sql =" select tot_amt,exch_rate,curr_code,bank_code,acct_code,cctr_code,bill_no, "
+" bill_date,supp_bill_amt,purc_order,auto_pay,due_date,adv_amt,tran_date, "
+" sundry_code,pay_mode,entry_batch_no, ref_date "
+" from misc_payables where tran_ser = 'M-VOUC' "
+" and ref_no = ?";
+" bill_date,supp_bill_amt,purc_order,auto_pay,due_date,adv_amt,tran_date, "
+" sundry_code,pay_mode,entry_batch_no, ref_date "
+" from misc_payables where tran_ser = 'M-VOUC' "
+" and ref_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1881,19 +1911,19 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt= null;
amountBc = amount * exch;
crTerm = (String)mischdrMap.get("cr_term");
/*java.sql.Timestamp tDay = null;
tDay = new java.sql.Timestamp(toDay.getTime());*/
// create the ibca
sql =" insert into pay_ibca (tran_id,tran_date,eff_date,site_code__from,fin_entity__from, "
+" site_code__to,fin_entity__to,amount,curr_code,exch_rate,confirmed,acct_code__ifr, "
+" cctr_code__ifr,acct_code__ito,cctr_code__ito,chg_date,chg_user,chg_term,amount__bc, "
+" tran_type,tran_ser,link_type,remarks)"
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ;
+" site_code__to,fin_entity__to,amount,curr_code,exch_rate,confirmed,acct_code__ifr, "
+" cctr_code__ifr,acct_code__ito,cctr_code__ito,chg_date,chg_user,chg_term,amount__bc, "
+" tran_type,tran_ser,link_type,remarks)"
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ibcaId);
pstmt.setTimestamp(2,tranDate);
......@@ -1906,7 +1936,7 @@ conn = getConnection();
pstmt.setString(9,curr);
pstmt.setDouble(10,exch);
pstmt.setString(11,"N");
if(acctFr == null || acctFr.trim().length() == 0)
{
pstmt.setNull(12,Types.VARCHAR);
......@@ -1939,7 +1969,7 @@ conn = getConnection();
{
pstmt.setString(15,cctrTo);
}
pstmt.setTimestamp(16,tDay);
pstmt.setString(17,chgUser);
pstmt.setString(18,chgTerm);
......@@ -1959,10 +1989,10 @@ conn = getConnection();
pstmt.close();
System.out.println(">>>>>>>>@1888::tran_id["+ibcaId+"]");
sql =" insert into pay_ibca_det (tran_id,ref_ser,ref_no,ref_date,curr_code,exch_rate, "
+" sundry_type,sundry_code,acct_code,cctr_code,due_date,tot_amt,discount,tax_amt, "
+" auto_pay,bank_code,ref_type,bill_no,bill_date,pay_mode,entry_batch_no,purc_order, "
+" supp_bill_amt,adv_amt,tds_amt,cr_term ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+" sundry_type,sundry_code,acct_code,cctr_code,due_date,tot_amt,discount,tax_amt, "
+" auto_pay,bank_code,ref_type,bill_no,bill_date,pay_mode,entry_batch_no,purc_order, "
+" supp_bill_amt,adv_amt,tds_amt,cr_term ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ibcaId);
pstmt.setString(2,"M-VOUC");
......@@ -1985,7 +2015,7 @@ conn = getConnection();
pstmt.setString(15,autoPay);
pstmt.setString(16,bank);
pstmt.setString(17,refType);
// pstmt.setString(17,refType); //
// pstmt.setString(17,refType); //
pstmt.setString(18,bill);
pstmt.setTimestamp(19,billDt);
pstmt.setString(20,payMode);
......@@ -1995,30 +2025,30 @@ conn = getConnection();
pstmt.setDouble(24,adv);
pstmt.setString(25,"0");
pstmt.setString(26,crTerm);
pstmt.executeUpdate();
pstmt.close();
// Added by Pavan R on 18/OCT/17 Start
// Added by Pavan R on 18/OCT/17 Start
System.out.println("###auto_Confirm::["+autoConf+"]");
if (autoConf != null && "Y".equalsIgnoreCase(autoConf))
{
PayIbcaConf payIbcaConf = new PayIbcaConf();
errString = payIbcaConf.confirm(ibcaId, xtraParams, "", conn);
if(errString != null && errString.indexOf("VTCICONF3") != -1)
{
System.out.println("errString.indexOf::["+errString.indexOf("VTCICONF3")+"]");
errString = "";
}//else condition added BY Pavan R on 06/NOV/17
else
{
return errString;
}
if(errString != null && errString.indexOf("VTCICONF3") != -1)
{
System.out.println("errString.indexOf::["+errString.indexOf("VTCICONF3")+"]");
errString = "";
}//else condition added BY Pavan R on 06/NOV/17
else
{
return errString;
}
}
//Pavan R on 18/OCT/17 End
} //gs_run_mode
//For generating payment if pay mode is C and auto pay is Y
/*if("C".equalsIgnoreCase(mischdrMap.get("pay_mode").toString()))
{
......@@ -2034,25 +2064,25 @@ conn = getConnection();
return errString;
}
}*/ //commented by nandkumar gadkari on 21/06/18
sql =" select site_code__for from misc_voucher where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeFor = rs.getString("site_code__for");
}
rs.close();
siteCodeFor = rs.getString("site_code__for");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//added by chandni
if(siteCodeFor != null)
{
......@@ -2070,9 +2100,9 @@ conn = getConnection();
} //try end
catch(SQLException e)
{
System.out.println("Exception :MiscValConf :gbfPostMiscVouch :SQLException :==>\n"+e.getMessage());
errString = genericUtility.createErrorString(e);
throw new ITMException(e);
System.out.println("Exception :MiscValConf :gbfPostMiscVouch :SQLException :==>\n"+e.getMessage());
errString = genericUtility.createErrorString(e);
throw new ITMException(e);
}
catch (Exception e)
{
......@@ -2104,7 +2134,7 @@ conn = getConnection();
pstmtInner.close();
pstmtInner = null;
}
}
catch(Exception e)
{
......@@ -2114,7 +2144,7 @@ conn = getConnection();
}
return errString;
}// gbfPostMiscVouch method end
private String gbfPostMiscVouhdr(String tranId,HashMap mischdrMap,ArrayList miscAdvList,String xtraParams,Connection conn)throws RemoteException,ITMException
{
System.out.println("-------in method gbfPostMiscVouhdr-----------");
......@@ -2129,12 +2159,12 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap glTraceMap = null,acctMap = null,sundryBalMap = null,miscPayMap = null,detListMap = null;
String empCodeAprv="",sundryCodePay="",sundryType="",sundryTypePay="",withHeld="",confirm="";
......@@ -2150,7 +2180,7 @@ conn = getConnection();
//Added By Pavan R on 13/NOV/17 Start
double lcTds = 0, lcSuppBillAmt = 0;
//Added By Pavan R on 13/NOV/17 End
try
{
empCodeAprv = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
......@@ -2164,7 +2194,7 @@ conn = getConnection();
vouchType = (String)mischdrMap.get("vouch_type");
billAmt = Double.parseDouble(mischdrMap.get("bill_amt").toString());
taxAmt = Double.parseDouble(mischdrMap.get("tax_amt").toString());
if("A".equalsIgnoreCase(vouchType))
{
amtUpd = Double.parseDouble(mischdrMap.get("net_amt").toString());
......@@ -2172,8 +2202,8 @@ conn = getConnection();
else
{
sql =" select sum(tax_amt) as holdtax from taxtran "
+" where tran_code = 'M-VOUC' and tran_id = ? and pay_tax = 'Y' "
+" and effect <> 'N' ";
+" where tran_code = 'M-VOUC' and tran_id = ? and pay_tax = 'Y' "
+" and effect <> 'N' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -2185,10 +2215,10 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
amtUpd = billAmt + taxAmt - holdTax;
//amtUpd = billAmt + holdTax;
}
//amtUpd
glTraceMap = new HashMap();
......@@ -2208,7 +2238,7 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
for (int ctr =0; ctr < miscAdvList.size(); ctr++)
{
//added new @ 13-09-11
......@@ -2216,7 +2246,7 @@ conn = getConnection();
{
detListMap = new HashMap();
detListMap = (HashMap) miscAdvList.get(ctr);
detSundryType = (String)detListMap.get("sundry_type");
exchD =Double.parseDouble(detListMap.get("exch_rate__vouch").toString());
acctCode =(String)detListMap.get("acct_code");
......@@ -2225,11 +2255,11 @@ conn = getConnection();
currCode = (String)detListMap.get("curr_code");
refSer =(String)detListMap.get("ref_ser");
refNo =(String)detListMap.get("ref_no");
if (!(((acctAp).equalsIgnoreCase(acctCode)) && ((cctrAp).equalsIgnoreCase(cctrCode)) && ((exchH == exchD))))
{
advAdd = advAdd + adjAmt;
glTraceMap.put("tran_date",(mischdrMap.get("tran_date") == null ? "":mischdrMap.get("tran_date")));
glTraceMap.put("eff_date",(mischdrMap.get("eff_date") == null ? "":mischdrMap.get("eff_date")));
glTraceMap.put("fin_entity",(mischdrMap.get("fin_entity") == null ? "":mischdrMap.get("fin_entity")));
......@@ -2246,7 +2276,7 @@ conn = getConnection();
glTraceMap.put("anal_code","");
glTraceMap.put("curr_code",currCode);
glTraceMap.put("exch_rate",exchD);
if(adjAmt > 0)
{
glTraceMap.put("dr_amt",Double.toString(adjAmt));
......@@ -2269,17 +2299,17 @@ conn = getConnection();
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
glTraceMap.put("party_doc_ref",Fcommon.gfGetPartyDocRef(rSer,rId,conn));
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
acctDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
acctCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
acctAmt = acctDrAmt - acctCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -2291,9 +2321,9 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",acctAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -2324,7 +2354,7 @@ conn = getConnection();
sundryBalMap.put("dr_amt",0.0);
//sundryBalMap.put("cr_amt",Double.toString(0 - adjAmt));
sundryBalMap.put("cr_amt",(0 - adjAmt));
}
sundryBalMap.put("adv_amt",adjAmt);
sType = (String)sundryBalMap.get("sundry_type");
......@@ -2359,13 +2389,13 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
if(Math.abs(amount-adj) < Math.abs(adjAmt))
{
errString = itmDBAccessEJB.getErrorString("","VTIBAL1","","",conn);
return errString;
}
adj = adj + adjAmt;
if (amount == adj)
{
......@@ -2375,9 +2405,9 @@ conn = getConnection();
{
status = "P";
}
sql =" update misc_payables set adj_amt = adj_amt + "+adjAmt+", status = ?,status_date =? "
+" where tran_ser =? and ref_no =? ";
+" where tran_ser =? and ref_no =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,status);
pstmt.setTimestamp(2,new Timestamp(System.currentTimeMillis()));
......@@ -2393,7 +2423,7 @@ conn = getConnection();
return errString;
}
amtUpd = amtUpd + advAdd;
glTraceMap.put("tran_date",(mischdrMap.get("tran_date") == null ? "":mischdrMap.get("tran_date")));
glTraceMap.put("eff_date",(mischdrMap.get("eff_date") == null ? "":mischdrMap.get("eff_date")));
glTraceMap.put("fin_entity",(mischdrMap.get("fin_entity") == null ? "":mischdrMap.get("fin_entity")));
......@@ -2428,17 +2458,17 @@ conn = getConnection();
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
glTraceMap.put("party_doc_ref",Fcommon.gfGetPartyDocRef(rSer,rId,conn));
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
acctDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
acctCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
acAmt = acDrAmt - acCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -2450,9 +2480,9 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",acAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -2479,10 +2509,10 @@ conn = getConnection();
drAmt = (0- (amtUpd+rndAmt));
crAmt = 0;
}
sundryBalMap.put("dr_amt",drAmt);
sundryBalMap.put("cr_amt",crAmt);
sundryBalMap.put("adv_amt",0.0);
sType = (String)sundryBalMap.get("sundry_type");
sCode = (String)sundryBalMap.get("sundry_code");
......@@ -2500,12 +2530,12 @@ conn = getConnection();
return errString;
}
}
sundryCode =(String)mischdrMap.get("sundry_code");
sundryCodePay =(String)mischdrMap.get("sundry_code__pay");
sundryType =(String)mischdrMap.get("sundry_type");
sundryTypePay =(String)mischdrMap.get("sundry_type__pay");
if(!((sundryCode.equalsIgnoreCase(sundryCodePay)) ||(sundryType.equalsIgnoreCase(sundryTypePay))))
{
rem = "liability transfered to " + sundryCodePay;
......@@ -2514,7 +2544,7 @@ conn = getConnection();
glTraceMap.put("acct_code",(mischdrMap.get("acct_code__ap") == null ? "":mischdrMap.get("acct_code__ap")));
glTraceMap.put("cctr_code",(mischdrMap.get("cctr_code__ap") == null ? " ":mischdrMap.get("cctr_code__ap")));
glTraceMap.put("remarks",rem);
if(amtUpd > 0)
{
glTraceMap.put("dr_amt",Math.abs(amtUpd));
......@@ -2525,25 +2555,25 @@ conn = getConnection();
glTraceMap.put("dr_amt","0");
glTraceMap.put("cr_amt",Math.abs(amtUpd));
}
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
acctMap.put("sundry_code",(glTraceMap.get("sundry_code") == null ? "":glTraceMap.get("sundry_code")));
acctMap.put("remarks",(glTraceMap.get("remarks") == null ? "":glTraceMap.get("remarks")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
// .. gltrace effect for sundry_code__pay
rem = "liability transfered to " + sundryCode;
glTraceMap.put("sundry_type",(mischdrMap.get("sundry_type__pay") == null ? "":mischdrMap.get("sundry_type__pay")));
......@@ -2551,7 +2581,7 @@ conn = getConnection();
glTraceMap.put("acct_code",(mischdrMap.get("acct_code__pay") == null ? "":mischdrMap.get("acct_code__pay")));
glTraceMap.put("cctr_code",(mischdrMap.get("cctr_code__pay") == null ? " ":mischdrMap.get("cctr_code__pay")));
glTraceMap.put("remarks",rem);
if(amtUpd > 0)
{
glTraceMap.put("cr_amt",Math.abs(amtUpd));
......@@ -2563,7 +2593,7 @@ conn = getConnection();
glTraceMap.put("dr_amt",Math.abs(amtUpd));
}
glTraceMap.put("proj_code",(mischdrMap.get("proj_code") == null ? "":mischdrMap.get("proj_code")));
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -2573,13 +2603,13 @@ conn = getConnection();
acctMap.put("remarks",(glTraceMap.get("remarks") == null ? "":glTraceMap.get("remarks")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(!("O".equalsIgnoreCase((String)glTraceMap.get("sundry_type"))))
{
if(amtUpd > 0)
......@@ -2592,7 +2622,7 @@ conn = getConnection();
drAmt = 0;
crAmt = amtUpd;
}
sundryBalMap.put("dr_amt",drAmt);
sundryBalMap.put("cr_amt",crAmt);
sundryBalMap.put("sundry_type",mischdrMap.get("sundry_type"));
......@@ -2610,9 +2640,9 @@ conn = getConnection();
{
sundryBalMap.put("contact_code","");
}
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
......@@ -2627,7 +2657,7 @@ conn = getConnection();
drAmt = amtUpd+roundAmt;
crAmt = 0;
}
sundryBalMap.put("dr_amt",drAmt);
sundryBalMap.put("cr_amt",crAmt);
sundryBalMap.put("sundry_type",mischdrMap.get("sundry_type__pay"));
......@@ -2645,7 +2675,7 @@ conn = getConnection();
{
sundryBalMap.put("contact_code","");
}
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -2653,7 +2683,7 @@ conn = getConnection();
}
}
} //end if sundrycodepay
//commented as not required
if( holdTax != 0 )
{
......@@ -2696,11 +2726,11 @@ conn = getConnection();
{
return errString;
}
acctDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
acctCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
acAmt = acDrAmt - acCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -2712,13 +2742,13 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",acAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(!("O".equalsIgnoreCase((String)glTraceMap.get("sundry_type"))))
{
sundryBalMap.put("tran_date",mischdrMap.get("tran_date"));
......@@ -2731,7 +2761,7 @@ conn = getConnection();
sundryBalMap.put("cctr_code",mischdrMap.get("cctr_code__ap"));
sundryBalMap.put("curr_code",mischdrMap.get("curr_code"));
sundryBalMap.put("exch_rate",mischdrMap.get("exch_rate"));
if(holdTax > 0)
{
drAmt = 0;
......@@ -2742,7 +2772,7 @@ conn = getConnection();
drAmt = (0-holdTax);
crAmt = 0;
}
sundryBalMap.put("dr_amt",drAmt);
sundryBalMap.put("cr_amt",crAmt);
sundryBalMap.put("adv_amt",0.0);
......@@ -2756,7 +2786,7 @@ conn = getConnection();
{
sundryBalMap.put("contact_code","");
}
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -2765,7 +2795,7 @@ conn = getConnection();
}
} //end if holdTax
//end of comment
sql = "select hold from misc_voucher where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -2778,7 +2808,7 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
if(hold == null)
{
hold = "N";
......@@ -2794,7 +2824,7 @@ conn = getConnection();
// insert into misc_payables
netAmt = Double.parseDouble(mischdrMap.get("net_amt").toString());
totAmt = netAmt + rndAmt ;
miscPayMap.put("tran_ser","M-VOUC");
miscPayMap.put("tran_date",mischdrMap.get("tran_date"));
miscPayMap.put("ref_no",tranId);
......@@ -2817,7 +2847,7 @@ conn = getConnection();
miscPayMap.put("paid","N");
miscPayMap.put("adv_amt",advAmt);
miscPayMap.put("entry_batch_no",mischdrMap.get("entry_batch_no"));
//miscSType = ()
if("E".equalsIgnoreCase(miscPayMap.get("sundry_type").toString()))
{
......@@ -2833,7 +2863,7 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
if(withHeld == null || withHeld.trim().length() == 0)
{
withHeld = " ";
......@@ -2851,13 +2881,13 @@ conn = getConnection();
{
miscPayMap.put("hold_amt",holdAmt);
}
if((String)mischdrMap.get("order_ref") != null)
{
miscPayMap.put("purc_order",(mischdrMap.get("order_ref").toString()).substring(0,10));
}
//Added By Pavan R on 13/NOV/17 Start to set supp_bill_amt, tds_amt in pay_ibca
sql = "select supp_bill_amt as lc_supp_bill_amt from misc_voucher where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -2871,8 +2901,8 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
sql = "select sum(tax_amt) as lc_tds from taxtran where tran_code = 'M-VOUC' and tran_id = ? and pay_tax = 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -2887,18 +2917,18 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
miscPayMap.put("supp_bill_amt",String.valueOf(lcSuppBillAmt));
miscPayMap.put("tds_amt",String.valueOf(lcTds));
//Code add End By Pavan R on 13/NOV/17
errString = Fcommon.gbfMiscPayUpd(miscPayMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
if(("A".equalsIgnoreCase(vouchType))&&(advAmt !=0))
{
holdAmt = 0 - holdAmt;
......@@ -2925,7 +2955,7 @@ conn = getConnection();
miscPayMap.put("adv_amt",0);
miscPayMap.put("hold_amt",mischdrMap.get("hold_amt"));
//Added By Pavan R on 13/NOV/17 Start to set supp_bill_amt, tds_amt in pay_ibca
sql = "select supp_bill_amt as lc_supp_bill_amt from misc_voucher where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -2939,8 +2969,8 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
sql = "select sum(tax_amt) as lc_tds from taxtran where tran_code = 'M-VOUC' and tran_id = ? and pay_tax = 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -2955,11 +2985,11 @@ conn = getConnection();
rs= null;
pstmt.close();
pstmt=null;
miscPayMap.put("supp_bill_amt",String.valueOf(lcSuppBillAmt));
miscPayMap.put("tds_amt",String.valueOf(lcTds));
//Code add End By Pavan R on 13/NOV/17
errString = Fcommon.gbfMiscPayUpd(miscPayMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3004,11 +3034,11 @@ conn = getConnection();
{
return errString;
}
diffDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
diffCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
diffAmt = diffDrAmt - diffCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -3020,21 +3050,21 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",diffAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
confirm = (String)mischdrMap.get("confirmed");
if (!("Y".equalsIgnoreCase(confirm)))
{
sql =" update misc_voucher set confirmed = 'Y' , "
+" conf_date = ?, "
+" emp_code__aprv = ? "
+" where tran_id = ? " ;
+" conf_date = ?, "
+" emp_code__aprv = ? "
+" where tran_id = ? " ;
System.out.println("SQL : "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,new Timestamp(System.currentTimeMillis()));
......@@ -3090,7 +3120,7 @@ conn = getConnection();
}
return errString;
}//method end
private String gbfPostMiscVoudet(String tranId,HashMap mischdrMap,ArrayList miscdetList,String xtraParams,Connection conn)throws RemoteException,ITMException
{
System.out.println("----------in Method gbfPostMiscVoudet---------------");
......@@ -3104,18 +3134,18 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap glTraceMap = null,acctMap = null,sundryBalMap = null,detListMap = null;
double advAmt=0,taxTranAmt=0,amount=0,drAmt=0,glDrAmt=0,crAmt=0,glCrAmt=0,acctAmt=0,acctDrAmt=0;
double acctCrAmt=0,tCrAmt=0,taxCrAmt=0,tDrAmt=0,taxDrAmt=0,taxAmt=0,totAmount =0;
String lineNo="",acctCode="",vouchType="",acctCodeAdv="",cctrCode="",deptCode="",empCode="";
String analCode="",remarks="",projCode="",sType="",sCode="",rSer="",rId="";
String siteCode="",siteCodeFor="",acctCodePay="",cctrCodePay="",taxAcctCode="",taxCctrCode="";
String siteCode="",siteCodeFor="",acctCodePay="",cctrCodePay="",taxAcctCode="",taxCctrCode="",remarksdet="";
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -3123,13 +3153,13 @@ conn = getConnection();
acctCodeAdv = (String)mischdrMap.get("acct_code__adv");
advAmt =Double.parseDouble(mischdrMap.get("adv_amt").toString());
siteCode =(String)mischdrMap.get("site_code");
glTraceMap = new HashMap();
acctMap = new HashMap();
sundryBalMap = new HashMap();
//added by chandni - 12-SEP-11
sql =" select site_code__for from misc_voucher where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -3142,7 +3172,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
if(siteCodeFor != null)
{
//validation If IBCA Payable master not defied for combination of Login site and Site_code__for
......@@ -3179,13 +3209,13 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
//added by chandni -end
for (int ctr =0; ctr < miscdetList.size(); ctr++)
{
detListMap = new HashMap();
detListMap = (HashMap) miscdetList.get(ctr);
lineNo =(String)detListMap.get("line_no");
taxAmt =Double.parseDouble(detListMap.get("tax_amt").toString());
acctCode =(String)detListMap.get("acct_code");
......@@ -3209,11 +3239,11 @@ conn = getConnection();
System.out.println("amount is equal :::::"+amount);
/***
ls_lineno = right(space(3) + trim(string(li_lineno)), 3)
***/
***/
sql =" select sum(amount) totamt from misc_vouchdet where tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -3223,26 +3253,26 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
glTraceMap.put("tran_date",(mischdrMap.get("tran_date") == null ? "":mischdrMap.get("tran_date")));
glTraceMap.put("eff_date",(mischdrMap.get("eff_date") == null ? "":mischdrMap.get("eff_date")));
glTraceMap.put("fin_entity",(mischdrMap.get("fin_entity") == null ? "":mischdrMap.get("fin_entity")));
glTraceMap.put("site_code",(mischdrMap.get("site_code") == null ? "":mischdrMap.get("site_code")));
//added by chandni -12-SEP-11(accounting effect will change from normal migration,if site_code__for exist)
if(siteCodeFor != null)
{
glTraceMap.put("sundry_type","");
glTraceMap.put("sundry_code","");
boolean flag = true ;
sql =" select sum(tax_amt) taxtranamt,acct_code from taxtran where tran_code = 'M-VOUC' and tran_id = ? "
+" and effect <> 'N' group by acct_code";
+" and effect <> 'N' group by acct_code";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
while (rs.next())
{
flag = false ;
......@@ -3251,7 +3281,7 @@ conn = getConnection();
if (taxAcctCode == null)
{
double taxTotAmt = totAmount + taxTranAmt ;
if (amount > 0)
{
//glTraceMap.put("dr_amt",Double.toString(amount - Math.abs(taxTranAmt)));
......@@ -3264,7 +3294,7 @@ conn = getConnection();
glTraceMap.put("cr_amt",Math.abs(taxTotAmt));
//glTraceMap.put("cr_amt",Double.toString(0 - (amount - Math.abs(taxTranAmt))));
}
}
else
{
......@@ -3281,7 +3311,7 @@ conn = getConnection();
//glTraceMap.put("cr_amt",Double.toString(0 - (amount - Math.abs(taxTranAmt))));
}
}
}
if (flag == true )
{
......@@ -3302,10 +3332,10 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
glTraceMap.put("acct_code",acctCodePay);
glTraceMap.put("cctr_code",cctrCodePay == null ? " ":cctrCodePay);
}
else
{
......@@ -3318,7 +3348,7 @@ conn = getConnection();
glTraceMap.put("sundry_type",mischdrMap.get("sundry_type"));
glTraceMap.put("sundry_code",mischdrMap.get("sundry_code"));
//Commented by Dadaso pawar on 27/08/2014 [END]
if (amount > 0)
{
glTraceMap.put("dr_amt",Double.toString(amount - Math.abs(taxTranAmt)));
......@@ -3336,7 +3366,7 @@ conn = getConnection();
{
glTraceMap.put("sundry_type","O");
glTraceMap.put("sundry_code","");
if (amount > 0)
{
glTraceMap.put("dr_amt",Double.toString(amount));
......@@ -3356,7 +3386,7 @@ conn = getConnection();
glTraceMap.put("cctr_code",cctrCode == null ? " ":cctrCode);
glTraceMap.put("anal_code",analCode == null ?"": analCode);
}
glTraceMap.put("dept_code",deptCode);
glTraceMap.put("emp_code",empCode);
//glTraceMap.put("anal_code",analCode == null ?"": analCode);
......@@ -3373,6 +3403,7 @@ conn = getConnection();
{
glTraceMap.put("remarks",remarks);
}
glTraceMap.put("proj_code",projCode);
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
......@@ -3383,11 +3414,11 @@ conn = getConnection();
{
return errString;
}
acctDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
acctCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
acctAmt = acctDrAmt - acctCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -3400,19 +3431,19 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",acctAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
//sql =" select sum(tax_amt) taxtranamt,acct_code from taxtran where tran_code = 'M-VOUC' and tran_id = ? "
//+" and pay_tax = 'Y' and effect <> 'N' group by acct_code";
//+" and pay_tax = 'Y' and effect <> 'N' group by acct_code";
if(siteCodeFor != null)
{
sql =" select sum(tax_amt) taxtranamt,acct_code,cctr_code from taxtran where tran_code = 'M-VOUC' and tran_id = ? "
+" and effect <> 'N' group by acct_code,cctr_code";
+" and effect <> 'N' group by acct_code,cctr_code";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -3421,7 +3452,7 @@ conn = getConnection();
taxTranAmt = rs.getDouble("taxtranamt");
taxAcctCode = rs.getString("acct_code");
taxCctrCode = rs.getString("cctr_code");
if( (taxTranAmt != 0) && (taxAcctCode != null))
{
glTraceMap.put("tran_date",(mischdrMap.get("tran_date") == null ? "":mischdrMap.get("tran_date")));
......@@ -3430,7 +3461,7 @@ conn = getConnection();
glTraceMap.put("site_code",(mischdrMap.get("site_code") == null ? "":mischdrMap.get("site_code")));
glTraceMap.put("sundry_type","");
glTraceMap.put("sundry_code","");
if( taxTranAmt < 0 )
{
glTraceMap.put("dr_amt","0");
......@@ -3445,7 +3476,7 @@ conn = getConnection();
taxDrAmt =Double.parseDouble(glTraceMap.get("cr_amt").toString());
tDrAmt = tDrAmt + taxDrAmt;
}
glTraceMap.put("acct_code",taxAcctCode);
glTraceMap.put("cctr_code",taxCctrCode == null ? " " : taxCctrCode);
glTraceMap.put("dept_code",deptCode);
......@@ -3456,21 +3487,21 @@ conn = getConnection();
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","M-VOUC");
glTraceMap.put("ref_id",tranId);
glTraceMap.put("remarks",remarks);
glTraceMap.put("remarks",remarksdet);
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
glTraceMap.put("party_doc_ref",Fcommon.gfGetPartyDocRef(rSer,rId,conn));
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
acctDrAmt = Double.parseDouble(glTraceMap.get("dr_amt").toString());
acctCrAmt = Double.parseDouble(glTraceMap.get("cr_amt").toString());
acctAmt = acctDrAmt - acctCrAmt;
acctMap.put("tran_id",(glTraceMap.get("ref_id") == null ? "":glTraceMap.get("ref_id")));
acctMap.put("acct_code",(glTraceMap.get("acct_code") == null ? "":glTraceMap.get("acct_code")));
acctMap.put("cctr_code",(glTraceMap.get("cctr_code") == null ? "":glTraceMap.get("cctr_code")));
......@@ -3483,7 +3514,7 @@ conn = getConnection();
acctMap.put("curr_code",(glTraceMap.get("curr_code") == null ? "":glTraceMap.get("curr_code")));
acctMap.put("exch_rate",(glTraceMap.get("exch_rate") == null ? "":glTraceMap.get("exch_rate")));
acctMap.put("amount",acctAmt);
errString = this.gbfAcctInsert(acctMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......@@ -3510,7 +3541,7 @@ conn = getConnection();
System.out.println("curcCode["+curcCodeac+"]");
sundryBalMap.put("curr_code",curcCodeac);
sundryBalMap.put("exch_rate",mischdrMap.get("exch_rate"));
if(amount > 0)
{
drAmt = amount;
......@@ -3521,7 +3552,7 @@ conn = getConnection();
drAmt = 0;
crAmt = (0-amount);
}
sundryBalMap.put("dr_amt",drAmt);
sundryBalMap.put("cr_amt",crAmt);
sundryBalMap.put("adv_amt",advAmt);
......@@ -3544,7 +3575,7 @@ conn = getConnection();
}
} //end of for
}// end of try
catch(SQLException e)
{
System.out.println("Exception :MiscValConf :gbfPostMiscVoudet :SQLException :==>\n"+e.getMessage());
......@@ -3590,7 +3621,7 @@ conn = getConnection();
}
return errString;
}//method end
String otherSitePostMiscVal(String tranId,HashMap mischdrMap,ArrayList miscdetList,String xtraParams,Connection conn)throws RemoteException,ITMException
{
System.out.println("--------------in method otherSitePostMiscVal------------");
......@@ -3599,13 +3630,13 @@ conn = getConnection();
System.out.println("xtraParams---->>["+xtraParams+"]");
PreparedStatement pstmt = null;
PreparedStatement pstmtInner = null;
ResultSet rs = null;
ResultSet rsInner = null;
String sql ="",sqlInner="";
ConnDriver connDriver = null;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
JvConfirm JvConf = new JvConfirm();
......@@ -3613,29 +3644,29 @@ conn = getConnection();
HashMap jMap=null,jdetMap=null;
HashMap glTraceMap = null,sundryBalMap = null;
ArrayList jdList = new ArrayList();
String errString ="";
java.util.Date toDate = new java.util.Date();
java.sql.Timestamp toDay = null;
java.sql.Timestamp tranDate = null;
String empCodeAprv="",siteCode="",siteCodeFor="",acctCodeRcp="",cctrCodeRcp="",thisWin="",keyStr="",xmlString="";
String tranIDSer="",FinEntitySite="",detAcctCode="",amountStr="",detCctrCode="",detEmpCode="";
String detAnalCode="",detRemarks="",detProjCode="",detSundryType="",detDrcrFlag="";
double detAmount=0,amount=0,totAmount=0;
int ctr=0,cnt1=0;
double detTotAmount=0,detTaxAmt=0;
try
{
E12GenericUtility genericUtility = new E12GenericUtility();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
empCodeAprv = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
itmDBAccessEJB = new ITMDBAccessEJB();
toDay =new java.sql.Timestamp(toDate.getTime());
sql =" select site_code,site_code__for from misc_voucher where tran_id = ? ";
pstmt =conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......@@ -3649,7 +3680,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt =null;
sql =" select acct_code__rcp,cctr_code__rcp from ibca_pay_ctrl where site_code__from = ? and site_code__to = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
......@@ -3664,7 +3695,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
thisWin ="W_MISC_VOUCHER" ;
sql =" select key_string from transetup where upper(tran_window) = ? ";
pstmt =conn.prepareStatement(sql);
......@@ -3696,15 +3727,15 @@ conn = getConnection();
pstmt =null;
tranDate = (Timestamp)mischdrMap.get("tran_date");
xmlString ="<?xml version=\"1.0\"?>\r\n<Root>\r\n<header>"+
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<site_code>"+siteCodeFor+"</site_code>\r\n<tran_date>"+sdf.format(new java.util.Date(tranDate.getTime()))+"</tran_date></Detail1></Root>";
"\r\n</header><Detail1><item_ser></item_ser>"+
"\r\n<site_code>"+siteCodeFor+"</site_code>\r\n<tran_date>"+sdf.format(new java.util.Date(tranDate.getTime()))+"</tran_date></Detail1></Root>";
System.out.println("xmlString : : : : :"+xmlString);
CommonConstants.setIBASEHOME();
TransIDGenerator tg = new TransIDGenerator(xmlString,"Base",CommonConstants.DB_NAME);
tranIDSer = tg.generateTranSeqID("M-VOUC","tran_id",keyStr,conn);
System.out.println("Generated Key :: "+tranIDSer);
if (tranIDSer.indexOf("ERROR") > -1 )
{
......@@ -3723,10 +3754,10 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt =null;
sql =" select sum(amount) from misc_vouchdet where tran_id = ? ";
//sql =" select sum(amount - tax_amt) from misc_vouchdet where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -3739,12 +3770,12 @@ conn = getConnection();
pstmt.close();
pstmt=null;
System.out.println("detAmount is equal :::"+detAmount);
sql =" insert into journal "
+" (tran_id, tran_date, eff_date, fin_entity, site_code, dr_amt, cr_amt , "
+" remarks, reversible, status, confirmed, ref_ser, ref_no, curr_code, "
+" tran_type, exch_rate, chg_date, chg_user, proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? )";
+" (tran_id, tran_date, eff_date, fin_entity, site_code, dr_amt, cr_amt , "
+" remarks, reversible, status, confirmed, ref_ser, ref_no, curr_code, "
+" tran_type, exch_rate, chg_date, chg_user, proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? )";
System.out.println("SQL for journal insert :: "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); //new generated tranId
......@@ -3768,7 +3799,7 @@ conn = getConnection();
pstmt.setString(19,(String)mischdrMap.get("proj_code"));
pstmt.executeUpdate();
pstmt.close();
jMap = new HashMap();
jMap.put("tran_type",(mischdrMap.get("tran_type") == null ? "":mischdrMap.get("tran_type")));
jMap.put("tran_date",tranDate);
......@@ -3787,16 +3818,16 @@ conn = getConnection();
jMap.put("remarks",(mischdrMap.get("remarks") == null ? "":mischdrMap.get("remarks")));
jMap.put("confirmed","N");
jMap.put("exch_rate",(mischdrMap.get("exch_rate") == null ? "":mischdrMap.get("exch_rate")));
sql =" insert into jourdet "
+" (tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values(?,?,?,?,?,?,?,?,?,?,?,?)";
+" (tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values(?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
sqlInner =" select acct_code,amount,cctr_code,emp_code,anal_code,remarks,proj_code,sundry_type__for,tax_amt "
+" from misc_vouchdet where tran_id = ?" ;
+" from misc_vouchdet where tran_id = ?" ;
pstmtInner = conn.prepareStatement(sqlInner);
pstmtInner.setString(1,tranId);
rsInner = pstmtInner.executeQuery();
......@@ -3826,7 +3857,7 @@ conn = getConnection();
detTotAmount = amount + detTaxAmt;
//totAmount = totAmount + detTotAmount ;
totAmount = totAmount + amount ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id
pstmt.setInt(2,ctr);
......@@ -3849,10 +3880,10 @@ conn = getConnection();
pstmt.setString(11,detRemarks);
pstmt.setString(12,detProjCode);
pstmt.addBatch();
pstmt.executeBatch();
pstmt.close();
jdetMap = new HashMap();
jdetMap.put("line_no",ctr);
jdetMap.put("acct_code",detAcctCode == null ? "":detAcctCode);
......@@ -3867,16 +3898,16 @@ conn = getConnection();
jdetMap.put("sundry_code","");
jdetMap.put("remarks",detRemarks);
jdetMap.put("proj_code",(mischdrMap.get("proj_code") == null ? "":mischdrMap.get("proj_code")));
jdList.add(jdetMap);
}//end of while
rsInner.close();
rsInner = null;
pstmtInner.close();
pstmtInner = null;
/* A/C effect for ibca-rcp acctcode with total amount */
sql =" select count(1) from misc_vouchdet where tran_id = ? " ;
pstmt = conn.prepareStatement(sql);
......@@ -3890,7 +3921,7 @@ conn = getConnection();
rs = null;
pstmt.close();
pstmt = null;
if(cnt1 > 0)
{
if("C".equalsIgnoreCase(detDrcrFlag))
......@@ -3904,11 +3935,11 @@ conn = getConnection();
System.out.println("detDrcrFlag AFTER SWAP insert:: "+detDrcrFlag);
cnt1++;
sql =" insert into jourdet "
+" ( tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?)";
+" ( tran_id, line_no, sundry_type,sundry_code, acct_code,cctr_code, "
+" drcr_flag, amount, emp_code, anal_code,remarks,proj_code ) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?)";
System.out.println(" SQL for jourdet insert with total amount:: "+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id
pstmt.setInt(2,cnt1);
......@@ -3925,7 +3956,7 @@ conn = getConnection();
pstmt.setString(12,(String)mischdrMap.get("proj_code"));
pstmt.executeUpdate();
pstmt.close();
glTraceMap = new HashMap();
glTraceMap.put("tran_date",tranDate);
glTraceMap.put("eff_date",(mischdrMap.get("eff_date") == null ? "":mischdrMap.get("eff_date")));
......@@ -3957,32 +3988,32 @@ conn = getConnection();
glTraceMap.put("ref_id",tranIDSer);
glTraceMap.put("remarks","");
glTraceMap.put("proj_code",detProjCode);
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
}
}
/* accounting effect for site code for - auto generation site - end */
/* in original tran id misc voucher set tran_id__gen = new created tran_id */
sql =" update misc_voucher "
+" set tran_id__gen = ? "
+" where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer);
pstmt.setString(2,tranId);
int updCnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
+" set tran_id__gen = ? "
+" where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer);
pstmt.setString(2,tranId);
int updCnt = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
/*calling gbfPostJournal of JvConfirm - (Normal Posting) by passing tranIDSer - (new generated tran_id)*/
errString = JvConf.gbfPostJournal(tranIDSer,jMap,jdList,xtraParams,conn);
if(errString != null && errString.trim().length() > 0)
{
return errString;
}
} // end of try
catch(SQLException e)
{
......@@ -4038,9 +4069,9 @@ conn = getConnection();
String sql = "";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
String errCode="",tranId = "";
double amount=0;
int lineNo=0;
......@@ -4048,47 +4079,47 @@ conn = getConnection();
{
tranId = (String)acctMap.get("tran_id");
amount = Double.parseDouble(acctMap.get("amount").toString());
sql =" select max(line_no) line from misc_vouchacct where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
if(rs.next())
rs = pstmt.executeQuery();
if(rs.next())
{
lineNo = rs.getInt("line");
}
rs.close();
lineNo = rs.getInt("line");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
lineNo = lineNo +1 ;
sql =" insert into misc_vouchacct (tran_id, line_no, acct_code, cctr_code,sundry_type, "
+" sundry_code, emp_code, anal_code, amount,remarks, curr_code, exch_rate, dept_code) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setInt(2,lineNo);
pstmt.setString(3,(String)acctMap.get("acct_code"));
pstmt.setString(4,(String)acctMap.get("cctr_code"));
pstmt.setString(5,(String)acctMap.get("sundry_type"));
pstmt.setString(6,(String)acctMap.get("sundry_code"));
pstmt.setString(7,(String)acctMap.get("emp_code"));
pstmt.setString(8,(String)acctMap.get("anal_code"));
pstmt.setDouble(9,amount);
pstmt.setString(10,(String)acctMap.get("remarks"));
pstmt.setString(11,(String)acctMap.get("curr_code"));
pstmt.setDouble(12,Double.parseDouble(acctMap.get("exch_rate").toString()));
pstmt.setString(13,(String)acctMap.get("dept_code"));
int count = pstmt.executeUpdate();
if(count < 1)
{
errCode = "DS000 : Insert Into misc_vouchacct Failed";
return(errCode);
}
pstmt.close();pstmt = null;
+" sundry_code, emp_code, anal_code, amount,remarks, curr_code, exch_rate, dept_code) "
+" values (?,?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.setInt(2,lineNo);
pstmt.setString(3,(String)acctMap.get("acct_code"));
pstmt.setString(4,(String)acctMap.get("cctr_code"));
pstmt.setString(5,(String)acctMap.get("sundry_type"));
pstmt.setString(6,(String)acctMap.get("sundry_code"));
pstmt.setString(7,(String)acctMap.get("emp_code"));
pstmt.setString(8,(String)acctMap.get("anal_code"));
pstmt.setDouble(9,amount);
pstmt.setString(10,(String)acctMap.get("remarks"));
pstmt.setString(11,(String)acctMap.get("curr_code"));
pstmt.setDouble(12,Double.parseDouble(acctMap.get("exch_rate").toString()));
pstmt.setString(13,(String)acctMap.get("dept_code"));
int count = pstmt.executeUpdate();
if(count < 1)
{
errCode = "DS000 : Insert Into misc_vouchacct Failed";
return(errCode);
}
pstmt.close();pstmt = null;
}// end of try
catch(SQLException e)
{
......@@ -4116,7 +4147,7 @@ conn = getConnection();
}
return errCode;
}//method end
// to create token for processing as array
private String[] string2StringArray(String str1 , String delimeter)
{
......@@ -4134,8 +4165,8 @@ conn = getConnection();
return arry1 ;
}
private static double roundVal(double round, int scale)
{
return Math.round(round * Math.pow(10, scale)) / Math.pow(10, scale);
}
{
return Math.round(round * Math.pow(10, scale)) / Math.pow(10, scale);
}
} //class
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