Skip to content

B
business-java
Commit 428bed9b authored by vkadam's avatar vkadam
Browse files
Options

Change in Auto payment generation process, Purchase voucher create scheduler,... 

Change in Auto payment generation process, Purchase voucher create scheduler, Generate tax voucher scheduler.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100349 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 78a35a9a
Show whitespace changes
Inline Side-by-side
Showing with 1289 additions and 1041 deletions
webitm-fin/ibase/webitm/ejb/fin/AutoPmtGenPrc.java
View file @ 428bed9b
......@@ -56,9 +56,12 @@ public class AutoPmtGenPrc extends ProcessEJB
Timestamp dateTo = null;
Timestamp dateFr = null;
String startDateStr = null;
FileOutputStream fos1 = null;
java.util.Date startDate = new java.util.Date(System.currentTimeMillis());
Calendar calendar = Calendar.getInstance();
FinCommon finCommon=new FinCommon();
public String getData(String xmlString, String xmlString2, String windowName, String xtraParams)
throws RemoteException, ITMException
......@@ -155,10 +158,11 @@ public class AutoPmtGenPrc extends ProcessEJB
String resultString = "";
String getSql = null;
String currCode = "";
String checkBarCd="";
String sql = null;
ResultSet rs = null;
ResultSet rs1 = null;
String spiltChq = "";
String spiltChq = "",barCode="";
PreparedStatement pstmt = null; PreparedStatement pstmt1 = null;
double unapprovedPayAmt = 0.0D; double payAmt = 0.0D; double netPayable = 0.0D;
......@@ -174,6 +178,24 @@ public class AutoPmtGenPrc extends ProcessEJB
stmtTemp = conn.createStatement();
DatabaseMetaData dbmd = conn.getMetaData();
/**
* [F15KSUN014]
* VALLABH KADAM
* select finparam 'CHECK_BARCD_APMT'
* */
checkBarCd=checkNull(finCommon.getFinparams("999999", "CHECK_BARCD_APMT", conn));
if(checkBarCd==null || checkBarCd.trim().length() == 0 || checkBarCd.trim().equalsIgnoreCase("NULLFOUND"))
{
checkBarCd="N";
}
System.out.println("Check bar code from finparm :- ["+checkBarCd+"]");
/**
* [F15KSUN014]
* VALLABH KADAM
* select finparam 'CHECK_BARCD_APMT'
* END
* */
getSql = "select var_value from finparm where prd_code='999999' and var_name='AUTOPAYGEN_LOG_FLAG'";
pstmt = conn.prepareStatement(getSql);
rs = pstmt.executeQuery();
......@@ -373,6 +395,45 @@ public class AutoPmtGenPrc extends ProcessEJB
netPayable = rs.getDouble("net_payable");
dueDate = rs.getString("due_date");
/**
* [F15KSUN014]
* VALLABH KADAM
* Select BARCODE
* using 'DDF_GET_MULTI_BARCODE' function
* 24/FEB/16
* */
if("Y".equalsIgnoreCase(checkBarCd))
{
System.out.println("Check bar code found Y");
tempSql="select DDF_GET_MULTI_BARCODE(?) as barcode from dual";
pstmt1=conn.prepareStatement(tempSql);
pstmt1.setString(1, refNo);
rsTemp = pstmt1.executeQuery();
if (rsTemp.next())
{
barCode=checkNull(rsTemp.getString("barcode"));
}
pstmt1.close();
pstmt1 = null;
rsTemp.close();
rsTemp = null;
if(barCode==null || barCode.trim().length()==0)
{
continue;
}
}
/**
* [F15KSUN014]
* VALLABH KADAM
* Select BARCODE
* using 'DDF_GET_MULTI_BARCODE' function
* 24/FEB/16
* END
* */
tempSql = " select sum(b.net_amt) as unconfirm_amt from misc_payment a,misc_paydet b where a.tran_id=b.tran_id and b.tran_ser=? and b.vouch_no= ? and a.confirmed='N' ";
System.out.println("SQL==>" + tempSql);
......@@ -572,7 +633,7 @@ public class AutoPmtGenPrc extends ProcessEJB
String wfStatus = "";
String spiltChq = "";
String stanCode = "";
String checkBarCd="";
String tranDate = "";
double diffAmt = 0.0D;
String retString = "";
......@@ -649,6 +710,9 @@ Timestamp refDateSTr=null;
String maxRefNo = "";
try
{
System.out.println("intializingLog$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$........." + intializingLog("Gen_bank_payment_log"));
StringBuffer retBuf = new StringBuffer();
conn = connDriver.getConnectDB("DriverITM");
......
webitm-fin/ibase/webitm/ejb/fin/AutoPmtPrcSch.java
View file @ 428bed9b
......@@ -435,7 +435,7 @@ public class AutoPmtPrcSch
System.out.println("Calling getData() Method@@@@@@@@@@@");
retString = aPayPrc.getData(xmlString1, xmlString2, windowName, xtraParams, isSSCUsers);
System.out.println("ResultString....." + retString);
System.out.println("Get DATA Result String :- [" + retString+"]");
System.out.println("Processing DATA *****");
System.out.println("getData Method Finished@@@@@@@@@@@2");
......@@ -543,7 +543,7 @@ public class AutoPmtPrcSch
System.out.println("xmlString4@@@@@@@@@@@@@@@@:" + xmlString4);
System.out.println("Calling process() Method@@@@@@@@@@@@");
retString1 = aPayPrc.process(xmlString1, xmlString4, windowName, xtraParams);
System.out.println("retString1 in Scheduler=====" + retString1);
System.out.println("Process return String :-[" + retString1+"]");
System.out.println("-----Process() called successfully-------");
}
......
webitm-fin/ibase/webitm/ejb/fin/CreatePoRcpVoucher.java
View file @ 428bed9b
......@@ -75,7 +75,9 @@ public class CreatePoRcpVoucher
String remarks = "", siteCode = "", invoiceNo = "", DcNo = "", retOpt = "", postType = "", itemSer = "";
String invOnLine = "", poRcpOnLine = "", postProv = "", crTerm = "", projCode = "", pordType = "";
String analCode = "", bankCodePay = "", acctCodePur = "", cctrCodePur = "", payMode = "", profileId = "",tranIdVoucher="";
String finEntity = "", bankCode = "", keyString = "", ledgPostConf = "",whetherToConvert = "N", userId = "SYSTEM", termId = "SYSTEM";
String finEntity = "", bankCode = "", keyString = "", ledgPostConf = "",whetherToConvert = "N";
// String userId = "SYSTEM", termId = "SYSTEM";
String userId = "", termId = "";
java.text.SimpleDateFormat sdf = null;
String acctCodeCF = "", acctCodeCFAP = "", cctrCodeCF = "", cctrCodeCFAP = "", suppCodePay = "";
String rcpLine = "", purcOrderDet = "", lineNoOrd = "", rcpItemCode = "", rcpUnit = "";
......@@ -95,6 +97,10 @@ public class CreatePoRcpVoucher
InitialContext ctx = new InitialContext(p);
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
termId= genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
System.out.println("@@@ User Id from xtraparam :- ["+userId+"]");
System.out.println("@@@ Term Id from xtraparam :- ["+termId+"]");
sql = "SELECT PROFILE_ID FROM USERS WHERE CODE = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -839,9 +845,14 @@ public class CreatePoRcpVoucher
xmlBuff.append("<diff_amt__exch><![CDATA[0]]></diff_amt__exch>");
xmlBuff.append("<supp_bill_amt><![CDATA[" + suppBillAmount + "]]></supp_bill_amt>");
sdf = new java.text.SimpleDateFormat(genericUtility.getApplDateTimeFormat());
xmlBuff.append("<add_date><![CDATA[" + sdf.format(today) + "]]></add_date>");
xmlBuff.append("<add_user><![CDATA[" + (userId==null?"BASE":userId) + "]]></add_user>");
xmlBuff.append("<add_term><![CDATA[" + (termId==null?"BASE":termId) + "]]></add_term>");
xmlBuff.append("<chg_user><![CDATA[" + (userId==null?"BASE":userId) + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + (termId==null?"BASE":termId) + "]]></chg_term>");
sdf = new java.text.SimpleDateFormat(genericUtility.getApplDateTimeFormat());
//sdf = new java.text.SimpleDateFormat(genericUtility.getApplDateTimeFormat());
xmlBuff.append("<chg_date><![CDATA[" + sdf.format(today) + "]]></chg_date>");
xmlBuff.append("</Detail1>");
......@@ -1775,7 +1786,9 @@ public class CreatePoRcpVoucher
userInfoBean.setUserCountry(userInfoArray[19]);
//masterStatefulLocal = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
//String retString = masterStatefulLocal.processRequest(userInfoBean, xmlString, true, conn);
String retString =saveData(userInfoBean,siteCode, xmlBuff.toString(), conn);
// String retString =saveData(userInfoBean,siteCode, xmlBuff.toString(), conn);
String retString =saveData(xtraParams,siteCode, xmlBuff.toString(), conn);
/**
* Vishakha Dhoble 02-Nov-15 (F15GSUN009)
* */
......@@ -2170,8 +2183,86 @@ public class CreatePoRcpVoucher
return dueDate;
}
// public double[] getPurcRate(String purcOrder,String itemCode,double poRate,double poDisc, Connection conn) throws ITMException
// {
// PreparedStatement pstmt = null;
// ResultSet rs = null;
// String sql = "";
// String porderNo = "", provNo = "";
// double rateDiscount[] = {0,0};
// try
// {
// sql = " select purc_order, (case when provi_tran_id is null then '' else provi_tran_id end) as provi_tran_id"
// + " from porder where purc_order = ?"; //: ;
//
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,purcOrder);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// porderNo = rs.getString("purc_order");
// provNo = rs.getString("provi_tran_id");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
//
// if (porderNo.equals(provNo))
// {
// sql = " select rate, discount "
// + " from porder a, porddet b "
// + " where a.purc_order = b.purc_order "
// + " and a.purc_order <> ? "
// + " and a.provi_tran_id = ? "
// + " and b.item_code = ? "
// + " and a.confirmed = 'Y' ";
//
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,purcOrder);
// pstmt.setString(2,purcOrder);
// pstmt.setString(3,itemCode);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// poRate = rs.getDouble("rate");
// poDisc = rs.getDouble("discount");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
// }
// else
// {
// poRate = -999;
// poDisc = -999;
// }
// rateDiscount[0] = poRate;
// rateDiscount[1] = poDisc;
// } // try
// catch(Exception e)
// {
// throw new ITMException(e);
// }
// finally
// {
// try
// {
// if(rs != null){rs.close();rs = null;}
// if(pstmt != null){pstmt.close();pstmt = null;}
// }
// catch(Exception e)
// {
// throw new ITMException(e);
// }
// }
// return rateDiscount;
//
// }
public double[] getPurcRate(String purcOrder,String itemCode,double poRate,double poDisc, Connection conn) throws ITMException
{
System.out.println("Change method getPurcRate()");
PreparedStatement pstmt = null;
ResultSet rs = null;
String sql = "";
......@@ -2179,36 +2270,36 @@ public class CreatePoRcpVoucher
double rateDiscount[] = {0,0};
try
{
sql = " select purc_order, (case when provi_tran_id is null then '' else provi_tran_id end) as provi_tran_id"
+ " from porder where purc_order = ?"; //: ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
porderNo = rs.getString("purc_order");
provNo = rs.getString("provi_tran_id");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (porderNo.equals(provNo))
{
// sql = " select purc_order, (case when provi_tran_id is null then '' else provi_tran_id end) as provi_tran_id"
// + " from porder where purc_order = ?"; //: ;
//
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,purcOrder);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// porderNo = rs.getString("purc_order");
// provNo = rs.getString("provi_tran_id");
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
//
// if (porderNo.equals(provNo))
// {
sql = " select rate, discount "
+ " from porder a, porddet b "
+ " where a.purc_order = b.purc_order "
+ " and a.purc_order <> ? "
+ " and a.provi_tran_id = ? "
+ " and a.purc_order = ? "
//+ " and a.provi_tran_id = ? "
+ " and b.item_code = ? "
+ " and a.confirmed = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder);
pstmt.setString(2,purcOrder);
pstmt.setString(3,itemCode);
// pstmt.setString(2,purcOrder);
pstmt.setString(2,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -2219,12 +2310,12 @@ public class CreatePoRcpVoucher
rs = null;
pstmt.close();
pstmt = null;
}
else
{
poRate = -999;
poDisc = -999;
}
// }
// else
// {
// poRate = -999;
// poDisc = -999;
// }
rateDiscount[0] = poRate;
rateDiscount[1] = poDisc;
} // try
......@@ -2244,6 +2335,10 @@ public class CreatePoRcpVoucher
throw new ITMException(e);
}
}
System.out.println("Arry length :- ["+rateDiscount.length+"]");
System.out.println("Arry :- ["+rateDiscount[0]+"]");
System.out.println("Arry :- ["+rateDiscount[1]+"]");
return rateDiscount;
}
......@@ -2387,12 +2482,16 @@ public class CreatePoRcpVoucher
}
return errCode;
}
private String saveData(UserInfoBean userInfoBean,String siteCode, String xmlString, Connection conn) throws ITMException
// private String saveData(UserInfoBean userInfoBean,String siteCode, String xmlString, Connection conn) throws ITMException
private String saveData(String xtraParams,String siteCode, String xmlString, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
String retString = null;
MasterStatefulLocal masterStateful = null; // for ejb3
ibase.utility.UserInfoBean userInfoBean=new UserInfoBean();
try
{
AppConnectParm appConnect = new AppConnectParm();
......@@ -2403,6 +2502,21 @@ public class CreatePoRcpVoucher
authencate[0] = "";
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
// chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgUser");
// chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
// loginCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
// loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
// loginSiteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
userInfoBean.setEmpCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
userInfoBean.setRemoteHost(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
userInfoBean.setSiteCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
userInfoBean.setLoginCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
userInfoBean.setEntityCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
// userInfoBean=
// retString=masterStateful.processRequest(authencate, siteCode, true, xmlString, true, conn);
retString=masterStateful.processRequest(userInfoBean,xmlString,true,conn);
//retString = masterStateful.processRequest(authencate, siteCode, true, xmlString, true, conn);
} catch (ITMException itme)
......
webitm-fin/ibase/webitm/ejb/fin/GenTaxVoucherSch.java
View file @ 428bed9b
......@@ -193,14 +193,20 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
PreparedStatement pstmt = null,pstmt1 = null,pstmt2 = null,pstmt3 = null,pstmt4 = null;
ResultSet rs = null,rs1=null,rs2=null,rs3=null,rs4=null;
java.sql.Timestamp tranDateFrm=null,tranDateTo=null,prdFrom=null,sysDateTstmp=null,frmDateCurr=null,toDateCurr=null,vouchDateFrm=null,vouchDateTo=null;
Map<String,List<String>> taxSiteMap = new HashMap<String,List<String>>();
// Map<String,List<String>> taxSiteMap = new HashMap<String,List<String>>();
ArrayList<String> taxCodeList = new ArrayList<String>(); // added by cpatil for tax list for site
Date currentDate = new Date();
String sql="",valuexmlString="",retString="",sysDateStr="",taxCode="",siteCode="",vauchDtVar="";
String sql="",valuexmlString="",retString="",sysDateStr="";
// ,taxCode="",
String siteCode="",vauchDtVar="";
String series="",prdDateAppl="",sql1=""; //added by cpatil on 05/02/16
try
{
System.out.println("called genTextVouchSch !!");
SimpleDateFormat sdf= new SimpleDateFormat((GenericUtility.getInstance()).getApplDateFormat());
String seriesArr [] = new String[8];
// String seriesArr [] = new String[8]; // comment by cpatil on 05/02/16
/*seriesArr[0] = "M-VOUC"; // Misc.Voucher
seriesArr[1] = "VOUCH"; // Purchase Voucher
seriesArr[2] = "S-INV"; // Sales Invoice
......@@ -214,7 +220,7 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
*/
seriesArr[0] = "M-VOUC"; // Misc.Voucher
/* seriesArr[0] = "M-VOUC"; // Misc.Voucher
seriesArr[1] = "VOUCH"; // Purchase Voucher
seriesArr[2] = "S-INV"; // Sales Invoice
seriesArr[3] = "MDRCRD"; // Misc Debit Note
......@@ -224,13 +230,14 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
seriesArr[7] = "DRNRCP"; // Debit Note
//seriesArr[8] = "DRNPAY"; // Dr Note Payable(not use)
//seriesArr[9] = "CRNPAY"; // Cr Note Payable(not use)
*/
/*---------------Calculate previous month of first date and last date-------------------------*/
sysDateStr = sdf.format(currentDate);
sysDateTstmp = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(sysDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("sysDateTstmp :"+sysDateTstmp);
sql= " select FR_DATE,TO_DATE from period where ? "
+ " between FR_DATE and TO_DATE";
pstmt = conn.prepareStatement(sql);
......@@ -270,6 +277,26 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
System.out.println("tranDateFrm :"+tranDateFrm);
System.out.println("tranDateTo :"+tranDateTo);
//added by cpatil
sql1 = " select descr , sh_descr, udf_str1 from gencodes " +
" where mod_name = 'W_TAX_VOUCH_PARM' and active = 'Y' ";
pstmt1 = conn.prepareStatement(sql1);
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
series = checkNull(rs1.getString("descr"));
siteCode = checkNull(rs1.getString("sh_descr"));
prdDateAppl = checkNull(rs1.getString("udf_str1"));
/*
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
*/
System.out.println("@@@@@@@@@@@ series["+series+"]siteCode["+siteCode+"]prdDateAppl["+prdDateAppl+"]");
String seriesArr[]=series.split(",");
/*----------------------------------------------------------------------------------------*/
startDateStr = sdf.format(startDate)+" "+calendar.get(Calendar.HOUR)+":"+calendar.get(Calendar.MINUTE)+":"+calendar.get(Calendar.SECOND);
......@@ -283,9 +310,11 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
tranDateTo = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(todate, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("tranDateTo :"+tranDateTo);*/
vauchDtVar = checkNull(finCommon.getFinparams("999999", "TAX_VOUCH_DATE", conn));
System.out.println("vauchDtVar="+vauchDtVar);
if(vauchDtVar.equalsIgnoreCase("Y"))
//commented by cpatil on 05/02/16
//vauchDtVar = checkNull(finCommon.getFinparams("999999", "TAX_VOUCH_DATE", conn));
//System.out.println("vauchDtVar="+vauchDtVar);
//if(vauchDtVar.equalsIgnoreCase("Y"))
if( prdDateAppl != null && prdDateAppl.equalsIgnoreCase("Y"))
{
vouchDateFrm=tranDateTo;
vouchDateTo=tranDateTo;
......@@ -300,35 +329,34 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
{
System.out.println("for count :"+serNo);
System.out.println("Series :"+seriesArr[serNo]);
taxSiteMap=getTaxSiteCodeOfSer(seriesArr[serNo],tranDateFrm,tranDateTo,conn);
taxCodeList= getTaxCodeOfSer(seriesArr[serNo],tranDateFrm,tranDateTo,siteCode,conn);
System.out.println("@@@@@@@@@ siteCode["+siteCode+"]taxCodeList["+taxCodeList+"]");
// for (Map.Entry<String, List<String>> entry : taxSiteMap.entrySet()) // commented by cpatil
// {
for (Map.Entry<String, List<String>> entry : taxSiteMap.entrySet())
{
String key = entry.getKey();
List<String> values = entry.getValue();
System.out.println("Key = " + key);
System.out.println("Values = " + values);
// String key = entry.getKey();
// List<String> values = entry.getValue();
// System.out.println("========>>>Key["+key+"]Values["+values+"]");
for (String code : values)
// for (String code : values)
for (String taxCode : taxCodeList)
{
System.out.println(code);
System.out.println("tax code:["+taxCode+"]");
//taxCode = code;
/*
int pos = code.indexOf("@");
System.out.println(pos);
taxCode = code.substring(0,pos);
System.out.println("taxCode :"+taxCode);
siteCode = code.substring(pos+1);
System.out.println("SiteCode :"+siteCode);
*/
strToWrite="";
strToWriteHead="Series :"+seriesArr[serNo]+" Tax Code:"+taxCode+" Site Code:"+siteCode+" Tran Date From:"+tranDateFrm+" Tran Date To:"+tranDateTo+" Voucher Date:"+tranDateFrm+" Voucher Due on:"+tranDateTo+"\n";
strToWrite=strToWrite + strToWriteHead;
strToWrite=strToWrite+startDateStr+",";
StringBuffer TaxVocStrBuff = new StringBuffer();
TaxVocStrBuff.append(taxCode).append("\t"); //tax_code
TaxVocStrBuff.append(siteCode).append("\t"); //site_code__fr
......@@ -348,8 +376,8 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
valuexmlString=TaxVocStrBuff.toString();
System.out.println("valuexmlString :"+valuexmlString);
StringBuffer TaxVocStrBuffAll = new StringBuffer();
System.out.println("=====>>>valuexmlString:["+valuexmlString+"]");
//StringBuffer TaxVocStrBuffAll = new StringBuffer();
retString = taxVochProcess("taxpost_chap",valuexmlString, xtraParams, conn);
System.out.println("retString :"+retString);
......@@ -359,13 +387,20 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
System.out.println(">>>Before Write to fos1 strToWrite:"+strToWrite);
fos1.write(strToWrite.getBytes());
}
}//end of loop for tax and site code map
System.out.println("000000000000");
} // end of for
// }//end of loop for tax and site code map
System.out.println(serNo);
}//end of for loop for series
////
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
////
System.out.println("end of for loop for series!!!!");
......@@ -489,16 +524,16 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
/*----------------Calculate TAX Code for Each Series-------------------------------------------------------*/
public Map getTaxSiteCodeOfSer(String series,java.sql.Timestamp tranDateFrm,java.sql.Timestamp tranDateTo,Connection conn)
public ArrayList<String> getTaxCodeOfSer(String series,java.sql.Timestamp tranDateFrm,java.sql.Timestamp tranDateTo,String siteCode,Connection conn)
{
//List<String> taxCodeList = new ArrayList<String>();
//List<String> siteCodeList = new ArrayList<String>();
List<String> taxSiteList = new ArrayList<String>();
Map<String,List<String>> seriesMap = new HashMap<String,List<String>>();
ArrayList<String> taxCodeList = new ArrayList<String>();
//Map<String,List<String>> seriesMap = new HashMap<String,List<String>>();
PreparedStatement pstmt = null;
ResultSet rs = null;
String sql = "";
String taxCode="",siteCode="";
String taxCode=""; //siteCode="";
try
......@@ -513,7 +548,8 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
if(series.equalsIgnoreCase("M-VOUC")) //MISC. Voucher
{
sql = " SELECT distinct taxtran.tax_code, misc_voucher.site_code " +
sql = " SELECT distinct taxtran.tax_code" +
//", misc_voucher.site_code " +
" FROM misc_voucher,taxtran,tax_authority, tax " +
" WHERE ( taxtran.tran_id = misc_voucher.tran_id ) and " +
"( taxtran.tax_code = tax.tax_code ) and" +
......@@ -523,21 +559,24 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
" = 'N' AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0 " +
// "and ( misc_voucher.tran_date between ? and ? )" +
"and ( misc_voucher.tran_date between ? and ? )" +
" AND ( misc_voucher.confirmed = 'Y' )";
" AND ( misc_voucher.confirmed = 'Y' )" +
" And misc_voucher.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
//taxCodeList.add(taxCode);
//siteCodeList.add(siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
......@@ -545,14 +584,15 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("m-vouc@Code",taxSiteList);
//seriesMap.put("m-vouc@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("VOUCH")) // Purchase Voucher
{
sql="SELECT distinct taxtran.tax_code,voucher.site_code " +
sql="SELECT distinct taxtran.tax_code" +
//",voucher.site_code " +
" FROM voucher, taxtran, tax_authority,tax WHERE " +
" ( taxtran.tran_id = voucher.tran_id ) and ( taxtran.tax_code = tax.tax_code )" +
" and ( tax.tauth_code = tax_authority.tauth_code ) and ( taxtran.tran_code = 'VOUCH' )" +
......@@ -560,192 +600,220 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
" AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0 " +
//" and ( voucher.tran_date between ? and ? )" +
" and ( voucher.tran_date between ? and ?)" +
" AND ( voucher.confirmed = 'Y' ) " ;
" AND ( voucher.confirmed = 'Y' ) " +
" AND voucher.site_code = ? " ; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("vouc@Code",taxSiteList);
//seriesMap.put("vouc@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("S-INV")) // Sales Invoice
{
sql= "SELECT distinct taxtran.tax_code, invoice.site_code FROM invoice,TAXTRAN WHERE " +
sql= "SELECT distinct taxtran.tax_code" +
//", invoice.site_code " +
" FROM invoice,TAXTRAN WHERE " +
" ( TAXTRAN.TRAN_ID = invoice.INVOICE_ID ) and ( taxtran.tran_code ='S-INV' ) " +
" AND (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N' ELSE TAXTRAN.POSTED END) = 'N' AND " +
" (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0 and " +
" ( invoice.tran_date between ? and ? ) AND ( invoice.confirmed = 'Y' ) ";
" ( invoice.tran_date between ? and ? ) AND ( invoice.confirmed = 'Y' )" +
" AND invoice.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("SINV@Code",taxSiteList);
//seriesMap.put("SINV@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("CRNINV")) //Comm Credit Note
{
sql=" select distinct taxtran.tax_code,drcr_inv.site_code from drcr_inv, " +
sql=" select distinct taxtran.tax_code" +
//",drcr_inv.site_code " +
" from drcr_inv, " +
" taxtran where ( taxtran.tran_id = drcr_inv.tran_id ) and" +
" ( taxtran.tran_code = 'CRNINV' ) and (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N'" +
" ELSE TAXTRAN.POSTED END) = 'N' AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE " +
" TAXTRAN.TAX_AMT END) <> 0 and ( drcr_inv.tran_date between ? and ? )" +
" and ( drcr_inv.confirmed = 'Y' ) ";
" and ( drcr_inv.confirmed = 'Y' ) " +
" AND drcr_inv.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("CRNINV@Code",taxSiteList);
//seriesMap.put("CRNINV@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("MDRCRC")) //Misc. Credit Note
{
sql=" select distinct taxtran.tax_code,misc_drcr_rcp.site_code " +
sql=" select distinct taxtran.tax_code " +
//" ,misc_drcr_rcp.site_code " +
" from misc_drcr_rcp, taxtran where" +
" ( taxtran.tran_id = misc_drcr_rcp.tran_id ) " +
" and ( taxtran.tran_code = 'MDRCRC' ) and " +
" (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N' ELSE TAXTRAN.POSTED END) = 'N'" +
" AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0 " +
" and ( misc_drcr_rcp.tran_date between ? and ? ) and" +
" ( misc_drcr_rcp.confirmed = 'Y' ) ";
" ( misc_drcr_rcp.confirmed = 'Y' ) " +
" AND misc_drcr_rcp.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("MDRCRC@Code",taxSiteList);
//seriesMap.put("MDRCRC@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("MDRCRD")) // Misc.debit Note
{
sql=" select distinct taxtran.tax_code,misc_drcr_rcp.site_code " +
sql=" select distinct taxtran.tax_code " +
//" ,misc_drcr_rcp.site_code " +
" from misc_drcr_rcp, taxtran where" +
" ( taxtran.tran_id = misc_drcr_rcp.tran_id ) " +
" and ( taxtran.tran_code = 'MDRCRD' ) and " +
" (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N' ELSE TAXTRAN.POSTED END) = 'N'" +
" AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0 " +
" and ( misc_drcr_rcp.tran_date between ? and ? ) and" +
" ( misc_drcr_rcp.confirmed = 'Y' ) ";
" ( misc_drcr_rcp.confirmed = 'Y' ) " +
" AND misc_drcr_rcp.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("MDRCRD@Code",taxSiteList);
//seriesMap.put("MDRCRD@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("DRNRCP")) //Debit Note
{
sql= " select distinct drcr_rcp.site_code,taxtran.tax_code from drcr_rcp," +
sql= " select distinct " +
//" drcr_rcp.site_code," +
" taxtran.tax_code from drcr_rcp," +
" taxtran where ( taxtran.tran_id = drcr_rcp.tran_id ) and " +
" ( taxtran.tran_code = 'DRNRCP' ) and " +
" (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N' ELSE TAXTRAN.POSTED END) = 'N'" +
" AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0" +
" and ( drcr_rcp.tran_date between ? and ? )" +
" and ( drcr_rcp.confirmed = 'Y' ) ";
" and ( drcr_rcp.confirmed = 'Y' ) " +
" AND drcr_rcp.site_code = ? "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
pstmt.setString(3,siteCode); // added by cpatil
rs = pstmt.executeQuery();
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("DRNRCP@Code",taxSiteList);
//seriesMap.put("DRNRCP@Code",taxSiteList);
}
else if(series.equalsIgnoreCase("CRNRCP")) // Credit Note
{
sql= " select distinct drcr_rcp.site_code,taxtran.tax_code from drcr_rcp," +
sql= " select distinct " +
//" drcr_rcp.site_code," +
" taxtran.tax_code from drcr_rcp," +
" taxtran where ( taxtran.tran_id = drcr_rcp.tran_id ) and " +
" ( taxtran.tran_code = 'CRNRCP' ) and " +
" (CASE WHEN TAXTRAN.POSTED IS NULL THEN 'N' ELSE TAXTRAN.POSTED END) = 'N' AND (CASE WHEN TAXTRAN.TAX_AMT IS NULL THEN 0 ELSE TAXTRAN.TAX_AMT END) <> 0" +
" and ( drcr_rcp.tran_date between ? and ? )" +
" and ( drcr_rcp.confirmed = 'Y' ) ";
" and ( drcr_rcp.confirmed = 'Y' ) "; // added by cpatil
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,tranDateFrm);
pstmt.setTimestamp(2,tranDateTo);
......@@ -753,18 +821,19 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
while( rs.next())
{
taxCode = rs.getString("tax_code");
siteCode = rs.getString("site_code");
//siteCode = rs.getString("site_code");
System.out.print("taxCode :"+taxCode);
System.out.print("siteCode :"+siteCode);
//System.out.print("siteCode :"+siteCode);
taxSiteList.add(taxCode+"@"+siteCode);
//taxSiteList.add(taxCode+"@"+siteCode);
taxCodeList.add(taxCode);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
seriesMap.put("CRNRCP@Code",taxSiteList);
//seriesMap.put("CRNRCP@Code",taxSiteList);
}
......@@ -776,7 +845,8 @@ public class GenTaxVoucherSch extends ValidatorEJB implements Schedule {
e.printStackTrace();
}
return seriesMap;
//return seriesMap;
return taxCodeList;
}
......
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