Skip to content

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

sun source merge mail by rohan b. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92954 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 70a80604
Hide whitespace changes
Inline Side-by-side
Showing with 778 additions and 85 deletions
webitm-dis/ibase/webitm/ejb/dis/CenvatCrCapitalPrc.java
View file @ 292ffac6
......@@ -72,6 +72,10 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
java.util.Date processDate = null;
java.util.Date dateCheck = null;
java.sql.Date tranDate = null;
java.sql.Date refDate = null;
java.sql.Date refDocDate = null;
java.sql.Date chgDate = null;
int count = 0;
......@@ -199,11 +203,27 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
do
{
retTabSepStrBuff.append(checkNull(rs.getString("TRAN_ID"))).append("\t");
retTabSepStrBuff.append(rs.getDate("TRAN_DATE")).append("\t");
tranDate = rs.getDate("TRAN_DATE");
if(tranDate != null)
{
retTabSepStrBuff.append(tranDate).append("\t");
}
else
{
retTabSepStrBuff.append("").append("\t");
}
retTabSepStrBuff.append(checkNull(rs.getString("BAL_GROUP"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("REF_SER"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("REF_ID"))).append("\t");
retTabSepStrBuff.append(rs.getDate("REF_DATE")).append("\t");
refDate = rs.getDate("REF_DATE");
if(refDate != null)
{
retTabSepStrBuff.append(refDate).append("\t");
}
else
{
retTabSepStrBuff.append("").append("\t");
}
retTabSepStrBuff.append(checkNull(rs.getString("CONFIRMED"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("DRCR_FLAG"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("PARTY_REF"))).append("\t");
......@@ -213,12 +233,29 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
retTabSepStrBuff.append(checkNull(rs.getString("SUPP_CODE"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("TAX_CODE"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("REF_DOC_NO"))).append("\t");
retTabSepStrBuff.append(rs.getDate("REF_DOC_DATE")).append("\t");
refDocDate = rs.getDate("REF_DOC_DATE");
if(refDocDate != null)
{
retTabSepStrBuff.append(refDocDate).append("\t");
}
else
{
retTabSepStrBuff.append("").append("\t");
}
retTabSepStrBuff.append(checkNull(rs.getString("SR_NO"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("BAL_GROUP__ADJ"))).append("\t");
retTabSepStrBuff.append(rs.getDouble("ADJ_AMT")).append("\t");
retTabSepStrBuff.append(rs.getDouble("CR_AMT")).append("\t");
retTabSepStrBuff.append(rs.getDate("CHG_DATE")).append("\t");
chgDate = rs.getDate("CHG_DATE");
if(chgDate != null)
{
retTabSepStrBuff.append(chgDate).append("\t");
}
else
{
retTabSepStrBuff.append("").append("\t");
}
retTabSepStrBuff.append(checkNull(rs.getString("CHG_USER"))).append("\t");
retTabSepStrBuff.append(checkNull(rs.getString("CHG_TERM"))).append("\t");
......@@ -431,7 +468,11 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
prcDate = genericUtility.getColumnValue("process_date",headerDom);
chgUser = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
//Changed by Rohan on 13-04-13 for take site code from header dom
//siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
siteCode = checkNull(genericUtility.getColumnValue("site_code",headerDom));
System.out.println("Site Code:From header dom::::"+siteCode);
String applDateFmt = genericUtility.getApplDateFormat();
DateFormat dtFormat = new SimpleDateFormat(applDateFmt);
......@@ -473,6 +514,7 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
{
refId = getTranId("t_transfer_refId",siteCode,conn);
System.out.println("Ref id genertaed for this trnasaction"+refId);
}
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
......
webitm-dis/ibase/webitm/ejb/dis/TaxCalculate.java
View file @ 292ffac6
......@@ -31,7 +31,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
String errString = "";
String chgUser = "";
String chgTerm = "";
String siteCode = "";
//String siteCode = "";
String dbName = "";
String nextBalprd = "";
String currBalprd = "";
......@@ -130,7 +130,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
chgUser = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
//Changed by Rohan on 14-03-13 for getting site code
siteCode = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
//siteCode = this.genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
// 16/03/10 manoharan
//conn = itmDBAccess.getConnection();//This function is to connect with oracle....
//conn.setAutoCommit(false);
......@@ -161,28 +161,18 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
String FltStr[] = tabSepFilterString.split("\t");
System.out.println("tabSepFilterString:::"+tabSepFilterString.toString());
//Chandni to validate procDate
String procDateStr = FltStr[8] ;
System.out.println("procDateStr:::"+procDateStr);
//Chnaged
/*
DateFormat formatter ;
java.util.Date procDate1 ;
formatter = new SimpleDateFormat("dd/MM/yy");
procDate1 = (java.util.Date)formatter.parse(procDateStr);
java.sql.Date pDate1 = new java.sql.Date(procDate1.getTime());
System.out.println("pDate::" +pDate1 );
*/
String applDateFmt = genericUtility.getApplDateFormat();
DateFormat dtFormat = new SimpleDateFormat(applDateFmt);
java.util.Date procDate = (java.util.Date)dtFormat.parse(procDateStr);
java.sql.Date pDate = new java.sql.Date(procDate.getTime());
System.out.println("procDate==:::::=>"+pDate);
String siteCodeHdr = FltStr[1] ;
System.out.println("Site Code from header"+siteCodeHdr);
//Changed by Rohan on 23-11-12 for bug fixing
//if(FltStr[5].equalsIgnoreCase("D"))
......@@ -193,7 +183,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//batchNo = FltStr[10];
//Changed by Rohan on 22-Jan-13 for bug fixing.start
//batchNo = FltStr[9];
System.out.println("lenth of filter String::--->::"+FltStr.length);
if(FltStr.length > 8)
{
......@@ -239,7 +229,9 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//Changed by Rohan on 13-03-13 for generating automatic batch number.start
sql ="SELECT DOC_PREFIX FROM SITE WHERE SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
//pstmt.setString(1,siteCode);
pstmt.setString(1,siteCodeHdr);
System.out.println("Site Code:::"+siteCodeHdr);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -337,7 +329,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sql ="select fin_entity from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(1,siteCodeHdr);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -349,8 +341,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
rs = null;
pstmt = null;
sql ="select fn_get_tax_balance('"+acctPrd+"','"+finEnt+"' ,'"+siteCode+"' ,'"+balGrpAdj+"','ZZZZZZ','C' ) - "
+" fn_get_tax_balance('"+acctPrd+"','"+finEnt+"','"+siteCode+"','"+balGrpAdj+"','ZZZZZZ','D' ) as cloBal from dual";
sql ="select fn_get_tax_balance('"+acctPrd+"','"+finEnt+"' ,'"+siteCodeHdr+"' ,'"+balGrpAdj+"','ZZZZZZ','C' ) - "
+" fn_get_tax_balance('"+acctPrd+"','"+finEnt+"','"+siteCodeHdr+"','"+balGrpAdj+"','ZZZZZZ','D' ) as cloBal from dual";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
......@@ -392,9 +384,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
ResultSet rsSr = null;
//Changed by Rohan on 14-03-13 for not consider batch no in select Sql
//pstmtSr = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND BATCH_NO = ?");
pstmtSr = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? ");
//Changed by Rohan on 03-04-13 for considering site code
//pstmtSr = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? ");
pstmtSr = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND BAL_GROUP__ADJ = ? AND SITE_CODE = ? ");
errStrMap.clear();
System.out.println("HAshMAp Clearing::::::::::::::"+errStrMap.toString());
//Chnaged by Rohan on 25-01-13 for define variables.end
while(tabSepDataString.indexOf("\n") != -1)
{
......@@ -449,7 +443,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSr.setObject(3, pDate);
//Changed by Rohan on 13-02-13 for not requried bach no because batch no is auto incrementing
//pstmtSr.setString(4,batchNo);
//Changed by Rohan on 03-04-13 for considering site code
pstmtSr.setObject(4,currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ")));
pstmtSr.setObject(5,currRecordList.get(colNameList.indexOf("SITE_CODE")));
//System.out.println("site code"+"");
rsSr = pstmtSr.executeQuery();
if(rsSr.next())
{
......@@ -749,6 +747,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sqlSelectTaxProcessed.append(" AND REF_LINE = '"+(String)currRecordList.get(colNameList.indexOf("REF_LINE"))+"'");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlSelectTaxProcessed.append(" AND SITE_CODE = ? ");
//Changed by Rohan on 23-Jan-13 for adding bacth no in case of debit.start
//Changed by Rohan on 14-03-13 for not considering batch no
/*
......@@ -794,7 +794,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sqlSelectCenCrCapital.append(" AND REF_SER = ? AND REF_ID = ? ");
sqlSelectCenCrCapital.append(" AND REF_LINE = '"+(String)currRecordList.get(colNameList.indexOf("REF_LINE"))+"'");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlSelectCenCrCapital.append(" AND SITE_CODE = ? ");
pstmtSelectCenCrCapital = conn.prepareStatement(sqlSelectCenCrCapital.toString());
//Changed by Rohan on 21-01-13 for select record for cenvat cr capital.end
......@@ -868,6 +869,9 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sqlUpdateTaxProcessed.append(" AND REF_SER = ? AND REF_ID = ? ");
sqlUpdateTaxProcessed.append(" AND REF_LINE = '"+(String)currRecordList.get(colNameList.indexOf("REF_LINE"))+"'");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlUpdateTaxProcessed.append(" AND SITE_CODE = ? ");
pstmtUpdateTaxProcessed = conn.prepareStatement(sqlUpdateTaxProcessed.toString());
//Changed by Rohan on 21-01-13 to update Cenvat cr capital.start
......@@ -911,6 +915,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
sqlUpdateCenCrCapital.append(" AND REF_SER = ? AND REF_ID = ?");
sqlUpdateCenCrCapital.append(" AND REF_LINE = '"+(String)currRecordList.get(colNameList.indexOf("REF_LINE"))+"'");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlUpdateCenCrCapital.append(" AND SITE_CODE = ? ");
pstmtUpdateCenCrCapital = conn.prepareStatement(sqlUpdateCenCrCapital.toString());
//Changed by Rohan on 21-Jan-13 cenvat cr capital.end
......@@ -928,17 +934,22 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//else
//{
//Changed by Rohan on 25-01-13 for single serial no in case of single batch
pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ?");
/*
//pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ?");
System.out.println("Dr cr type"+drcrType);
if(drcrType.trim().equals("D"))
{
pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND BATCH_NO = ?");
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND BAL_GROUP__ADJ = ?");
pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND BAL_GROUP__ADJ = ? AND SITE_CODE = ?");
}
else
{
pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ?");
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ?");
pstmtSelectSrNo = conn.prepareStatement("SELECT SR_NO FROM TAX_PROCESSED WHERE REF_SER = ? AND REF_ID = ? AND TRAN_DATE = ? AND SITE_CODE = ?");
}
*/ //}
// end 27-02-2007 manoharan
if (balType.trim().equals("D")) //Document entry
......@@ -1035,6 +1046,9 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectCenCrCapital.setString(6, refSer); //reference series
pstmtSelectCenCrCapital.setString(7, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(8,siteCode);
pstmtSelectCenCrCapital.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -1049,25 +1063,35 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectCenCrCapital.setString(6, refSer);//reference series
pstmtSelectCenCrCapital.setString(7, refId);//item code
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(8,siteCode);
pstmtSelectCenCrCapital.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectCenCrCapital.setString(6, itemCode);
pstmtSelectCenCrCapital.setString(7, refSer);//reference series
pstmtSelectCenCrCapital.setString(8, refId);//item code
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(9,siteCode);
pstmtSelectCenCrCapital.setObject(9,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
}
}
else
{
//Testing complete
if(balType.trim().equals("D"))
{
pstmtSelectCenCrCapital.setString(5, refSer); //reference series
pstmtSelectCenCrCapital.setString(6, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(7,siteCode);
pstmtSelectCenCrCapital.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
//tetsing done
//Changed by Rohan on 21-jan-13 for bug fixing.start
/*
pstmtSelectCenCrCapital.setString(5, itemCode); //item code
......@@ -1078,16 +1102,23 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectCenCrCapital.setString(5, refSer); //reference series
pstmtSelectCenCrCapital.setString(6, refId);
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(7,siteCode);
pstmtSelectCenCrCapital.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectCenCrCapital.setString(5, itemCode); //item code
pstmtSelectCenCrCapital.setString(6, refSer); //reference series
pstmtSelectCenCrCapital.setString(7, refId);//reference id
//Changed by Rohan on 02-04-13 for considering site code
//pstmtSelectCenCrCapital.setString(8,siteCode);
pstmtSelectCenCrCapital.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-jan-13 for bug fixing.end
}
}
rsSelectTaxProcessed = pstmtSelectCenCrCapital.executeQuery();
if (rsSelectTaxProcessed.next())
{
......@@ -1303,12 +1334,27 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtInsertCenvatCrCapital.setString(39, srNo);
*/
/////
pstmtSelectSrNo.setString(1,refSer);
pstmtSelectSrNo.setString(2,refId);
//Changed by Rohan on 05-02-13 for bug fixing
//pstmtSelectSrNo.setObject(3, currRecordList.get(colNameList.indexOf("PROC_DATE")));
pstmtSelectSrNo.setObject(3, procDate);
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.start
if(drcrType.trim().equals("D"))
{
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ")));
//pstmtSelectSrNo.setString(5, siteCode);
pstmtSelectSrNo.setObject(5, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
//Testing complete
//pstmtSelectSrNo.setString(4, siteCode);
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.end
rsSelectSrNo = pstmtSelectSrNo.executeQuery();
if(rsSelectSrNo.next())
......@@ -1453,6 +1499,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtUpdateCenCrCapital.setObject(6, currRecordList.get(colNameList.indexOf("BAL_PRD"))); //balance period
pstmtUpdateCenCrCapital.setObject(7, nextYearCapitalDate); //next year capital date
}
if(drcrType.trim().equals("D"))
{
////////
......@@ -1463,7 +1510,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateCenCrCapital.setString(10, refSer); //reference series
pstmtUpdateCenCrCapital.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateCenCrCapital.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -1472,12 +1520,18 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateCenCrCapital.setString(10, refSer); //reference series
pstmtUpdateCenCrCapital.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
//pstmtUpdateCenCrCapital.setString(12,siteCode);
pstmtUpdateCenCrCapital.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateCenCrCapital.setString(10, itemCode); //item code
pstmtUpdateCenCrCapital.setString(11, refSer); //reference series
pstmtUpdateCenCrCapital.setString(12, refId);
//Changed by Rohan on 02-04-13 for considering site code
//pstmtUpdateCenCrCapital.setString(13,siteCode);
pstmtUpdateCenCrCapital.setObject(13,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
}
......@@ -1488,20 +1542,27 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateCenCrCapital.setString(8, refSer); //reference series
pstmtUpdateCenCrCapital.setString(9, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
//pstmtUpdateCenCrCapital.setString(12,siteCode);
pstmtUpdateCenCrCapital.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
//Testing Done
if("".equalsIgnoreCase(itemCode))
{
pstmtUpdateCenCrCapital.setString(8, refSer); //reference series
pstmtUpdateCenCrCapital.setString(9, refId);
}
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateCenCrCapital.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE"))); }
else
{
pstmtUpdateCenCrCapital.setString(8, itemCode); //item code
pstmtUpdateCenCrCapital.setString(9, refSer); //reference series
pstmtUpdateCenCrCapital.setString(10, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateCenCrCapital.setObject(11,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-Jan-13 for bug fixing.end
}
......@@ -1524,13 +1585,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
if(drcrType.trim().equals("D"))
{
//Done
//testing done
pstmtSelectTaxProcessed.setObject(5, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //bal group adj
if(balType.trim().equals("D"))
{
//testing done
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8, currRecordList.get(colNameList.indexOf("SITE_CODE")));
//Changed by Rohan on 14-03-13 for not considering batch no.strat
//Changed by Rohan on 23-Jan-13 for generating single serial no in case of single batch.start
/*
......@@ -1550,16 +1614,21 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessed.setString(7, refSer); //reference series
pstmtSelectTaxProcessed.setString(8, refId); //reference id
*/
if("".equalsIgnoreCase(itemCode))
{
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectTaxProcessed.setString(6, itemCode); //item code
pstmtSelectTaxProcessed.setString(7, refSer); //reference series
pstmtSelectTaxProcessed.setString(8, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(9, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 14-03-13 for not considering batch no
//Changed by Rohan on 23-Jan-13 for generating single serial no in case of single batch.start
......@@ -1579,9 +1648,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(5, refSer); //reference series
pstmtSelectTaxProcessed.setString(6, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
//Changed by rohan on 21-jan-13 for bug fixing.start
/*
pstmtSelectTaxProcessed.setString(5, itemCode); //item code
......@@ -1592,6 +1664,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(5, refSer); //item code
pstmtSelectTaxProcessed.setString(6, refId); //reference series
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
......@@ -1599,6 +1673,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessed.setString(5, itemCode); //item code
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by rohan on 21-jan-13 for bug fixing.end
//reference id
......@@ -1747,11 +1823,15 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//Changed by Roahn on 25-01-13 to generate single serial no in case of dedit.start
if(!drcrType.trim().equals("D"))
{
System.out.println("Wrong I/p"+currRecordList.get(colNameList.indexOf("SITE_CODE")));
pstmtSelectSrNo.setString(1,refSer);
pstmtSelectSrNo.setString(2,refId);
//Changed by Rohan on 05-02-13 for bug Fixing.start
//pstmtSelectSrNo.setObject(3, currRecordList.get(colNameList.indexOf("PROC_DATE")));
pstmtSelectSrNo.setObject(3, procDate);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("SITE_CODE")));
rsSelectSrNo = pstmtSelectSrNo.executeQuery();
if(rsSelectSrNo.next())
......@@ -1911,6 +1991,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
......@@ -1918,8 +2000,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
if("".equalsIgnoreCase(itemCode))
{
//testing done
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
......@@ -1927,6 +2012,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtUpdateTaxProcessed.setString(10, itemCode); //item code
pstmtUpdateTaxProcessed.setString(11, refSer); //reference series
pstmtUpdateTaxProcessed.setString(12, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(13,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
......@@ -1945,20 +2032,26 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
//testing done
if("".equalsIgnoreCase(itemCode))
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateTaxProcessed.setString(8, itemCode); //item code
pstmtUpdateTaxProcessed.setString(9, refSer); //reference series
pstmtUpdateTaxProcessed.setString(10, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(11,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
}
}
......@@ -1969,10 +2062,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
/***************************** end common logic ****************************/
/****************** entry for credit if drcrtype = "D" ********************/
System.out.println("drcrType****"+drcrType);
if(drcrType.trim().equals("D"))
{
System.out.println("Enter i/p 3");
refSer = " ";
refId = " ";
refLine = " 1";
......@@ -1997,7 +2090,10 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
if(balType.trim().equals("D"))
{
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId);//reference id
pstmtSelectTaxProcessed.setString(7, refId);//reference id\
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
//Changed by rohna on 14-03-13 for not considering batch no.start
//Changed by Rohan on 23-Jan-13 for generating single serial no in case of single batch.start
/*
......@@ -2021,12 +2117,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectTaxProcessed.setString(6, itemCode); //item code
pstmtSelectTaxProcessed.setString(7, refSer); //reference series
pstmtSelectTaxProcessed.setString(8, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(9,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-Jun-13 for bug fixing.end
//Changed by rohna on 14-03-13 for not considering batch no.start
......@@ -2047,6 +2147,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(5, refSer); //reference series
pstmtSelectTaxProcessed.setString(6, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
//Changed by Rohan on 23-Jan-13 for generating single serial no in case of single batch.start
//Changed by rohna on 14-03-13 for not considering batch no.start
/*
......@@ -2071,12 +2173,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessed.setString(5, refSer); //reference series
pstmtSelectTaxProcessed.setString(6, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectTaxProcessed.setString(5, itemCode); //item code
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-Jan-13 for bug Fixing.end
//Changed by Rohan on 23-Jan-13 for generating single serial no in case of single batch.start
......@@ -2149,7 +2255,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtInsertTaxProcessed.setString(37, refLine); //referance line number
pstmtInsertTaxProcessed.setObject(38, currRecordList.get(colNameList.indexOf("TRAN_TYPE"))); //Tran Type
System.out.println("*************^^^%%%%%%%**************");
System.out.println("second time"+drcrType);
pstmtSelectSrNo.setString(1,refSer);
pstmtSelectSrNo.setString(2,refId);
//ADDED 30082006
......@@ -2163,20 +2269,22 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectSrNo.setObject(3, currRecordList.get(colNameList.indexOf("PROC_DATE")));
}*/
pstmtSelectSrNo.setObject(3,procDate);
//Changed by Rohn on 5-feb-12.end
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.start
if(drcrType.trim().equals("D"))
{
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ")));
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectSrNo.setObject(5, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.end
//Changed by Rohan on 25-01-13 for generating single serial no in case of single batch.end
// 03-11-2006 manohar in case of debit bal_group__adj to be considered
// as can be partially adjusted against different bal_group
// 27-02-2007 consideration of bal_group__adj reverted as was creating problem
// in case of nor mal cases
//if(drcrType.trim().equals("D"))
//{
// pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ")));
//}
// end 27-02-2007 manoharan
// end 03-11-2006 manoharan
//Changed by Rohan on 25-01-13 for bug fixing----
rsSelectSrNo = pstmtSelectSrNo.executeQuery();
if(rsSelectSrNo.next())
{
......@@ -2329,6 +2437,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
......@@ -2338,12 +2448,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateTaxProcessed.setString(10, itemCode); //item code
pstmtUpdateTaxProcessed.setString(11, refSer); //reference series
pstmtUpdateTaxProcessed.setString(12, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(13, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
}
......@@ -2361,6 +2475,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -2369,12 +2485,17 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateTaxProcessed.setString(8, itemCode); //item code
pstmtUpdateTaxProcessed.setString(9, refSer); //reference series
pstmtUpdateTaxProcessed.setString(10, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(11, currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-Jan-13 for bug fixing.end
......@@ -2401,8 +2522,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessed.setObject(5, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //bal group
if(balType.trim().equals("D"))
{
//Testing done
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -2416,12 +2540,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectTaxProcessed.setString(6, itemCode); //item code
pstmtSelectTaxProcessed.setString(7, refSer); //reference series
pstmtSelectTaxProcessed.setString(8, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(9,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-jan-13 for bug fixing.end
}
......@@ -2432,6 +2560,8 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(5, refSer); //reference series
pstmtSelectTaxProcessed.setString(6, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -2445,12 +2575,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtSelectTaxProcessed.setString(5, refSer); //reference series
pstmtSelectTaxProcessed.setString(6, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectTaxProcessed.setString(5, itemCode); //item code
pstmtSelectTaxProcessed.setString(6, refSer); //reference series
pstmtSelectTaxProcessed.setString(7, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessed.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-jan-13 for bug fixing.end
}
......@@ -2499,7 +2633,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtInsertTaxProcessed.setString(24, ""); //lot number
//Changed by Rohan on 14-1-12 to set intial tax amount
//pstmtInsertTaxProcessed.setDouble(25, 0.0d); //tax amount
System.out.println("Inital tax amount for CENVI"+currRecordList.get(colNameList.indexOf("TAX_AMT")));
pstmtInsertTaxProcessed.setObject(25,currRecordList.get(colNameList.indexOf("TAX_AMT"))); //tax amount
pstmtInsertTaxProcessed.setString(26, ""); //invoice number
......@@ -2565,6 +2699,19 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectSrNo.setString(1,refSer);
pstmtSelectSrNo.setString(2,refId);
pstmtSelectSrNo.setObject(3, procDate);
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.start
if(drcrType.trim().equals("D"))
{
//testing done
pstmtSelectSrNo.setObject(4, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ")));
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectSrNo.setObject(5,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtSelectSrNo.setObject(4,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 01-04-13 for adding extra parameter in select serial no in case of debit.end
rsSelectSrNo = pstmtSelectSrNo.executeQuery();
if(rsSelectSrNo.next())
{
......@@ -2693,6 +2840,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
//Changed by Rohan on 18-03-13 for updating batch no in case of debit.end
if(drcrType.trim().equals("D"))
{
//testing done
//Changed by Rohan on 18-03-13 for updating batch no in case of debit.start
pstmtUpdateTaxProcessed.setString(4, batchNo);
pstmtUpdateTaxProcessed.setObject(5, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //balance group adj
......@@ -2703,8 +2851,11 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtUpdateTaxProcessed.setObject(9, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //bal group
if(balType.trim().equals("D"))
{
//testing done
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
......@@ -2714,12 +2865,18 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(10, refSer); //reference series
pstmtUpdateTaxProcessed.setString(11, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateTaxProcessed.setString(10, itemCode); //item code
pstmtUpdateTaxProcessed.setString(11, refSer); //reference series
pstmtUpdateTaxProcessed.setString(12, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(13,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
}
......@@ -2736,6 +2893,9 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId); //reference id
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else if(balType.trim().equals("I"))
{
......@@ -2749,12 +2909,18 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
pstmtUpdateTaxProcessed.setString(8, refSer); //reference series
pstmtUpdateTaxProcessed.setString(9, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(10,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
pstmtUpdateTaxProcessed.setString(8, itemCode); //item code
pstmtUpdateTaxProcessed.setString(9, refSer); //reference series
pstmtUpdateTaxProcessed.setString(10, refId);
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessed.setObject(11,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
//Changed by Rohan on 21-Jan-13 for bug fixing.end
}
......@@ -2854,8 +3020,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
drcrType = (String)currRecordList.get(colNameList.indexOf("DRCR_TYPE"));
if(drcrType.trim().equals("D"))
{
sqlSelectTaxProcessTrace.append("AND BAL_GROUP__ADJ = ?");
sqlSelectTaxProcessTrace.append(" AND BAL_GROUP__ADJ = ? ");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlSelectTaxProcessTrace.append(" AND SITE_CODE = ? ");
//Testing done
pstmtSelectTaxProcessTrace = conn.prepareStatement(sqlSelectTaxProcessTrace.toString());
StringBuffer sqlInsertTaxProcessTrace = new StringBuffer("INSERT INTO TAX_PROCESS_TRACE(TRAN_ID, TRAN_DATE, BAL_GROUP, BAL_TYPE, BAL_PRD, REF_SER, REF_ID, REF_LINE, CHG_DATE, CHG_USER, CHG_TERM, NET_AMT, QTY_RECD, TAX_AMT, ITEM_CODE, SITE_CODE,REF_DATE,TRAN_ID__PROC,BAL_GROUP__ADJ,ADJ_AMT) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
......@@ -2864,8 +3034,12 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
StringBuffer sqlUpdateTaxProcessTrace = new StringBuffer("UPDATE TAX_PROCESS_TRACE SET ADJ_AMT = ADJ_AMT + ? , CHG_DATE = ?, CHG_USER = ?, CHG_TERM = ? WHERE BAL_GROUP = ? AND BAL_TYPE = ? AND BAL_PRD = ? AND REF_SER = ? AND REF_ID = ? AND REF_LINE = ? ");
if(drcrType.trim().equals("D"))
{
sqlUpdateTaxProcessTrace.append("AND BAL_GROUP__ADJ = ?");
//testing done
sqlUpdateTaxProcessTrace.append(" AND BAL_GROUP__ADJ = ? ");
}
//Changed by Rohan on 02-04-13 for considering site code
sqlUpdateTaxProcessTrace.append(" AND SITE_CODE = ? ");
//testing done
pstmtUpdateTaxProcessTrace = conn.prepareStatement(sqlUpdateTaxProcessTrace.toString());
pstmtSelectTaxProcessTrace.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtSelectTaxProcessTrace.setObject(2, currRecordList.get(colNameList.indexOf("BAL_TYPE"))); //balance type
......@@ -2875,8 +3049,18 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtSelectTaxProcessTrace.setObject(6, currRecordList.get(colNameList.indexOf("REF_LINE"))); //reference line number
if(drcrType.trim().equals("D"))
{
//testing done
pstmtSelectTaxProcessTrace.setObject(7, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //bal group adj
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessTrace.setObject(8,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
//Tseting done
//Changed by Rohan on 02-04-13 for considering site code
pstmtSelectTaxProcessTrace.setObject(7,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
rsSelectTaxProcessTrace = pstmtSelectTaxProcessTrace.executeQuery();
if (rsSelectTaxProcessTrace.next())
......@@ -2938,7 +3122,16 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
pstmtUpdateTaxProcessTrace.setObject(10, currRecordList.get(colNameList.indexOf("REF_LINE"))); //referance line number
if(drcrType.trim().equals("D"))
{
//testing done
pstmtUpdateTaxProcessTrace.setObject(11, currRecordList.get(colNameList.indexOf("BAL_GROUP__ADJ"))); //bal group adj
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessTrace.setObject(12,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
else
{
//testing done
//Changed by Rohan on 02-04-13 for considering site code
pstmtUpdateTaxProcessTrace.setObject(11,currRecordList.get(colNameList.indexOf("SITE_CODE")));
}
pstmtUpdateTaxProcessTrace.executeUpdate();
}
......@@ -3251,7 +3444,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
//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
......@@ -3307,7 +3500,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
}
//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
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -3372,8 +3565,6 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
//
System.out.println(":::::::::::::::::::::: 3 ::::::::::::::::::::::::::::::::::::::::::UPDATE");
pstmtUpdateTaxProcessBal.setDouble(1, drAmt); //dr amt
pstmtUpdateTaxProcessBal.setDouble(2, crAmt); //cr amt
pstmtUpdateTaxProcessBal.setTimestamp(3, this.currDate); //chg date
......@@ -3439,9 +3630,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
}
}
//System.out.println("Inserting Closing Balance for Current Period for DRCR Flag :["+drcrFlag.trim()+"]");
System.out.println(":::::::::::::::::::::: 4 ::::::::ZZZZZZZZZZZZ::::::::::::::::::::::::::::::::::");
//System.out.println("Inserting Closing Balance for Current Period for DRCR Flag :["+drcrFlag.trim()+"]");
pstmtInsertTaxProcessBal.setObject(1, currRecordList.get(colNameList.indexOf("BAL_GROUP"))); //balance group
pstmtInsertTaxProcessBal.setString(2, "ZZZZZZ "); //balance period
pstmtInsertTaxProcessBal.setDouble(3, drAmt); //debit amount
......@@ -3952,7 +4141,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
colType = (String)colTypeList.get(ctrTabdata);
colData = dataStr.substring(0, dataStr.indexOf("\t"));
//System.out.println("[colType :"+colType+"] [colData :"+colData+"]");
System.out.println("[colType :"+colType+"] [colData :"+colData+"]");
if(colData.length() > 0)
{
if (colType.indexOf("CHAR") != -1)
......@@ -4018,6 +4207,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
{
if (ctrMetadata%2 == 0)
{
this.colTypeList.add(metaDataStr.substring(0, metaDataStr.indexOf("\t")).trim().toUpperCase());
}
else
......@@ -4025,6 +4215,7 @@ public class TaxCalculate extends ProcessEJB implements TaxCalculateLocal, TaxCa
this.colNameList.add(metaDataStr.substring(0, metaDataStr.indexOf("\t")).trim().toUpperCase());
}
metaDataStr = metaDataStr.substring(metaDataStr.indexOf("\t") + 1);
}
//System.out.println("this.colNameList["+this.colNameList.size()+"] :\n"+this.colNameList);
//System.out.println("this.colTypeList["+this.colTypeList.size()+"] :\n"+this.colTypeList);
......
webitm-dis/ibase/webitm/ejb/dis/TaxSch.java
View file @ 292ffac6
......@@ -103,7 +103,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
public String getData(Document dom, Document dom2, String windowName, String xtraParams) throws RemoteException,ITMException
{
System.out.println("Get records from the user defined select statement and insert it into tax_processed_mp table of tax(dom, string).ejb..ejb..");
System.out.println("Get records from the user defined select statement and insert it into tax_processed_mp table of tax(dom, string).ejb..ejb.RBHO.");
String resultString = null;
// 27-06-2007 manoharan
String partyName = null;
......@@ -112,6 +112,16 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
String refId = null;
String sundryType = null;
String balGroup ="";
String refDateStr = "";
String refDocStr = "";
String drAmt = "";
String crAmt = "";
String clsStk = "";
String taxAmt = "";
String adjAmt = "";
String balAmt = "";
String netAmt = "";
String qtyRecd = "";
ResultSet partyNameRS = null;
ResultSet excCapitalResultSet = null;
......@@ -238,7 +248,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
taxBalResultSet = taxBalSelPstmt.executeQuery();
while(taxBalResultSet.next())
{
System.out.println("Records found!!!!!!!!!!!!!!!!!!!!!!!!!!");
String balGrpStd = taxBalResultSet.getString("BAL_GROUP");
balGrpStd = (balGrpStd != null && !"null".equalsIgnoreCase(balGrpStd))?balGrpStd:"";
String balTypeStd = taxBalResultSet.getString("BAL_TYPE");
......@@ -249,6 +259,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
refSerStd = (refSerStd != null && !"null".equalsIgnoreCase(refSerStd))?refSerStd:"";
String drcrFlagStd = taxBalResultSet.getString("DRCR_FLAG");
drcrFlagStd = (drcrFlagStd != null && !"null".equalsIgnoreCase(drcrFlagStd))?drcrFlagStd:"";
String inpParamStr = taxBalResultSet.getString("SQL_INPUT");
inpParamStr = (inpParamStr != null && !"null".equalsIgnoreCase(inpParamStr))?inpParamStr:"";
//D uncomment and implement getInputValueList(inpParamStr, inpParamTypeStr) for dynamic setting of inout params
......@@ -329,8 +340,6 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
int noOfDynCols = sqlExprRSMetaData.getColumnCount();
//System.out.println("noOfDynCols.ejb..ejb..ejb..ejb..ejb..ejb.. : "+noOfDynCols);
if(drcrType.equalsIgnoreCase("D"))
{//added by nisar on 04/02/08
//checkfor addl_excise column is found
......@@ -352,16 +361,22 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
while(sqlExprResultSet.next())
{
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
/*
retTabSepStrBuff.append(balGrpStd).append("\t");
retTabSepStrBuff.append(balTypeStd).append("\t");
retTabSepStrBuff.append(balPrdStd).append("\t");
retTabSepStrBuff.append(refSerStd).append("\t");
retTabSepStrBuff.append(drcrFlagStd).append("\t");
System.out.println("balGrpStd"+balGrpStd+"balTypeStd"+balTypeStd+"balPrdStd"+balPrdStd);
retTabSepStrBuff.append((String)this.globalVarMap.get("drcr_type")).append("\t");
String tempString = (String)this.globalVarMap.get("bal_group__adj");
balGroupadj = (tempString != null && !"null".equalsIgnoreCase(tempString))?tempString:"";
retTabSepStrBuff.append(balGroupadj).append("\t");
ctr = ctr + 7 ;
System.out.println("refSerStd"+refSerStd+"drcrFlagStd"+drcrFlagStd+"balPrdStd"+balPrdStd+"balGroupadj"+balGroupadj);
// 04-01-2007 manoharan add_exc should not be appended now (new column in sql)
//for(int colCtr = 1; colCtr <= noOfDynCols; colCtr++)
//System.out.println("Types.DATE:["+Types.DATE+"] -- Types.TIMESTAMP:["+Types.TIMESTAMP+"]");
......@@ -383,13 +398,14 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
}
System.out.println("dataStr::for loop enter"+colCtr+"=="+dataStr);
retTabSepStrBuff.append(dataStr).append("\t");
ctr++;
//System.out.println("ctr : "+ ctr + " " + sqlExprRSMetaData.getColumnName(colCtr) + " [" + dataStr + "]");
}
//String refSer = sqlExprResultSet.getString("REF_SER");
/*// chandni
/* chandni
/*
Double adjAmt1 = sqlExprResultSet.getDouble("adj_amt");
System.out.println("Chandni adjAmt1 is equal["+adjAmt1+"]");
if ("A".equalsIgnoreCase(retrive))
......@@ -422,6 +438,364 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
// end chandni*/
refId = sqlExprResultSet.getString("REF_ID");
refId = (refId != null && !"null".equalsIgnoreCase(refId))?refId:"";
retTabSepStrBuff.append(refId).append("\t"); //ref id
//retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("REF_DATE"))).append("\t"); //ref date
refDateStr = checkNull(sqlExprResultSet.getString("REF_DATE"));
if(!"".equalsIgnoreCase(refDateStr.trim()) && refDateStr != null)
{
refDateStr = genericUtility.getValidDateString(refDateStr, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}
/*
if(!"".equalsIgnoreCase(refDateStr.trim()) && refDateStr != null)
{
//if (this.genericUtility.getApplDateFormat().length() == 10)
//{
refDateStr = refDateStr.substring(0,10);
System.out.println("refDateStr11##"+refDateStr);
//}
//else
//{
//refDateStr = refDateStr.substring(0,8);
//System.out.println("refDateStr11##()(_)"+refDateStr);
//}
}
// 04-01-2007 manoharan new column for additional excise (cess)
//retTabSepStrBuff.append(sprocDate).append("\n");
//System.out.println("sprocDate before :"+sprocDate);
//sprocDate = genericUtility.getValidDateString(sprocDate, genericUtility.getApplDateFormat(), genericUtility.getApplDateFormat());
System.out.println("refDateStr>>>"+refDateStr);
if (genericUtility.getApplDateFormat().indexOf("/") != -1)
{
refDateStr = refDateStr.replace('-', '/');
}
*/
retTabSepStrBuff.append(refDateStr.trim()).append("\t");
if ( refSerStd.trim().equalsIgnoreCase("CRNRCP") || refSerStd.trim().equalsIgnoreCase("S-DSP") || refSerStd.trim().equalsIgnoreCase("S-RET"))
{
sundryType = "C";
}
else if ( refSerStd.trim().equalsIgnoreCase("D-RCP") )
{
sundryType = "I";
}
else if ( refSerStd.trim().equalsIgnoreCase("P-RCP") )
{
sundryType = "S";
}
else if ( refSerStd.trim().equalsIgnoreCase("D-EXC") || refSerStd.trim().equalsIgnoreCase("M-VOUC") || refSerStd.trim().equalsIgnoreCase("E-PAY") || refSerStd.trim().equalsIgnoreCase("DIRCT"))
{
String sundryTypeSql = null;
if (refSerStd.trim().equalsIgnoreCase("D-EXC") || refSerStd.trim().equalsIgnoreCase("DIRCT"))
{
sundryTypeSql = "SELECT SUNDRY_TYPE FROM TAX_OTH_CREDITS WHERE TRAN_ID = ?";
}
else if (refSerStd.trim().equalsIgnoreCase("M-VOUC"))
{
sundryTypeSql = "SELECT SUNDRY_TYPE FROM MISC_VOUCHER WHERE TRAN_ID = ?";
}
else if (refSerStd.trim().equalsIgnoreCase("E-PAY"))
{
sundryTypeSql = "SELECT SUNDRY_TYPE FROM PAYMENT_EXP WHERE TRAN_ID = ?";
}
else
{
sundryTypeSql = "SELECT SUNDRY_TYPE FROM TAX_OTH_CREDITS WHERE TRAN_ID = ?";
}
sundryTypePstmt = conn.prepareStatement(sundryTypeSql);
sundryTypePstmt.setString(1, refId);
sundryTypeRS = sundryTypePstmt.executeQuery();
sundryType = null;
if(sundryTypeRS.next())
{
sundryType = sundryTypeRS.getString("SUNDRY_TYPE");
sundryType = (sundryType != null && !"null".equalsIgnoreCase(sundryType))?sundryType:"S";
}
sundryTypeRS.close();
sundryTypePstmt.close();
sundryTypeRS = null;
sundryTypePstmt = null;
}
else
{
// ADJISS
sundryType = "S";
}
// 26/02/08 manoharan additional types added
/*B Bank
C Customer
E Employee
S Supplier
X Tax Authority
L Loan Party
O Others
T Transporter
P Sales person
R Strategic Customer
I Site
*/
// 18/07/08 manoharan checking added for null / empty sundry type
if (sundryType != null && sundryType.trim().length() >= 0)
{
if ( sundryType.equalsIgnoreCase("C"))
{
partyNamePstmt = conn.prepareStatement("SELECT CUST_NAME AS PARTY_NAME FROM CUSTOMER WHERE CUST_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("E") )
{
partyNamePstmt = conn.prepareStatement("SELECT EMP_FNAME AS PARTY_NAME FROM EMPLOYEE WHERE EMP_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("S") )
{
partyNamePstmt = conn.prepareStatement("SELECT SUPP_NAME AS PARTY_NAME FROM SUPPLIER WHERE SUPP_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("X") )
{
partyNamePstmt = conn.prepareStatement("SELECT TAUTH_NAME AS PARTY_NAME FROM TAX_AUTHORITY WHERE TAUTH_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("L") )
{
partyNamePstmt = conn.prepareStatement("SELECT PARTY_NAME AS PARTY_NAME FROM LOANPARTY WHERE PARTY_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("T") )
{
partyNamePstmt = conn.prepareStatement("SELECT TRAN_NAME AS PARTY_NAME FROM TRANSPORTER WHERE TRAN_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("P") )
{
partyNamePstmt = conn.prepareStatement("SELECT SP_NAME AS PARTY_NAME FROM SALES_PERS WHERE SALES_PERS = ?");
}
else if ( sundryType.equalsIgnoreCase("R") )
{
partyNamePstmt = conn.prepareStatement("SELECT FIRST_NAME AS PARTY_NAME FROM STRG_CUSTOMER WHERE SC_CODE = ?");
}
else if ( sundryType.equalsIgnoreCase("I") )
{
partyNamePstmt = conn.prepareStatement("SELECT DESCR AS PARTY_NAME FROM SITE WHERE SITE_CODE = ?");
}
else
{
partyNamePstmt = conn.prepareStatement("SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ?");
}
partyCode = null;
int noOfSupCols = sqlExprRSMetaData.getColumnCount();
for(int suppCtr = 1; suppCtr <= noOfSupCols; suppCtr++)
{
colName = sqlExprRSMetaData.getColumnName(suppCtr);
//System.out.println("Counter.ejb.. " + suppCtr + " Column Name.ejb..ejb. " + colName);
if (colName.trim().equalsIgnoreCase("SUPP_CODE"))
{
partyCode = sqlExprResultSet.getString(suppCtr);
partyCode = (partyCode != null && !"null".equalsIgnoreCase(partyCode))?partyCode:"";
}
}
// 09/07/08 manoharan
if ( refSerStd.trim().equalsIgnoreCase("D-RCP") )//&& partyCode == null )
{
//System.out.println("siteCodeShip ######## assigned to partyCode - sundryType [" + sundryType + "]");
partyCode = siteCodeShip;
}
// end 09/07/08 manoharan
//System.out.println("Supp Code.ejb..ejb. " + partyCode);
if (partyCode != null && partyCode.trim().length() > 0 )
{
partyNamePstmt.setString(1, partyCode);
partyNameRS = partyNamePstmt.executeQuery();
partyName = null;
if(partyNameRS.next())
{
partyName = partyNameRS.getString("PARTY_NAME");
}
partyNameRS.close();
partyNamePstmt.close();
if (partyName == null)
{
partyName = " " ;
}
System.out.println("Supp Name.ejb..ejb. " + partyName);
}
else
{
//Changed by Rohan on 03-04-13 for setting party name is equals to blank.start
System.out.println("******PARTY NAME ELSE************");
if (partyName == null)
{
partyName = " " ;
}
//Changed by Rohan on 03-04-13 for setting party name is equals to blank.end
}
}
else
{
partyName = " ";
}
// end 18/07/08 manoharan checking added for null / empty sundry type
retTabSepStrBuff.append(partyName).append("\t"); //supplier name
/*
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("TAX_AMT"))).append("\t");//tax amt
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("ADJ_AMT"))).append("\t");//Adjusted amount
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("BAL_AMT"))).append("\t");//Balance amount
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("NET_AMT"))).append("\t");//net amount
*/
taxAmt = sqlExprResultSet.getString("TAX_AMT");
adjAmt = sqlExprResultSet.getString("ADJ_AMT");
balAmt = sqlExprResultSet.getString("BAL_AMT");
netAmt = sqlExprResultSet.getString("NET_AMT");
taxAmt = (taxAmt != null && !"null".equalsIgnoreCase(taxAmt))?taxAmt:"0";
adjAmt = (adjAmt != null && !"null".equalsIgnoreCase(adjAmt))?adjAmt:"0";
balAmt = (balAmt != null && !"null".equalsIgnoreCase(balAmt))?balAmt:"0";
netAmt = (netAmt != null && !"null".equalsIgnoreCase(netAmt))?netAmt:"0";
retTabSepStrBuff.append(taxAmt).append("\t");//tax amt
retTabSepStrBuff.append(adjAmt).append("\t");//Adjusted amount
retTabSepStrBuff.append(balAmt).append("\t");//Balance amount
retTabSepStrBuff.append(netAmt).append("\t");//net amount
//retTabSepStrBuff.append(sqlExprResultSet.getString("SUPP_CODE")).append("\t");//supplier code
String sundryCode = "";
String exciseRef = "";
siteCodeShip = null;
if (refSerStd != null && refSerStd.trim().equals("D-RCP"))
{
sundryCodeSelPstmt.setString(1, refId);
sundryCodeResultSet = sundryCodeSelPstmt.executeQuery();
if(sundryCodeResultSet.next())
{
sundryCode = sundryCodeResultSet.getString("SUNDRY_CODE");
sundryCode = (sundryCode != null && !"null".equalsIgnoreCase(sundryCode))?sundryCode:"";
sundryType = sundryCodeResultSet.getString("SUNDRY_TYPE");
sundryType = (sundryType != null && !"null".equalsIgnoreCase(sundryType))?sundryType:"";
if("S".equalsIgnoreCase(sundryType))
{
exciseRefSelPstmt.setString(1, sundryCode);
exciseRefResultSet = exciseRefSelPstmt.executeQuery();
if(exciseRefResultSet.next())
{
exciseRef = exciseRefResultSet.getString("EXCISE_REF");
exciseRef = (exciseRef != null && !"null".equalsIgnoreCase(exciseRef))?exciseRef:"";
}
}
}
sundryCodeResultSet.close(); // 17/03/08 manoharan
sundryCodeResultSet = null; // 17/03/08 manoharan
// 16-08-2006 manoharan in case of D-RCP take shipping site
//retTabSepStrBuff.append(sundryCode).append("\t");
siteCodeShipPstmt = conn.prepareStatement("SELECT DI.SITE_CODE__SHIP FROM DISTORDER DI, DISTORD_RCP DRCP WHERE DI.DIST_ORDER=DRCP.DIST_ORDER AND DRCP.TRAN_ID = ?");
siteCodeShipPstmt.setString(1, refId);
siteCodeShipRS = siteCodeShipPstmt.executeQuery();
if(siteCodeShipRS.next())
{
siteCodeShip = siteCodeShipRS.getString("SITE_CODE__SHIP");
siteCodeShip = (siteCodeShip != null && !"null".equalsIgnoreCase(siteCodeShip))?siteCodeShip:"";
}
siteCodeShipRS.close();
siteCodeShipPstmt.close();
siteCodeShipRS = null;
siteCodeShipPstmt = null;
//retTabSepStrBuff.append(siteCodeShip).append("\t"); //site code ship
// end 16-08-2006 manoharan
}//if (refSerStd != null && refSerStd.trim().equals("D-RCP"))
/*
else
{
siteCodeShip = "";
retTabSepStrBuff.append(siteCodeShip).append("\t"); //site code ship
System.out.println("siteCodeShip"+siteCodeShip);
}
*/
//genericUtility.getValidDateString(sprocDate, genericUtility.getApplDateFormat(), genericUtility.getApplDateFormat());
siteCodeShip = (siteCodeShip != null && !"null".equalsIgnoreCase(siteCodeShip))?siteCodeShip:"";
retTabSepStrBuff.append(siteCodeShip).append("\t"); //site code ship
/*
String qtyRecd = sqlExprResultSet.getString("QTY_RECD");
qtyRecd = (qtyRecd != null && !"null".equalsIgnoreCase(qtyRecd))?qtyRecd:"0";
System.out.println("qty received"+qtyRecd);
retTabSepStrBuff.append(qtyRecd).append("\t");//qty requried
*/
qtyRecd = checkNull(sqlExprResultSet.getString("QTY_RECD"));
retTabSepStrBuff.append(qtyRecd.trim()).append("\t");
//retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("QTY_RECD"))).append("\t");//ref_doc_no
retTabSepStrBuff.append(balGrpStd).append("\t");//Balance Group
String tempString = (String)this.globalVarMap.get("bal_group__adj");
balGroupadj = (tempString != null && !"null".equalsIgnoreCase(tempString))?tempString:"";
retTabSepStrBuff.append(balGroupadj).append("\t"); //Balance Group Adjusted
//retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("REF_DOC_DATE"))).append("\t");//ref doc date
refDocStr = checkNull(sqlExprResultSet.getString("REF_DOC_DATE"));
if(!"".equalsIgnoreCase(refDocStr.trim()))
{
refDocStr = genericUtility.getValidDateString(refDocStr, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}
/*
if(!"".equalsIgnoreCase(refDocStr.trim()) && refDocStr != null)
{
//if (this.genericUtility.getApplDateFormat().length() == 10)
//{
refDocStr = refDocStr.substring(0,10);
//}
//else
//{
//refDocStr = refDocStr.substring(0,8);
//}
}
// 04-01-2007 manoharan new column for additional excise (cess)
//retTabSepStrBuff.append(sprocDate).append("\n");
//System.out.println("sprocDate before :"+sprocDate);
//sprocDate = genericUtility.getValidDateString(sprocDate, genericUtility.getApplDateFormat(), genericUtility.getApplDateFormat());
if (genericUtility.getApplDateFormat().indexOf("/") != -1)
{
refDocStr = refDocStr.replace('-', '/');
System.out.println("refDocStr;;;"+refDocStr);
}
*/
retTabSepStrBuff.append(refDocStr.trim()).append("\t");//ref doc date
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("ITEM_CODE"))).append("\t");//item code
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("REF_DOC_NO"))).append("\t");//ref_doc_no
retTabSepStrBuff.append(refSerStd).append("\t"); //ref_series
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
/*
String sundryCode = "";
String exciseRef = "";
siteCodeShip = null;
......@@ -466,12 +840,16 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
siteCodeShipPstmt.close();
siteCodeShipRS = null;
siteCodeShipPstmt = null;
System.out.println("siteCodeShip"+siteCodeShip+"exciseRef:"+exciseRef);
retTabSepStrBuff.append(siteCodeShip).append("\t");
// end 16-08-2006 manoharan
retTabSepStrBuff.append(exciseRef).append("\t");
ctr = ctr + 2;
}//if (refSerStd != null && refSerStd.trim().equals("D-RCP"))
*/
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
String itemCode = sqlExprResultSet.getString("ITEM_CODE");
itemCode = (itemCode != null && !"null".equalsIgnoreCase(itemCode))?itemCode:"";
String taxChapter = "";
......@@ -542,7 +920,53 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
}
// end 25-10-2006 manoharan
retTabSepStrBuff.append(tranType).append("\t"); //tran type
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_TYPE"))).append("\t"); // doc type
retTabSepStrBuff.append(balTypeStd).append("\t"); //balance type std
retTabSepStrBuff.append(balPrdStd).append("\t"); //Balancve period
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("REF_LINE"))).append("\t"); // Reference line
retTabSepStrBuff.append(matCategory).append("\t");
retTabSepStrBuff.append(taxChapter).append("\t");
retTabSepStrBuff.append(chapHeading).append("\t");
retTabSepStrBuff.append(sqlExprResultSet.getString("SITE_CODE")).append("\t"); // site code supplier
//retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("CLOSING_STOCK"))).append("\t"); // closing stock
clsStk = checkNull(sqlExprResultSet.getString("CLOSING_STOCK"));
//clsStk = (clsStk != null && !"null".equalsIgnoreCase(clsStk))?clsStk:"0";
retTabSepStrBuff.append(clsStk.trim()).append("\t"); // closing stock
retTabSepStrBuff.append(exciseRef).append("\t");
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("SITE_CODE__SUPP"))).append("\t"); // site code supplier
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("SITE_CODE__TRAN"))).append("\t"); // site code supplier
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("TRAN_TYPE_TRANSACTION"))).append("\t"); // tran type of transaction
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("LOT_NO"))).append("\t"); //lot no
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("INVOICE_NO"))).append("\t"); //invoice no
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("TAX_CODE"))).append("\t"); //tax code
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("LOT_SL"))).append("\t"); //tax code
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("PROCESS_YN"))).append("\t"); //tax code
retTabSepStrBuff.append(drcrFlagStd).append("\t"); //drcr flag
drAmt = checkNull(sqlExprResultSet.getString("DR_AMT"));
crAmt = checkNull(sqlExprResultSet.getString("CR_AMT"));
retTabSepStrBuff.append(drAmt.trim()).append("\t"); //dr amt
retTabSepStrBuff.append(crAmt.trim()).append("\t"); //cr amt
/*
drAmt = sqlExprResultSet.getString("DR_AMT");
crAmt = sqlExprResultSet.getString("CR_AMT");
drAmt = (drAmt != null && !"null".equalsIgnoreCase(drAmt))?drAmt:"0";
crAmt = (crAmt != null && !"null".equalsIgnoreCase(crAmt))?crAmt:"0";
retTabSepStrBuff.append(drAmt).append("\t"); //dr amt
retTabSepStrBuff.append(crAmt).append("\t"); //cr amt
System.out.println("dr Amt"+drAmt+"crAmt"+crAmt);
*/
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
if(balPrdStd.trim().equalsIgnoreCase("D"))
{
dataStr = (String) this.globalVarMap.get("tran_date__to");
......@@ -556,6 +980,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
//System.out.println("calDate 1 after : " +dataStr);
retTabSepStrBuff.append(dataStr).append("\t");
System.out.println("dataStr:D form::"+dataStr);
ctr++;
}
else
......@@ -581,16 +1006,27 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
dataStr = genericUtility.getValidDateString(dataStr, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
//retTabSepStrBuff.append(new java.sql.Date(calendar.getTime().getTime())).append("\t");
retTabSepStrBuff.append(dataStr).append("\t");
//System.out.println("calDate 2 after :"+dataStr);
//System.out.println("calDate 2 after >>>>:"+dataStr);
ctr++;
}
retTabSepStrBuff.append(taxChapter).append("\t");
retTabSepStrBuff.append(chapHeading).append("\t");
retTabSepStrBuff.append(matCategory).append("\t");
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("ITEM_REF"))).append("\t"); //item reference
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("PARTY_REF"))).append("\t"); //party reference
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("BANK_CODE"))).append("\t"); //Bank code
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("TAX_REF"))).append("\t"); //tax reference
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_DESCR"))).append("\t"); //doc desccr
retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("DOC_TYPE"))).append("\t"); //doc typr
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.start
//retTabSepStrBuff.append(matCategory).append("\t");
// 10-08-2006 manoharan
//retTabSepStrBuff.append(tranType).append("\n");
//System.out.println("Tran Type Transaction 25-10-2006 :: "+tranType);
retTabSepStrBuff.append(tranType).append("\t");
//retTabSepStrBuff.append(tranType).append("\t");
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality.end
String sprocDate = (String)this.globalVarMap.get("proc_date");
if (this.genericUtility.getApplDateFormat().length() == 8)
{
......@@ -621,12 +1057,13 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
// 27-06-2007 manoharan new column supp_name added
//retTabSepStrBuff.append(addExcise).append("\n");
retTabSepStrBuff.append(addExcise).append("\t");
retTabSepStrBuff.append(addExcise).append("\n");
// end 04-01-2007 manoharan
//String partyName = null;
//String partyCode = null;
//partyCode = sqlExprResultSet.getString("SUPP_CODE");
//Changed by Rohan on 08-04-13 for maintain selecting sequence & display sequecnce same to support sorting functionality
/*
if ( refSerStd.trim().equalsIgnoreCase("CRNRCP") || refSerStd.trim().equalsIgnoreCase("S-DSP") || refSerStd.trim().equalsIgnoreCase("S-RET"))
{
sundryType = "C";
......@@ -693,6 +1130,8 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
I Site
*/
// 18/07/08 manoharan checking added for null / empty sundry type
//System.out.println("Supplier Code:=====>: Sundry Type"+sundryType);
/*
if (sundryType != null && sundryType.trim().length() >= 0)
{
......@@ -779,6 +1218,16 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
System.out.println("Supp Name.ejb..ejb. " + partyName);
}
else
{
//Changed by Rohan on 03-04-13 for setting party name is equals to blank.start
System.out.println("******PARTY NAME ELSE************");
if (partyName == null)
{
partyName = " " ;
}
//Changed by Rohan on 03-04-13 for setting party name is equals to blank.end
}
}
else
{
......@@ -786,8 +1235,10 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
// end 18/07/08 manoharan checking added for null / empty sundry type
retTabSepStrBuff.append(partyName).append("\n");
*/
// end 27-06-2007 manoharan
ctr = ctr + 6;
//ctr = ctr + 6;
//System.out.println("xxxxxxxxxxxxxxxxxxxxxxxxxx ctr :"+ctr);
}//while(sqlExprResultSet.next())
......@@ -802,7 +1253,6 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
sqlExprRSMetaData = null;
resultString = retTabSepStrBuff.toString();
System.out.println("resultString [" + resultString + "]");
// 28-06-2007 manoharan
partyNameRS = null;
// 16/03/10 manoharan
......@@ -1097,4 +1547,14 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
}
return itmDBAccess;
}
//Changed by Rohan on 09-04-13 for checking null.start
private String checkNull( String input )
{
if ( input == null || input.equalsIgnoreCase("null"))
{
input = " ";
}
return input;
}
//Changed by Rohan on 09-04-13 for checking null.end
}
\ No newline at end of file
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