Skip to content

B
business-java
Commit a2b94540 authored by manohar's avatar manohar
Browse files
Options

Excise related changes at SUN updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91756 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1dcc4364
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 139 deletions
webitm-dis/ibase/webitm/ejb/dis/CenvatCrCapitalConf.java
View file @ a2b94540
......@@ -93,7 +93,7 @@ public class CenvatCrCapitalConf extends ActionHandlerEJB implements CenvatCrCap
}
if( errString == null || errString.trim().length() == 0 )
{
sql = "update cenvat_cr_capital set confirmed = 'Y', conf_date = ? where tran_id = ? ";
sql = "update cenvat_cr_capital set confirmed = 'Y' ,conf_date = ? where tran_id = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setTimestamp(1,new Timestamp(System.currentTimeMillis()));
pstmt.setString( 2, tranId.trim() );
......
webitm-dis/ibase/webitm/ejb/dis/CenvatCrCapitalConfLocal.java
View file @ a2b94540
......@@ -10,5 +10,4 @@ import javax.ejb.Local; // added for ejb3
public interface CenvatCrCapitalConfLocal extends ActionHandlerLocal //,EJBObject
{
public String confirm(String xmlString, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
}
webitm-dis/ibase/webitm/ejb/dis/CenvatCrCapitalConfRemote.java
View file @ a2b94540
......@@ -10,5 +10,4 @@ import javax.ejb.Remote; // added for ejb3
public interface CenvatCrCapitalConfRemote extends ActionHandlerRemote//,EJBObject
{
public String confirm(String xmlString, String xtraParams, String forcedFlag) throws RemoteException,ITMException;
}
webitm-dis/ibase/webitm/ejb/dis/TaxCalculate.java
View file @ a2b94540
......@@ -41,7 +41,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
transient java.sql.Timestamp currDate = null;
transient java.sql.Timestamp nextYearCapitalDate = null;
transient java.sql.Timestamp prevYearTranDate = null;
ValidatorEJB validator = new ValidatorEJB();
/*public void ejbCreate() throws RemoteException, CreateException
{
}
......@@ -121,18 +121,19 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
String tabSepRowDataStr = "";
//**********************Code For Adj Amount Validation
String FltStr[] = tabSepFilterString.split("\t");
//for(int i =0;i<FltStr.length;i++)
//System.out.println("FltStr["+i+"]="+FltStr[i]);
String dataStr[] = tabSepDataString.split("\t");
//chandni
//while(tabSepDataString.trim().length() > 0 && tabSepDataString.indexOf("\n") != -1 )
//{
String refDateStr = dataStr[9];
System.out.println("Chandni refDateStr is equal::["+refDateStr+"]");
//Timestamp ts = Timestamp.valueOf(refDateStr);
//System.out.println("Chandni ts is equal::["+ts+"]");
//}
//Chandni
//String dataStr[] = tabSepDataString.split("\t");
//Chandni to validate procDate
String procDateStr = FltStr[8] ;
System.out.println("procDateStr:::"+procDateStr);
DateFormat formatter ;
java.util.Date procDate ;
formatter = new SimpleDateFormat("dd/MM/yy");
procDate = (java.util.Date)formatter.parse(procDateStr);
java.sql.Date pDate = new java.sql.Date(procDate.getTime());
System.out.println("pDate::" +pDate );
//Chandni
if(FltStr[5].equalsIgnoreCase("D"))
{
//15012007
......@@ -146,11 +147,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
tabSepRowDataStrVal = tabSepDataStringForVal.substring(0, tabSepDataStringForVal.indexOf("\n"));
populateCurrRecordList(tabSepRowDataStrVal + "\t");
totAdj = totAdj+((Double)currRecordList.get(colNameList.indexOf("BAL_AMT"))).doubleValue();
/*String refDateStr = currRecordList.get(colNameList.indexOf("ref_date")).toString();
System.out.println("Chandni refDateStr is equal::["+refDateStr+"]");
Timestamp ts = Timestamp.valueOf(refDateStr);
System.out.println("Chandni ts is equal::["+ts+"]");
*/
this.currRecordList.clear();
//System.out.println("row val String 1 ["+ tabSepRowDataStrVal + "]");
//System.out.println("before length 1["+ tabSepDataStringForVal.trim().length() + "]");
......@@ -196,21 +193,6 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
while(tabSepDataString.indexOf("\n") != -1)
{
/*
//Chandni
java.sql.Date refDate = (Date) this.currRecordList.get(colNameList.indexOf("REF_DATE"));
System.out.println("refDate is equals["+refDate+"]");
boolean ischkDateVal = chkDateVal(refDate);
System.out.println("ischkDateVal ..............[" + ischkDateVal + "]");
if(ischkDateVal)
{
resultString = itmDBAccess.getErrorString("TaxProcess","VTEXCDATE","",errString,conn);
return resultString;
}
//Chandni
*/
tabSepRowDataStr = tabSepDataString.substring(0, tabSepDataString.indexOf("\n"));
recCtr++;
System.out.println("Processing Row [" + recCtr + "]");
......@@ -219,9 +201,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//added on 07012007
setDates(conn);
//setDates();
resultString = updateTaxProcessed(conn);
System.out.println("resultString eulas sssss"+resultString);
if(resultString != null && resultString.length() > 0)
//Chandni To show errors--
//updateTaxProcessed(conn);
resultString = updateTaxProcessed(pDate,conn);
System.out.println("resultString eulas:"+resultString);
//if(resultString != null && resultString.length() > 0)
if ((resultString.contains("VTEXCDATE")) || (resultString.contains("VXCDATE")))
{
System.out.println("inside resultString eulas sssss"+resultString);
return resultString ;
......@@ -235,12 +220,14 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
this.currRecordList.clear();
//remove the row that has already been processed
tabSepDataString = tabSepDataString.substring(tabSepDataString.indexOf("\n") +1);
}
if(!(resultString.contains("VTEXCDATE")))
if(!(resultString.contains("VTEXCDATE") ||(resultString.contains("VXCDATE"))))
{
String userId = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
resultString = itmDBAccess.getErrorString("TaxProcess","DSTAXPROC",userId,errString,conn);
}
//Chandni
}
}
catch(Exception e)
......@@ -277,41 +264,48 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
return resultString;
}
public String chkDateVal(java.sql.Date refDate,Connection conn) throws ITMException
public String chkDateVal(java.sql.Date refDate,java.sql.Date procDate,Connection conn) throws ITMException
{
SimpleDateFormat simpleDateformat=new SimpleDateFormat("yyyy");
SimpleDateFormat simpleformat= new SimpleDateFormat("dd/MM/yy");
Timestamp sysDate = new Timestamp(System.currentTimeMillis());
String resultString ="";
String resultString ="",varValue="";
ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
//boolean flag = true;
try
{
System.out.println("Chandni refDate1uytuj234:::["+refDate+"]");
System.out.println("Year: " + simpleDateformat.format(refDate));
System.out.println("MONTHHH: " + simpleformat.format(refDate));
int month = (refDate.getMonth()+1);
String yearStr = simpleDateformat.format(refDate);
int year = Integer.parseInt(yearStr);
System.out.println("month:::::::: " + month);
//int year = (refDate.getYear()+1);
if (month == 12 )
{
year = year + 1 ;
month = 00 ;
}
month = month + 1 ;
String strDate = (month + "/07/" + year) ;
java.util.Date date = new java.util.Date(strDate);
System.out.println("date ::::::::::::" +date);
System.out.println("sysdate ::::::::::"+sysDate);
java.util.Date utilDate = new java.util.Date();
if (utilDate.after(date))
{
resultString = itmDBAccess.getErrorString("TaxProcess","VTEXCDATE","",errString,conn);
return resultString;
}
// System.out.println("flag after ::"+flag);
// CHECKING WHETHER TRAN_DATE FOR REF_ID HAS TO BE CHECKED at the time of process
//IF VAR VALUE IN DISPARM IS Y CHECK IN DATE AND IF 'N'
// THEN BYPASS CHECKING.
varValue = validator.getEnvDis("999999", "TAX_CALC_DATE", conn);
if(refDate.after(procDate))
{
System.out.println("inside refDate.after(procDate)");
resultString = itmDBAccess.getErrorString("TaxProcess","VXCDATE","",errString,conn);
}
if(!(resultString.contains("VXCDATE")))
{
if (varValue.equalsIgnoreCase("N"))
{
int month = (refDate.getMonth()+1);
String yearStr = simpleDateformat.format(refDate);
int year = Integer.parseInt(yearStr);
if (month == 12 )
{
year = year + 1 ;
month = 00 ;
}
month = month + 1 ;
String strDate = (month + "/07/" + year) ;
java.util.Date date = new java.util.Date(strDate);
java.util.Date utilDate = new java.util.Date();
if (utilDate.after(date))
{
resultString = itmDBAccess.getErrorString("TaxProcess","VTEXCDATE","",errString,conn);
return resultString;
}
}
}
} // end of try
catch(Exception e)
{
......@@ -334,8 +328,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
return null;
}
//private void updateTaxProcessed(Connection conn)throws ITMException
private String updateTaxProcessed(Connection conn)throws ITMException
//private void updateTaxProcessed(Connection conn)throws ITMException //commented by Chandni
private String updateTaxProcessed(java.sql.Date procDate,Connection conn)throws ITMException
{
//common logic
//if debit
......@@ -365,15 +359,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
adjAmt = ((Double)this.currRecordList.get(colNameList.indexOf("BAL_AMT"))).doubleValue();
//Chandni
//java.sql.Timestamp refTimeStamp = (Timestamp) this.currRecordList.get(colNameList.indexOf("REF_DATE"));
java.sql.Date refDate = (Date) this.currRecordList.get(colNameList.indexOf("REF_DATE"));
String resultString ="";
/*SimpleDateFormat simpleDateformat=new SimpleDateFormat("yyyy");
SimpleDateFormat simpleformat= new SimpleDateFormat("dd/MM/yy");
Timestamp sysDate = new Timestamp(System.currentTimeMillis());
//End of chandni
*/
String sqlAcctprd = "", ProccYear = "" ;
PreparedStatement pstmtAcctprd = null;
ResultSet rsAcctprd = null;
......@@ -381,48 +370,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
try
{
System.out.println("refDate:::["+refDate+"]");
resultString = chkDateVal(refDate,conn);
System.out.println("errString***************"+resultString);
if (!(resultString.contains("VTEXCDATE")))
System.out.println("procDate::"+procDate);
resultString = chkDateVal(refDate,procDate,conn);
//if stmt added by chandni -- if there is an error then bypass the below conditions
if (!((resultString.contains("VTEXCDATE")) || (resultString.contains("VXCDATE"))))
{
/*
System.out.println("Chandni refDate1234:::["+refDate+"]");
System.out.println("Year: " + simpleDateformat.format(refDate));
System.out.println("MONTHHH: " + simpleformat.format(refDate));
int month = (refDate.getMonth()+1);
String yearStr = simpleDateformat.format(refDate);
int year = Integer.parseInt(yearStr);
System.out.println("month:::::::: " + month);
//int year = (refDate.getYear()+1);
if (month == 12 )
{
year = year + 1 ;
month = 00 ;
}
month = month + 1 ;
System.out.println("1111111:::::::"+ month);
String strDate = (month + "/07/" + year) ;
System.out.println("22222222:::::::::"+ strDate);
DateFormat formatter ;
java.util.Date date ;
formatter = new SimpleDateFormat("MM/DD/YYYY");
date = (java.util.Date)formatter.parse(strDate);
System.out.println("chandni date 333333::::::::::::" +date);
System.out.println("sysdate 4444444444444::::::::::"+sysDate);
java.util.Date utilDate = new java.util.Date();
System.out.println("utilDate 5555555555::::::::::"+utilDate);
System.out.println("date.after(utildate):::::::::"+date.after(utilDate));
System.out.println("date.before(utildate):::::::::"+date.before(utilDate));
System.out.println("utilDate.after(date):::::::::"+utilDate.after(date));
System.out.println("utilDate.before(date):::::::::"+utilDate.before(date));
if (utilDate.after(date))
{
resultString = itmDBAccess.getErrorString("TaxProcess","VTTAXADJ1","",errString,conn);
return resultString;
}
*/
// System.out.println("Chandni refTimeStamp1234:::["+refTimeStamp+"]");
// 06-01-2007 manoharan addl_excise to be updated
addlExcise = ((Double)this.currRecordList.get(colNameList.indexOf("ADDL_EXCISE"))).doubleValue();
/*if (addlExcise == null )
......@@ -467,7 +420,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
StringBuffer sqlInsertCenCrCapital = null;
if(drcrType.trim().equalsIgnoreCase("D"))
{
sqlInsertCenCrCapital = new StringBuffer("INSERT INTO CENVAT_CR_CAPITAL (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,PROCESS_YEAR,CONFIRMED ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
sqlInsertCenCrCapital = new StringBuffer("INSERT INTO CENVAT_CR_CAPITAL (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,PROCESS_YEAR,CONFIRMED,BATCH_NO ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
}
else
{
......@@ -692,7 +645,6 @@ 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("Chandni 111111111111111111111111111111");
//System.out.println("1st tran id/srno " + tranIdProc);
pstmtInsertCenvatCrCapital.setString(1, tranIdProc); //transaction id
pstmtInsertCenvatCrCapital.setTimestamp(2, nextYearCapitalDate);
......@@ -771,15 +723,14 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtInsertCenvatCrCapital.setObject(40, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //bal group adj
pstmtInsertCenvatCrCapital.setDouble(41, adjAmt); //adj amt
pstmtInsertCenvatCrCapital.setDouble(42, addlExcise); // 06-01-2006 manoharan new column
// ADDED ON 15012007(BATCH_NO)
pstmtInsertCenvatCrCapital.setString(43,ProccYear);
//pstmtInsertCenvatCrCapital.setDate
pstmtInsertCenvatCrCapital.setString(44,"N");
// ADDED ON 15012007(BATCH_NO)
if (drcrType.trim().equals("D"))
{
pstmtInsertCenvatCrCapital.setString(43, batchNo); //BATCH_NO
}
pstmtInsertCenvatCrCapital.setString(44,ProccYear);
//pstmtInsertCenvatCrCapital.setDate
pstmtInsertCenvatCrCapital.setString(45,"N");
pstmtInsertCenvatCrCapital.setString(45, batchNo); //BATCH_NO
}
pstmtInsertCenvatCrCapital.executeUpdate();
//ended by chandni
}//if (cntTaxProcessed==0)
......@@ -884,11 +835,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//tranIdProc = getUniqueKey(conn,"T_tax_processed", currRecordList.get(colNameList.indexOf("TRAN_DATE")).toString());
tranIdProc = getUniqueKey(conn,"T_tax_processed", currRecordList.get(colNameList.indexOf("PROC_DATE")).toString());
//System.out.println("3 tran id/srno " + tranIdProc);
System.out.println("Chandni 222222222222222222222222222222222");
pstmtInsertTaxProcessed.setString(1, tranIdProc);//transaction id
//**************added latter
//pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("TRAN_DATE")));//transaction date
pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE")));
// pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE")));
pstmtInsertTaxProcessed.setDate(2,procDate);
pstmtInsertTaxProcessed.setObject(3, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessed.setObject(4, currRecordList.get(colNameList.indexOf("DOC_TYPE"))); //document type
pstmtInsertTaxProcessed.setString(5, balType); //balance type
......@@ -1085,12 +1036,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//tranIdProc = getUniqueKey(conn,"T_tax_processed", currRecordList.get(colNameList.indexOf("TRAN_DATE")).toString());
tranIdProc = getUniqueKey(conn,"T_tax_processed", currRecordList.get(colNameList.indexOf("PROC_DATE")).toString());
//System.out.println("5 tran id/srno " + tranIdProc);
System.out.println("Chandni 333333333333333333333333333333333333333333");
pstmtInsertTaxProcessed.setString(1, tranIdProc);//transaction id
//******pstmtInsertTaxProcessed.setObject(2, nextYearCapitalDate);//next year capital date
// ***********added latter
//pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("TRAN_DATE")));
pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE"))); //next year capital date
// pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE"))); //next year capital date
pstmtInsertTaxProcessed.setDate(2,procDate);
//DD 2/4/2006
pstmtInsertTaxProcessed.setObject(3, (String)currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
pstmtInsertTaxProcessed.setString(4, ""); //document type
......@@ -1268,11 +1219,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//tranIdProc = getUniqueKeyExtra(conn, "T_tax_processed", currRecordList.get(colNameList.indexOf("TRAN_DATE")).toString());
tranIdProc = getUniqueKeyExtra(conn, "T_tax_processed", currRecordList.get(colNameList.indexOf("PROC_DATE")).toString());
//System.out.println("7 tran id/srno " + tranIdProc);
System.out.println("Chandni 444444444444444444444444444444444444444");
pstmtInsertTaxProcessed.setString(1, tranIdProc);//transaction id
//*************added latter
//pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("TRAN_DATE"))); //transaction date
pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE"))); //transaction date
// pstmtInsertTaxProcessed.setObject(2, currRecordList.get(colNameList.indexOf("PROC_DATE"))); //transaction date
pstmtInsertTaxProcessed.setDate(2,procDate);
//DD 2/4/2006
pstmtInsertTaxProcessed.setObject(3, (String)currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
pstmtInsertTaxProcessed.setString(4, ""); //document type
......@@ -1672,9 +1623,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
/*****************capital items**************/
tranType = (String)currRecordList.get(colNameList.indexOf("TRAN_TYPE"));
//System.out.println("tranType :["+tranType+"]");
//Commentd by Chandni for stoping inserting into tax_process_bal table for capital item
/*
if(tranType.trim().equals("C"))
{
//System.out.println("Processing for Capital Items......");
System.out.println("Processing for Capital Items......");
adjAmt = adjAmt/2;
pstmtSelectAcctprd.setTimestamp(1, nextYearCapitalDate);
......@@ -1703,6 +1656,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
crAmt = rsSelectTaxProcessBal.getDouble(2) + adjAmt;
}
System.out.println(":::::::::::::::::::::: 1 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -1725,6 +1679,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
crAmt = adjAmt;
}
System.out.println(":::::::::::::::::::::: 1 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setString(2, nextBalprd); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1741,6 +1696,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
rsSelectTaxProcessBal = null ; // 14/03/08 manoharan
//System.out.println("End of processing for Capital Items......");
}
*/
/*****************end capital items**************/
/*****************opening balances**************/
......@@ -1781,7 +1737,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
rsSelectTaxProcessBal_1.close(); // 18/03/08 manoharan
rsSelectTaxProcessBal_1 = null; // 18/03/08 manoharan
System.out.println(":::::::::::::::::::::: 2 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setString(2, "000000 "); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1820,6 +1776,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
crAmt += adjAmt;
}
//System.out.println("After adjustment drAmt :["+drAmt+"] crAmt :["+crAmt+"]");
System.out.println(":::::::::::::::::::::: 2 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -1843,6 +1800,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
crAmt = adjAmt;
}
System.out.println(":::::::::::::::::::::: 3 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setObject(2, currBalprd); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1880,6 +1838,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
crAmt += adjAmt;
}
System.out.println(":::::::::::::::::::::: 3 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -1922,6 +1881,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
crAmt += adjAmt;
}
//System.out.println("Inserting Closing Balance for Current Period for DRCR Flag :["+drcrFlag.trim()+"]");
System.out.println(":::::::::::::::::::::: 4 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setString(2, "ZZZZZZ "); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1943,6 +1903,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("Processing for DRCR Type :["+drcrType.trim()+"]");
if(drcrType.trim().equals("D"))
{
/* commented by Chandni to stop inserting into tax_process_bal for the capital item
if(tranType.trim().equals("C"))
{
//System.out.println("Selecting amounts for given Bal Grp for Next Period for Tran Type C....");
......@@ -1966,6 +1927,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//System.out.println("Amounts for Next Period found, Updating for Next Period for Tran Type C.....");
crAmt = rsSelectTaxProcessBal.getDouble(2);
drAmt = rsSelectTaxProcessBal.getDouble(1) + adjAmt;//only this value will change
System.out.println(":::::::::::::::::::::: 4 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -1984,6 +1946,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drAmt = adjAmt;//only this value will change
crAmt = 0;
//DD 2/4/2006
System.out.println(":::::::::::::::::::::: 5 ::::::::::::::::::::::::::::::::::::::::::");
pstmtInsertTaxProcessBal.setObject(1, (String)currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
pstmtInsertTaxProcessBal.setString(2, nextBalprd); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -1999,6 +1962,9 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
rsSelectTaxProcessBal.close(); // 14/03/08 manoharan
rsSelectTaxProcessBal = null; // 14/03/08 manoharan
}
*/
//Ended by Chandni
//adjAmt = adjAmt * -1;
//System.out.println("Selecting amounts for given Bal Grp for Current Period.....");
//DD 2/4/2006
......@@ -2014,6 +1980,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
......@@ -2033,6 +2000,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drAmt = adjAmt;//only this value will change
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
......@@ -2061,6 +2029,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
......@@ -2098,6 +2067,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
......@@ -2677,9 +2647,6 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
// ******************************************* end ******************************************************
private void setDates()throws ITMException
{
int getVal = 0;
......
webitm-dis/ibase/webitm/ejb/dis/TaxExcise.java
View file @ a2b94540
......@@ -523,14 +523,16 @@ public class TaxExcise extends ValidatorEJB implements TaxExciseLocal, TaxExcise
break;
case 2:
valueXmlString.append("<Detail2>\r\n");
System.out.println("In detail2 Item Changed");
if (currentColumn.trim().equals("itm_default"))
{
System.out.println("xtraParams :" + xtraParams);
coVal = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"line_no");
valueXmlString.append("<line_no>").append(coVal).append("</line_no>\r\n");
//coVal = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"line_no");
//valueXmlString.append("<line_no>").append(coVal).append("</line_no>\r\n");
coVal1 = genericUtility.getColumnValue("bal_group",dom1);
coVal2 = genericUtility.getColumnValue("descr",dom1);
System.out.println("line_no"+coVal);
......
webitm-dis/ibase/webitm/ejb/dis/TaxProcessBal.java
View file @ a2b94540
......@@ -297,6 +297,7 @@ public class TaxProcessBal extends ValidatorEJB implements TaxProcessBalLocal, T
errString = itmDBAccessEJB.getErrorString("","VMSITECD1",userId);
}
} // END OF SITE_CODE
/*
else if (childNodeName.equalsIgnoreCase("bal_group"))
{
balGroup = genericUtility.getColumnValue("bal_group", dom);
......@@ -328,6 +329,7 @@ public class TaxProcessBal extends ValidatorEJB implements TaxProcessBalLocal, T
errString = itmDBAccessEJB.getErrorString("bal_group","VMBGNUL",userId);
}
}
*/
else if (childNodeName.equalsIgnoreCase("bal_prd"))
{
balPrd = genericUtility.getColumnValue("bal_prd", dom);
......
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