Skip to content

B
business-java
Commit d4e3f128 authored by kmandhre's avatar kmandhre
Browse files
Options

sun source merge mail by Rohan 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91925 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b76d3d44
Show whitespace changes
Inline Side-by-side
Showing with 289 additions and 98 deletions
webitm-dis/ibase/webitm/ejb/dis/TaxCalculate.java
View file @ d4e3f128
......@@ -23,6 +23,7 @@ import ibase.system.config.*;
import javax.ejb.Stateless; // added for ejb3
//public class TaxCalculateEJB extends ProcessEJB implements SessionBean
@Stateless // added for ejb3
public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCalculateRemote
......@@ -42,6 +43,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
transient java.sql.Timestamp nextYearCapitalDate = null;
transient java.sql.Timestamp prevYearTranDate = null;
ValidatorEJB validator = new ValidatorEJB();
//Changed by rohan on 10-01-12 to create object of DistComman
DistCommon discommon = new DistCommon();
/*public void ejbCreate() throws RemoteException, CreateException
{
}
......@@ -351,6 +354,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
String tranType = "";
String tranIdProc = "";
String srNo = "";
//Changed by Rohan on 10/01/12 to define variable.start
String balGroup = "";
boolean isCapitalItem = false;
//Changed by Rohan on 10/01/12 to define variable.end
double adjAmt = 0.0;
double addlExcise = 0.0; // 06-01-2007 manoharan new column added to be updated
......@@ -407,10 +416,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
StringBuffer sqlInsertTaxProcessed =null;
if(drcrType.trim().equalsIgnoreCase("D"))
{
System.out.println("Enter in insert1");
sqlInsertTaxProcessed = new StringBuffer("INSERT INTO TAX_PROCESSED (TRAN_ID, TRAN_DATE, BAL_GROUP, DOC_TYPE, BAL_TYPE, BAL_PRD, REF_SER, DRCR_FLAG, NET_AMT, DR_AMT, CR_AMT, TAX_CHAP, ITEM_CODE, SITE_CODE, QTY_RECD, SUPP_CODE, EXC_REF, CLOSING_STOCK, SITE_CODE__SUPP, SITE_CODE__TRAN, TRAN_TYPE_TRANSACTION, PROCESS_YN, CHAP_HEADING, LOT_NO, TAX_AMT, INVOICE_NO, TAX_CODE, CHG_DATE, CHG_USER, CHG_TERM, REF_DOC_NO, REF_DOC_DATE, LOT_SL, MATERIAL_CATEGORY, REF_ID,REF_DATE,REF_LINE,TRAN_TYPE, SR_NO,BAL_GROUP__ADJ, ADJ_AMT, ADDL_EXCISE,BATCH_NO ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
}
else
{
System.out.println("Enter in insert");
sqlInsertTaxProcessed = new StringBuffer("INSERT INTO TAX_PROCESSED (TRAN_ID, TRAN_DATE, BAL_GROUP, DOC_TYPE, BAL_TYPE, BAL_PRD, REF_SER, DRCR_FLAG, NET_AMT, DR_AMT, CR_AMT, TAX_CHAP, ITEM_CODE, SITE_CODE, QTY_RECD, SUPP_CODE, EXC_REF, CLOSING_STOCK, SITE_CODE__SUPP, SITE_CODE__TRAN, TRAN_TYPE_TRANSACTION, PROCESS_YN, CHAP_HEADING, LOT_NO, TAX_AMT, INVOICE_NO, TAX_CODE, CHG_DATE, CHG_USER, CHG_TERM, REF_DOC_NO, REF_DOC_DATE, LOT_SL, MATERIAL_CATEGORY, REF_ID,REF_DATE,REF_LINE,TRAN_TYPE, SR_NO,BAL_GROUP__ADJ, ADJ_AMT, ADDL_EXCISE ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
}
// end 06-01-2007 manoharan addl_excise to be updated
......@@ -461,6 +472,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sqlUpdateTaxProcessed.append("AND REF_LINE = '"+(String)currRecordList.get(colNameList.indexOf("REF_LINE"))+"'");
}
pstmtUpdateTaxProcessed = conn.prepareStatement(sqlUpdateTaxProcessed.toString());
//ADDED 30082006
// 03-11-2006 manohar in case of debit bal_group__adj to be considered
// as can be partially adjusted against different bal_group
......@@ -492,11 +504,24 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
refId = (String)currRecordList.get(colNameList.indexOf("REF_ID"));
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
balGroup = (String) currRecordList.get(colNameList.indexOf("BAL_GROUP"));
isCapitalItem = isCapitalItem(balGroup, conn);
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
/***************************** capital items ****************************/
tranType = (String)currRecordList.get(colNameList.indexOf("TRAN_TYPE"));
if(tranType.trim().equals("C"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//adjAmt = adjAmt/2;
if(isCapitalItem)
{
adjAmt = adjAmt/2;
}
pstmtSelectTaxProcessed.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtSelectTaxProcessed.setString(2, balType); //balance type
pstmtSelectTaxProcessed.setObject(3, currRecordList.get(colNameList.indexOf("BAL_PRD"))); //balance period
......@@ -646,6 +671,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
tranIdProc = getUniqueKey(conn, "w_cenvat_cr_capital", currRecordList.get(colNameList.indexOf("PROC_DATE")).toString());
//System.out.println("1st tran id/srno " + tranIdProc);
//Changed by Rohan on 2-10-12 to insert in case of capital item only.start
if(isCapitalItem)
{
pstmtInsertCenvatCrCapital.setString(1, tranIdProc); //transaction id
pstmtInsertCenvatCrCapital.setTimestamp(2, nextYearCapitalDate);
// ***********added later //transaction date
......@@ -732,11 +761,13 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtInsertCenvatCrCapital.setString(45, batchNo); //BATCH_NO
}
pstmtInsertCenvatCrCapital.executeUpdate();
}
//Changed by Rohan on 2-10-12 to insert in case of capital item only.end
//ended by chandni
}//if (cntTaxProcessed==0)
else
{
pstmtUpdateTaxProcessed.setDouble(1, adjAmt); //adj amt
pstmtUpdateTaxProcessed.setDouble(1, adjAmt);//adj amt
pstmtUpdateTaxProcessed.setDouble(2, addlExcise); // 06-01-2006 manoharan new column
pstmtUpdateTaxProcessed.setObject(3, currRecordList.get(colNameList.indexOf("TAX_AMT")));//ADDED BY NISAR ON 04/02/08
pstmtUpdateTaxProcessed.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
......@@ -922,6 +953,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
else
{
pstmtUpdateTaxProcessed.setDouble(1, adjAmt); //adj amt
System.out.println("update tax process1"+adjAmt);
pstmtUpdateTaxProcessed.setDouble(2, addlExcise); // 06-01-2006 manoharan new column
pstmtUpdateTaxProcessed.setObject(3, currRecordList.get(colNameList.indexOf("TAX_AMT")));//ADDED BY NISAR ON 04/02/08
pstmtUpdateTaxProcessed.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
......@@ -1123,6 +1155,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
else
{
pstmtUpdateTaxProcessed.setDouble(1, adjAmt); //adj amt
System.out.println("update tax process2"+adjAmt);
pstmtUpdateTaxProcessed.setDouble(2, addlExcise); // 06-01-2006 manoharan new column
pstmtUpdateTaxProcessed.setObject(3, currRecordList.get(colNameList.indexOf("TAX_AMT")));//ADDED BY NISAR ON 04/02/08
pstmtUpdateTaxProcessed.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
......@@ -1562,6 +1595,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
String prevAcctPrd = "";
String nextAcctPrd = "";
String tranType = "";
//Changed by Rohan on 10/01/12 to define variable.start
String balGroup = "";
boolean isCapitalItem = false;
//Changed by Rohan on 10/01/12 to define variable.end
double drAmt = 0.0;
double crAmt = 0.0;
double adjAmt = 0.0;
......@@ -1622,6 +1659,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drcrType = (String)currRecordList.get(colNameList.indexOf("DRCR_TYPE"));
/*****************capital items**************/
tranType = (String)currRecordList.get(colNameList.indexOf("TRAN_TYPE"));
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
balGroup = (String) currRecordList.get(colNameList.indexOf("BAL_GROUP"));
isCapitalItem = isCapitalItem(balGroup, conn);
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
//System.out.println("tranType :["+tranType+"]");
//Commentd by Chandni for stoping inserting into tax_process_bal table for capital item
/*
......@@ -1725,6 +1768,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessBal_1.setString(4, prevAcctPrd); //prev year acct prd
pstmtSelectTaxProcessBal_1.setString(5, "ZZZZZZ "); //balance period
rsSelectTaxProcessBal_1 = pstmtSelectTaxProcessBal_1.executeQuery();
if (rsSelectTaxProcessBal_1.next())
{
drAmt = rsSelectTaxProcessBal_1.getDouble(1);
......@@ -1735,6 +1779,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drAmt = 0;
crAmt = 0;
}
rsSelectTaxProcessBal_1.close(); // 18/03/08 manoharan
rsSelectTaxProcessBal_1 = null; // 18/03/08 manoharan
System.out.println(":::::::::::::::::::::: 2 ::::::::::::::::::::::::::::::::::::::::::");
......@@ -1767,14 +1812,38 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("Current balance for Current Period found, Updating for current Period for DRCR Flag :["+drcrFlag.trim()+"]");
drAmt = rsSelectTaxProcessBal.getDouble(1);
crAmt = rsSelectTaxProcessBal.getDouble(2);
if (drcrFlag.trim().equals("D"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//drAmt += adjAmt;
if(isCapitalItem)
{
drAmt = drAmt + (adjAmt/2);
}
else
{
drAmt += adjAmt;
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
}
else if (drcrFlag.trim().equals("C"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//crAmt += adjAmt;
if(isCapitalItem)
{
crAmt = crAmt + (adjAmt/2);
}
else
{
crAmt += adjAmt;
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
}
//System.out.println("After adjustment drAmt :["+drAmt+"] crAmt :["+crAmt+"]");
System.out.println(":::::::::::::::::::::: 2 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
......@@ -1792,6 +1861,35 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
else
{
//System.out.println("Current balance for Current Period not found, Inserting for current Period for DRCR Flag :["+drcrFlag.trim()+"]");
//Changed by Rohan on 10/01/12 to divided capital item only.start
if(isCapitalItem)
{
if (drcrFlag.trim().equals("D"))
{
drAmt = (adjAmt/2);
}
else if (drcrFlag.trim().equals("C"))
{
crAmt = (adjAmt/2);
}
}
/*
if (drcrFlag.trim().equals("D"))
{
drAmt = adjAmt;
}
else if (drcrFlag.trim().equals("C"))
{
//Changed by Rohan on 31-08-12 to calculate cr term half of adjAmount
//crAmt = adjAmt
crAmt = (adjAmt/2);
}
*/
else
{
if (drcrFlag.trim().equals("D"))
{
drAmt = adjAmt;
......@@ -1799,7 +1897,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
else if (drcrFlag.trim().equals("C"))
{
crAmt = adjAmt;
}
}
//Changed by Rohan on 10/01/12 to divided capital item only.end
System.out.println(":::::::::::::::::::::: 3 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setObject(2, currBalprd); //balance period
......@@ -1830,15 +1931,43 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("Closing balance for Current Period found, Updating for current Period for DRCR Flag :["+drcrFlag.trim()+"]");
drAmt = rsSelectTaxProcessBal.getDouble(1);
crAmt = rsSelectTaxProcessBal.getDouble(2);
if (drcrFlag.trim().equals("D"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//drAmt += adjAmt;
if(isCapitalItem)
{
drAmt = (drAmt/2);
}
else
{
drAmt += adjAmt;
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
}
else if (drcrFlag.trim().equals("C"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//crAmt += adjAmt
if(isCapitalItem)
{
crAmt = crAmt + (adjAmt/2);
}
else
{
crAmt += adjAmt;
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
}
//
System.out.println(":::::::::::::::::::::: 3 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -1873,15 +2002,40 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
rsSelectTaxProcessBal_1.close(); // 17/03/08 manoharan
rsSelectTaxProcessBal_1 = null; // 17/03/08 manoharan
if (drcrFlag.trim().equals("D"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//drAmt += adjAmt;
if(isCapitalItem)
{
drAmt = drAmt +(adjAmt/2);
}
else
{
drAmt += adjAmt;
}
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.end
}
else if (drcrFlag.trim().equals("C"))
{
//Changed by Rohan on 1-10-12 to set half amount in case of capital items.start
//crAmt += adjAmt;
if(isCapitalItem)
{
crAmt = crAmt +(adjAmt/2);
}
else
{
crAmt += adjAmt;
}
}
//System.out.println("Inserting Closing Balance for Current Period for DRCR Flag :["+drcrFlag.trim()+"]");
System.out.println(":::::::::::::::::::::: 4 ::::::::::::::::::::::::::::::::::::::::::");
System.out.println(":::::::::::::::::::::: 4 ::::::::ZZZZZZZZZZZZ::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setString(2, "ZZZZZZ "); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1980,7 +2134,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("Amounts for Current Period found, Updating for Current Period.....");
crAmt = rsSelectTaxProcessBal.getDouble(2);
drAmt = rsSelectTaxProcessBal.getDouble(1) + adjAmt;//only this value will change
System.out.println(":::::::::::::::::::::: 5 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -2001,6 +2155,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
crAmt = 0;
//DD 2/4/2006
System.out.println(":::::::::::::::::::::: 6 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, (String)currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
pstmtInsertTaxProcessBal.setString(2, currBalprd); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -2029,7 +2184,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("(22222222)Closing balance for Current Period found, Updating for current Period for DRCR Type D....");
crAmt = rsSelectTaxProcessBal.getDouble(2);
drAmt = rsSelectTaxProcessBal.getDouble(1) + adjAmt;//only this value will change
System.out.println(":::::::::::::::::::::: 6 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -2054,6 +2209,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
rsSelectTaxProcessBal_1 = pstmtSelectTaxProcessBal_1.executeQuery();
if (rsSelectTaxProcessBal_1.next())
{
drAmt = rsSelectTaxProcessBal_1.getDouble(1);
crAmt = rsSelectTaxProcessBal_1.getDouble(2);
}
......@@ -2067,7 +2223,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drAmt += adjAmt;//only this value will change
//System.out.println("(22222222)Inserting Closing Balance for Current Period for DRCR Type D....");
//DD 2/4/2006
System.out.println(":::::::::::::::::::::: 7 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, (String)currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
pstmtInsertTaxProcessBal.setString(2, "ZZZZZZ "); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -2736,5 +2892,40 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
return itmDBAccess;
}
//Changed by Rohan on 10-02-12 to check capital item.start
public boolean isCapitalItem(String balGroup,Connection conn) throws Exception
{
String capitalItem = "";
String[] capItem;
String delimiter = ",";
boolean isCapitalItem = false;
try
{
capitalItem = discommon.getDisparams("999999","CAPITAL_GRP",conn);
capItem = capitalItem.split(delimiter);
for(int i =0; i < capItem.length ; i++)
{
if(balGroup.equals(capItem[i]))
{
isCapitalItem = true;
}
}
}
catch(Exception e)
{
throw e;
}
finally
{
}
return isCapitalItem;
}
//Changed by Rohan on 10-02-12 to check capital item.end
}
......
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