Skip to content

B
business-java
Commit 880cfd68 authored by vdhoble's avatar vdhoble
Browse files
Options

changes done for taxtran amt calculation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100350 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 428bed9b
Show whitespace changes
Inline Side-by-side
Showing with 878 additions and 806 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscPayGltracePreview.java
View file @ 880cfd68
......@@ -78,7 +78,11 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
System.out.println("Printing loginEmpCode---1-----"+loginEmpCode+"--");
sql = "select tran_id,remarks,tran_Date,ref_date,tran_type,fin_entity,site_code,bank_code,acct_code__bal,cctr_code__bal,curr_code__bc,curr_code,exch_rate,bank_charges,discount_amt,acct_code__bc,cctr_code__bc,curr_code__bc,exch_rate__bc,diff_amt__exch,acct_code__cf,cctr_code__cf from misc_payment where tran_id = ?";
sql = "select tran_id,remarks,tran_Date,ref_date,tran_type,fin_entity,site_code" +
",bank_code,acct_code__bal,cctr_code__bal,curr_code__bc," +
"curr_code,exch_rate,bank_charges,discount_amt,acct_code__bc," +
"cctr_code__bc,curr_code__bc,exch_rate__bc,diff_amt__exch," +
"acct_code__cf,cctr_code__cf from misc_payment where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
......@@ -129,7 +133,10 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
lineNoDet = rs1.getString("line_no");
System.out.println("Line NO Detail***************"+lineNoDet);
sql = "select (case when exch_rate is null then 0 else exch_rate end) as exchRateDet,pay_amt,(case when tax_amt is null then 0 else tax_amt end) as taxAmt, (case when discount_amt is null then 0 else discount_amt end) as discountAmt from misc_paydet where tran_id = ? and line_no = ?";
sql = "select (case when exch_rate is null then 0 else exch_rate end) as exchRateDet,pay_amt," +
"(case when tax_amt is null then 0 else tax_amt end) as taxAmt, " +
"(case when discount_amt is null then 0 else discount_amt end) as discountAmt " +
" from misc_paydet where tran_id = ? and line_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
pstmt.setString(2,lineNoDet);
......@@ -160,8 +167,8 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
pstmt1.close();
pstmt1=null;
lineNoDet = " " + lineNoDet;
lineNoDet = lineNoDet.substring(lineNoDet.length() - 3,lineNoDet.length());
/* lineNoDet = " " + lineNoDet;
lineNoDet = lineNoDet.substring(lineNoDet.length() - 3,lineNoDet.length());*/
//Header coding ********************************************************************************************
......@@ -181,7 +188,9 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("dr_amt",0.0);
if(bankCharges > 0.0)
{
sql = "select sum(case when net_pay_amt is null then 0 else net_pay_amt end) as Amt,sum(case when bank_charges is null then 0 else bank_charges end) as bnkChg from misc_paydet where tran_id = ?";
sql = "select sum(case when net_pay_amt is null then 0 else net_pay_amt end) as Amt," +
"sum(case when bank_charges is null then 0 else bank_charges end) as bnkChg " +
"from misc_paydet where tran_id = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,tranID);
......@@ -226,25 +235,23 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
if(discAmt > 0.0)
{
System.out.println("discAmt**************"+discAmt);
sql = "select sum(case when discount_amt is null then 0 else discount_amt end) as disc_amt, acct_code__disc as acct_code_disc,cctr_code__disc as cctr_code_disc,cctr_code__ap,acct_code__ap,sundry_type,sundry_code from misc_paydet where tran_id = ? group by acct_code__disc,cctr_code__disc";
System.out.println("discAmt******@@@@@***header posting*****"+discAmt);
sql = "select sum(case when discount_amt is null then 0 else discount_amt end) as disc_amt," +
" acct_code__disc as acct_code_disc," +
"cctr_code__disc as cctr_code_disc,cctr_code__ap,acct_code__ap," +
"sundry_type,sundry_code from misc_paydet where tran_id = ? " +
"group by discount_amt,acct_code__disc,cctr_code__disc,cctr_code__ap," +
"acct_code__ap,sundry_type,sundry_code";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
rs = pstmt.executeQuery();
if(rs.next())
while(rs.next())
{
discountAmtDet = rs.getDouble("disc_amt");
acctCodeDisc = rs.getString("acct_code_disc");
cctrCodeDisc = rs.getString("cctr_code_disc");
cctrCodeAp = rs.getString("cctr_code__ap");
acctCodeAp = rs.getString("acct_code__ap");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
if(discountAmtDet != 0.0)
{
hdrmap.put("acct_code",acctCodeDisc);
......@@ -263,25 +270,29 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
}
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
}
//*******************Debit Side Entry
if(discAmt > 0.0)
{
sql = "select sum(case when discount_amt is null then 0 else discount_amt end) as disc_amt, acct_code__disc as acct_code_disc,cctr_code__disc as cctr_code_disc from misc_paydet where tran_id = ? group by acct_code__disc,cctr_code__disc";
sql = "select sum(case when discount_amt is null then 0 else discount_amt end) as disc_amt," +
" acct_code__disc as acct_code_disc,cctr_code__disc as cctr_code_disc " +
"from misc_paydet where tran_id = ? group by discount_amt,acct_code__disc,cctr_code__disc";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
rs = pstmt.executeQuery();
if(rs.next())
while(rs.next())
{
discountAmtDet = rs.getDouble("disc_amt");
acctCodeDisc = rs.getString("acct_code_disc");
cctrCodeDisc = rs.getString("cctr_code_disc");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
if(discountAmtDet != 0.0)
{
System.out.println("discountAmtDet*************"+discountAmtDet);
......@@ -300,6 +311,13 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
return errString;
}
}
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
}
// update bank charges into gltrace
......@@ -310,7 +328,7 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("fin_entity",finentity);
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","O");
hdrmap.put("sundry_code","");
hdrmap.put("sundry_code"," ");
hdrmap.put("acct_code",acctCodeBc);
hdrmap.put("cctr_code",cctrCodeBc);
hdrmap.put("emp_code",empcode);
......@@ -341,7 +359,7 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("fin_entity",finentity);
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","O");
hdrmap.put("sundry_code","");
hdrmap.put("sundry_code"," ");
hdrmap.put("acct_code",acctCodeCf);
if(cctrCodeCf == null || cctrCodeCf.trim().length() == 0)
{
......@@ -390,7 +408,6 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","B");
hdrmap.put("sundry_code",sundrycode);
hdrmap.put("acct_code",acct_code);
hdrmap.put("cctr_code",cctr_code);
hdrmap.put("emp_code",empcode);
......@@ -426,10 +443,14 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
System.out.println("lineNoDet***"+lineNoDet);
sql = "select sundry_type,sundry_code,tran_ser,vouch_no,curr_code,exch_rate__vouch,pay_amt,(case when discount_amt is null then 0 else discount_amt end) as discount_amt,acct_code__ap,acct_code__disc,cctr_code__disc,cctr_code__ap from misc_paydet where tran_id = ? and line_no = ?";
sql = "select sundry_type,sundry_code,tran_ser,vouch_no," +
"curr_code,exch_rate__vouch,pay_amt," +
"(case when discount_amt is null then 0 else discount_amt end)" +
" as discount_amt,acct_code__ap,acct_code__disc,cctr_code__disc,cctr_code__ap " +
" from misc_paydet where tran_id = ? and trim(line_no) = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranID);
pstmt.setString(2,lineNoDet);
pstmt.setString(2,lineNoDet.trim());
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -475,7 +496,7 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("ref_type","F");
hdrmap.put("ref_ser","M-PAY");
hdrmap.put("ref_id",tranID);
if(remarks.equalsIgnoreCase("Automatic Payment"))
if("Automatic Payment".equalsIgnoreCase(remarks))
{
hdrmap.put("remarks","Against voucher no. : "+ref+ " dated : "+new Timestamp(rs.getDate("vouch_date").getTime()));
}
......@@ -494,11 +515,14 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
}
//***********
sql = " select sum(case when tax_amt is null then 0 else tax_amt end) as tax_amt, acct_code, cctr_code ,case when sum(reco_amount) is null then 0 else sum(reco_amount) end from taxtran where tran_code = 'M-PAY' and tran_id = ? and line_no = ? and effect <> 'N' group by acct_code, cctr_code ";
sql = " select sum(case when tax_amt is null then 0 else tax_amt end) as tax_amt, " +
"acct_code, cctr_code ,case when sum(reco_amount) is null then 0" +
" else sum(reco_amount) end as reco_amount from taxtran where tran_code = 'M-PAY'" +
" and tran_id = ? and trim(line_no) = ? and effect <> 'N' group by acct_code, cctr_code ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,tranID);
pstmt1.setString(2,lineNoDet);
pstmt1.setString(2,lineNoDet.trim());
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
......@@ -506,24 +530,19 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
acctCodeTran = rs1.getString("acct_code");
cctrCodeTran = rs1.getString("cctr_code");
reco_amount = rs1.getDouble("reco_amount");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
if(taxAmtDet != 0.0)
{
if(cctr_code == null)
if(cctrCodeTran == null)
{
cctr_code = cctrCodeAp;
cctrCodeTran = cctrCodeAp;
}
System.out.println("Cost center code for taxtran"+cctrCodeTran);
hdrmap.put("tran_date",tranDate);
hdrmap.put("eff_date", effDate);
hdrmap.put("fin_entity",finentity);
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","O");
hdrmap.put("sundry_code","");
hdrmap.put("sundry_code"," ");
hdrmap.put("acct_code",acctCodeTran);
hdrmap.put("cctr_code",cctrCodeTran);
hdrmap.put("curr_code", currCode);
......@@ -552,27 +571,30 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
}
}
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
reco_amount = 0.0;
tax_reco_cctr = finCommon.getAcctDetrTtype("", "", "TAXRECO", tranType, conn);
tax_reco_acct = getTokens(tax_reco_cctr, "~t");
sql = "select acct_code__reco, cctr_code__reco, case when sum(reco_amount) is null then 0 else sum(reco_amount) end from taxtran where tran_code = 'M-PAY' and tran_id = ? and line_no = ? and (case when reco_amount is null then 0 else reco_amount end) <> 0 and effect <> 'N' group by acct_code__reco, cctr_code__reco ";
sql = "select acct_code__reco, cctr_code__reco, " +
"case when sum(reco_amount) is null then 0 else sum(reco_amount) end as reco_amount " +
"from taxtran where tran_code = 'M-PAY' and tran_id = ? and trim(line_no) = ? " +
"and (case when reco_amount is null then 0 else reco_amount end) <> 0 and effect <> 'N' " +
"group by acct_code__reco, cctr_code__reco ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,tranID);
pstmt1.setString(2,lineNoDet);
pstmt1.setString(2,lineNoDet.trim());
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
acctCodeReco = rs1.getString("acct_code__reco");
cctrCodeReco = rs1.getString("cctr_code__reco");
reco_amount = rs1.getDouble("reco_amount");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
if(acctCodeReco == null || acctCodeReco.trim().length() == 0 )
{
acctCodeReco = tax_reco_acct.toString();
......@@ -581,12 +603,13 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
if(cctrCodeReco == null || cctrCodeReco.trim().length() == 0)
{
cctrCodeReco = "";
}//8th march changes
hdrmap.put("tran_date",tranDate);
hdrmap.put("eff_date", effDate);
hdrmap.put("fin_entity",finentity);
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","O");
hdrmap.put("sundry_code","");
hdrmap.put("sundry_code"," ");
hdrmap.put("acct_code",acctCodeReco);
hdrmap.put("cctr_code",cctrCodeReco);
hdrmap.put("curr_code", currCode);
......@@ -617,12 +640,23 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
{
return errString;
}
}
}//close of loop
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
sql = " select acct_code__revr,cctr_code__revr ,sum(misc_vouchdet.amount) as miscAmt from misc_vouchdet,misc_voucher where misc_vouchdet.tran_id =misc_voucher.tran_id and misc_voucher.vouch_type = 'T' and misc_voucher.tran_id in (select vouch_no from misc_paydet where tran_id = ? and tran_ser = 'M-VOUC') and acct_code__revr is not null group by acct_code__revr,cctr_code__revr";
sql = " select acct_code__revr,cctr_code__revr ," +
"sum(misc_vouchdet.amount) as miscAmt from misc_vouchdet," +
"misc_voucher where misc_vouchdet.tran_id = misc_voucher.tran_id and" +
" misc_voucher.vouch_type = 'T' and misc_voucher.tran_id in" +
" (select vouch_no from misc_paydet where tran_id = ? and tran_ser = 'M-VOUC') " +
"and acct_code__revr is not null group by acct_code__revr,cctr_code__revr";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,tranID);
......@@ -632,12 +666,6 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
acct_code__revr = rs1.getString("acct_code__revr");
cctr_code__revr = rs1.getString("acct_code__revr");
miscAmt = rs1.getDouble("miscAmt");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
if(acct_code__revr != null && acct_code__revr.trim().length() > 0)
{
if(cctr_code == null)
......@@ -657,18 +685,15 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
hdrmap.put("ref_type","F");
hdrmap.put("ref_ser","M-PAY");
hdrmap.put("ref_id",tranID);
AmountDet = rs.getDouble("amount") ;
if(AmountDet == null){
AmountDet = 0.0;
}
if(AmountDet > 0.0)
//AmountDet = rs.getDouble("amount") ;
if(miscAmt > 0.0)
{
hdrmap.put("dr_amt", 0.0);
hdrmap.put("cr_amt", 0.0 - AmountDet);
hdrmap.put("dr_amt", miscAmt);
hdrmap.put("cr_amt", 0.0 );
}
else {
hdrmap.put("dr_amt", 0.0 - AmountDet);
hdrmap.put("cr_amt", 0.0);
hdrmap.put("dr_amt", 0.0);
hdrmap.put("cr_amt", miscAmt);
}
party_doc_ref = finCommon.gfGetPartyDocRef(tranSer,ref,conn);//transer and vouch_no
......@@ -681,18 +706,58 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
{
return errString;
}
sql = " select fn_get_reco_acct(?) as ls_acct_revr from dual ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,acct_code__revr);
rs = pstmt.executeQuery();
if(rs.next())
{
acct_code__revr = rs.getString("ls_acct_revr");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
// posting of tax revarsal charge to revarsal account
/*
if ((acct_code__revr) == null || acct_code__revr.trim().length() == 0 )
{
*/
// posting of tax revarsal charge to Recovary account
hdrmap.put("acct_code",acct_code__revr);
/*hdrmap.put("cctr_code",cctr_code__revr);
hdrmap.put("tran_date",tranDate);
hdrmap.put("eff_date", effDate);
hdrmap.put("fin_entity",finentity);
hdrmap.put("site_code",sitecode);
hdrmap.put("sundry_type","O");
hdrmap.put("sundry_code","");
hdrmap.put("curr_code", currCode);
hdrmap.put("exch_rate",exchRate);
hdrmap.put("ref_type","F");
hdrmap.put("ref_ser","M-PAY");
hdrmap.put("ref_id",tranID);*/
if(AmountDet > 0.0)
if(miscAmt > 0.0)
{
hdrmap.put("dr_amt",0.0 - AmountDet);
hdrmap.put("dr_amt",miscAmt);
hdrmap.put("cr_amt", 0.0);
}
else {
hdrmap.put("dr_amt",0.0);
hdrmap.put("cr_amt", 0.0 - AmountDet);
hdrmap.put("cr_amt",miscAmt);
}
party_doc_ref = finCommon.gfGetPartyDocRef(tranSer,ref,conn);//transer and vouch_no
hdrmap.put("party_doc_ref",party_doc_ref);
System.out.println("calling Gltrace Update for Detail******** 5 *******************");
errString = finCommon.glTraceUpdate(hdrmap,conn,true);
System.out.println("ERROR STRING>>>>>>>>>>>>>>>>>>>>>>["+errString+"]");
......@@ -704,6 +769,13 @@ public class MiscPayGltracePreview extends ActionHandlerEJB implements MiscPayGl
}
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
}
rs.close();
rs=null;
......
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