Skip to content

B
business-java
Commit 13d7988e authored by msharma's avatar msharma
Browse files
Options

City Name,SiteCode,Amount displayed in brow window DI1ISUN007 done by Chandrakanth Patil 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91665 ce508802-f39f-4f6c-b175-0d175dae99d5
parent be195975
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 132 deletions
webitm-dis/ibase/webitm/ejb/dis/TaxFormRecoMulti.java
View file @ 13d7988e
...@@ -319,30 +319,33 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -319,30 +319,33 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
{ {
if(refSer.equals("S-RET")) if(refSer.equals("S-RET"))
{ {
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"sum( T.TAX_AMT ) as tax_amt,C.CUST_NAME,S.TRAN_DATE,S.CUST_CODE," +"sum( T.TAX_AMT ) as tax_amt,C.CUST_NAME,S.TRAN_DATE,S.CUST_CODE,"
+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE FROM TAXTRAN T," +"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(C.CUST_TYPE,C.CUST_CODE) as CITY,S.SITE_CODE,S.NET_AMT FROM TAXTRAN T,"
+ "TAX T1,CUSTOMER C,SRETURN S " + "TAX T1,CUSTOMER C,SRETURN S "
+ "WHERE ( T1.TAX_CODE = T.TAX_CODE ) and ( C.CUST_CODE = S.CUST_CODE ) " + "WHERE ( T1.TAX_CODE = T.TAX_CODE ) and ( C.CUST_CODE = S.CUST_CODE ) "
+"and ( T.TRAN_ID = S.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) " +"and ( T.TRAN_ID = S.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) "
+"AND ( S.SITE_CODE = ? ) AND " +"AND ( S.SITE_CODE = ? ) AND "
+"( S.TRAN_DATE between ? And ? ) AND " +"( S.TRAN_DATE between ? And ? ) AND "
+"( S.CUST_CODE >= ? And S.CUST_CODE <= ? ) AND " +"( S.CUST_CODE >= ? And S.CUST_CODE <= ? ) AND "
+"( T.TAX_CODE >= ? And T.TAX_CODE <= ? ) AND " +"( T.TAX_CODE >= ? And T.TAX_CODE <= ? ) AND "
+"( T1.FORM_REQD = 'Y' ) AND ( T.TAX_CLASS is not null ) AND " +"( T1.FORM_REQD = 'Y' ) AND ( T.TAX_CLASS is not null ) AND "
+"( T.TAX_FORM is null OR T.TAX_FORM_DATE is null ) ) " +"( T.TAX_FORM is null OR T.TAX_FORM_DATE is null ) ) "
+"GROUP BY T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM," +"GROUP BY T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,"
+"T.TAX_FORM_DATE,T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT," +"T.TAX_FORM_DATE,T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,"
+"T.TAX_CODE,T.TAX_CHAP,S.TRAN_DATE,S.CUST_CODE,C.CUST_NAME," +"T.TAX_CODE,T.TAX_CHAP,S.TRAN_DATE,S.CUST_CODE,C.CUST_NAME,"
+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE"; +"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,C.CUST_TYPE,C.CUST_CODE,S.SITE_CODE, S.NET_AMT ";
System.out.println("type:D::tranType:CLASS::refSer:S-RET---->Executed ");
} }
else if(refSer.equals("P-RCP")) else if(refSer.equals("P-RCP"))
{ {
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE " +" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE, "
+" FROM TAXTRAN T,TAX T1,PORCP P," +" DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE,P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P,"
+"SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and " +"SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and "
+"( S.SUPP_CODE = P.SUPP_CODE ) and " +"( S.SUPP_CODE = P.SUPP_CODE ) and "
+"( T.TRAN_ID = P.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) AND " +"( T.TRAN_ID = P.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) AND "
...@@ -354,15 +357,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -354,15 +357,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," +"T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,"
+"T.TAX_CHAP,P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF," +"T.TAX_CHAP,P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,"
+"P.EXCISE_REF_DATE"; +"P.EXCISE_REF_DATE ,S.SUPP_TYPE,S.SUPP_CODE,P.SITE_CODE, P.TOT_AMT";
System.out.println("type:D::tranType:CLASS::refSer:P-RCP---->Executed ");
} }
else if(refSer.equals("P-RET")) else if(refSer.equals("P-RET"))
{ {
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE " +"sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE, "
+" FROM TAXTRAN T,TAX T1,PORCP P,SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and " +"DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE,P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P,SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and "
+"( S.SUPP_CODE = P.SUPP_CODE ) and ( T.TRAN_ID = P.TRAN_ID ) and " +"( S.SUPP_CODE = P.SUPP_CODE ) and ( T.TRAN_ID = P.TRAN_ID ) and "
+"( ( T.TRAN_CODE = ? ) AND ( P.SITE_CODE = ? ) AND " +"( ( T.TRAN_CODE = ? ) AND ( P.SITE_CODE = ? ) AND "
+"( P.TRAN_DATE between ? And ? ) AND ( P.SUPP_CODE >= ? And P.SUPP_CODE <= ? ) AND " +"( P.TRAN_DATE between ? And ? ) AND ( P.SUPP_CODE >= ? And P.SUPP_CODE <= ? ) AND "
...@@ -371,34 +375,37 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -371,34 +375,37 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" AND P.TRAN_SER = 'P-RET' )GROUP BY T.TRAN_CODE," +" AND P.TRAN_SER = 'P-RET' )GROUP BY T.TRAN_CODE,"
+" T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," +" T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+" T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +" T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,P.EXCISE_REF_DATE"; +"P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,P.EXCISE_REF_DATE,S.SUPP_TYPE,S.SUPP_CODE,P.SITE_CODE, P.TOT_AMT";
System.out.println("type:D::tranType:CLASS::refSer:P-RET---->Executed ");
} }
else if( refSer.equals("D-RCP")) else if( refSer.equals("D-RCP"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+"sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE," +"sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE,"
+"case when D.sundry_type = 'O' " +"case when D.sundry_type = 'O' "
+" then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end as sundry_code,C.GP_NO,C.GP_DATE" +" then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end as sundry_code,C.GP_NO,C.GP_DATE,"
+" FROM TAXTRAN A,TAX B,DISTORD_RCP C,DISTORDER D " +" DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT FROM TAXTRAN A,TAX B,DISTORD_RCP C,DISTORDER D "
+" WHERE ( B.TAX_CODE = A.TAX_CODE ) and( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and " +" WHERE ( B.TAX_CODE = A.TAX_CODE ) and( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and "
+" ( ( A.TRAN_CODE = ? ) AND( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND " +" ( ( A.TRAN_CODE = ? ) AND( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND "
+" ( case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end between " +" ( case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end between "
+" ? And ? ) AND ( A.TAX_CODE >= ? And A.TAX_CODE <= ? ) AND ( B.FORM_REQD = 'Y' ) AND " +" ? And ? ) AND ( A.TAX_CODE >= ? And A.TAX_CODE <= ? ) AND ( B.FORM_REQD = 'Y' ) AND "
+" ( A.TAX_CLASS is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " +" ( A.TAX_CLASS is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) "
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, " +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, "
+" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, " +" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, "
+" C.GP_NO,C.GP_DATE "; +" C.GP_NO,C.GP_DATE,D.SUNDRY_TYPE,D.SUNDRY_CODE,D.SITE_CODE, D.NET_AMT ";
System.out.println("type:D::tranType:CLASS::refSer:D-RCP---->Executed ");
} }
else if(refSer.equals("D-ISS")) else if(refSer.equals("D-ISS"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+"sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE," +"sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE,"
+"case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') " +"case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') "
+"end as sundry_code,C.GP_NO,C.GP_DATE " +"end as sundry_code,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT "
+" FROM TAXTRAN A,TAX B,DISTORD_ISS C,DISTORDER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and " +" FROM TAXTRAN A,TAX B,DISTORD_ISS C,DISTORDER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "
+" ( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and " +" ( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and "
+"( ( A.TRAN_CODE = ? ) AND ( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND " +"( ( A.TRAN_CODE = ? ) AND ( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND "
...@@ -407,14 +414,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -407,14 +414,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"( A.TAX_CLASS is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " +"( A.TAX_CLASS is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) "
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, " +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, "
+" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, " +" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, "
+" C.GP_NO, C.GP_DATE "; +" C.GP_NO, C.GP_DATE,D.SUNDRY_TYPE,D.SUNDRY_CODE,D.SITE_CODE, D.NET_AMT ";
System.out.println("type:D::tranType:CLASS::refSer:D-ISS---->Executed ");
} }
else if(refSer.equals("S-DSP")) else if(refSer.equals("S-DSP"))
{ {
getDataSql= "SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE , " getDataSql= "SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE , "
+"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,sum( A.TAX_AMT ) as tax_amt, " +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,sum( A.TAX_AMT ) as tax_amt, "
+"D.CUST_NAME,C.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE " +"D.CUST_NAME,C.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.TOT_VALUE as AMOUNT "
+" FROM TAX B,TAXTRAN A,DESPATCH C,CUSTOMER D " +" FROM TAX B,TAXTRAN A,DESPATCH C,CUSTOMER D "
+" WHERE ( A.TAX_CODE = B.TAX_CODE ) and ( A.TRAN_ID = C.DESP_ID ) " +" WHERE ( A.TAX_CODE = B.TAX_CODE ) and ( A.TRAN_ID = C.DESP_ID ) "
+" and ( C.CUST_CODE = D.CUST_CODE ) and " +" and ( C.CUST_CODE = D.CUST_CODE ) and "
...@@ -427,13 +436,14 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -427,13 +436,14 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) " +" ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) "
+" GROUP BY A.TRAN_CODE, A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM," +" GROUP BY A.TRAN_CODE, A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,"
+"A.TAX_FORM_DATE,A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT," +"A.TAX_FORM_DATE,A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,"
+"A.TAX_CODE,A.TAX_CHAP,C.DESP_DATE,C.CUST_CODE,D.CUST_NAME,C.GP_NO,C.GP_DATE"; +"A.TAX_CODE,A.TAX_CHAP,C.DESP_DATE,C.CUST_CODE,D.CUST_NAME,C.GP_NO,C.GP_DATE,D.CUST_TYPE,D.CUST_CODE,C.SITE_CODE,C.TOT_VALUE";
System.out.println("type:D::tranType:CLASS::refSer:S-DSP---->Executed ");
} }
else if(refSer.equals("S-INV")) else if(refSer.equals("S-INV"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,' ',' ' " +" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,' ',' ' ,DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT"
+" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and " +" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "
+" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and " +" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and "
+"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND " +"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND "
...@@ -443,8 +453,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -443,8 +453,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"( A.TAX_class is not null ) AND ( A.TAX_FORM is null OR " //Added by Jaimin 05/09/2007 +"( A.TAX_class is not null ) AND ( A.TAX_FORM is null OR " //Added by Jaimin 05/09/2007
+" A.TAX_FORM_DATE is null ) ) " +" A.TAX_FORM_DATE is null ) ) "
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" C.TRAN_DATE,C.CUST_CODE,D.CUST_NAME "; +" C.TRAN_DATE,C.CUST_CODE,D.CUST_NAME,D.CUST_TYPE,D.CUST_CODE,C.SITE_CODE, C.NET_AMT ";
System.out.println("type:D::tranType:CLASS::refSer:S-INV---->Executed ");
} }
else if (refSer.equals("VOUCH")) else if (refSer.equals("VOUCH"))
{ {
...@@ -452,7 +462,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -452,7 +462,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV" +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV"
+",TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +",TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+" SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE," +" SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,"
+" VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE" +" VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT"
+" FROM TAXTRAN,TAX,SUPPLIER,VOUCHER WHERE " +" FROM TAXTRAN,TAX,SUPPLIER,VOUCHER WHERE "
+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND " +"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND "
+" ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( VOUCHER.SITE_CODE = ? )" +" ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( VOUCHER.SITE_CODE = ? )"
...@@ -462,15 +472,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -462,15 +472,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX," +" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX,"
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV," +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV,"
+"TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP, SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE," +"TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP, SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,"
+"VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE"; +"VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,VOUCHER.SITE_CODE, VOUCHER.NET_AMT";
System.out.println("type:D::tranType:CLASS::refSer:VOUCH---->Executed ");
} }
else if (refSer.equals("M-VOUC")) else if (refSer.equals("M-VOUC"))
{ {
getDataSql = "SELECT taxtran.tran_code,taxtran.tran_id,taxtran.line_no,taxtran.line_no__tax,taxtran.tax_form," getDataSql = "SELECT taxtran.tran_code,taxtran.tran_id,taxtran.line_no,taxtran.line_no__tax,taxtran.tax_form,"
+" taxtran.tax_form_date,taxtran.tax_class,taxtran.tax_perc,taxtran.tax_env,taxtran.taxable_amt,taxtran.tax_code," +" taxtran.tax_form_date,taxtran.tax_class,taxtran.tax_perc,taxtran.tax_env,taxtran.taxable_amt,taxtran.tax_code,"
+" taxtran.tax_chap,sum(TAXTRAN.TAX_AMT) as tax_amt,FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE," +" taxtran.tax_chap,sum(TAXTRAN.TAX_AMT) as tax_amt,FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,"
+" MISC_VOUCHER.SUNDRY_CODE,' ') as sundry_name,misc_voucher.tran_date,misc_voucher.sundry_code," +" MISC_VOUCHER.SUNDRY_CODE,' ') as sundry_name,misc_voucher.tran_date,misc_voucher.sundry_code,"
+" misc_voucher.bill_no,misc_voucher.bill_date" +" misc_voucher.bill_no,misc_voucher.bill_date,DDF_GET_SUNDRY_DETAILS(misc_voucher.SUNDRY_TYPE,misc_voucher.SUNDRY_CODE) as CITY,misc_voucher.SITE_CODE,misc_voucher.NET_AMT"
+" FROM taxtran,tax,misc_voucher" +" FROM taxtran,tax,misc_voucher"
+" WHERE ( tax.tax_code = taxtran.tax_code ) and ( taxtran.tran_id = misc_voucher.tran_id ) and " +" WHERE ( tax.tax_code = taxtran.tax_code ) and ( taxtran.tran_id = misc_voucher.tran_id ) and "
+" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( misc_voucher.site_code = ? ) AND " +" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( misc_voucher.site_code = ? ) AND "
...@@ -482,7 +493,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -482,7 +493,8 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" GROUP BY taxtran.tran_code,taxtran.tran_id,taxtran.line_no,taxtran.line_no__tax,taxtran.tax_form," +" GROUP BY taxtran.tran_code,taxtran.tran_id,taxtran.line_no,taxtran.line_no__tax,taxtran.tax_form,"
+" taxtran.tax_form_date,taxtran.tax_class,taxtran.tax_perc,taxtran.tax_env,taxtran.taxable_amt,taxtran.tax_code," +" taxtran.tax_form_date,taxtran.tax_class,taxtran.tax_perc,taxtran.tax_env,taxtran.taxable_amt,taxtran.tax_code,"
+" taxtran.tax_chap,misc_voucher.tran_date,misc_voucher.sundry_code,misc_voucher.bill_no,misc_voucher.bill_date" +" taxtran.tax_chap,misc_voucher.tran_date,misc_voucher.sundry_code,misc_voucher.bill_no,misc_voucher.bill_date"
+" ,misc_voucher.sundry_type"; +" ,misc_voucher.sundry_type,misc_voucher.SUNDRY_CODE,misc_voucher.SITE_CODE,misc_voucher.NET_AMT";
System.out.println("type:D::tranType:CLASS::refSer:M-VOUC---->Executed ");
} }
}//end of ref ser }//end of ref ser
}//END OF CLASS }//END OF CLASS
...@@ -495,7 +507,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -495,7 +507,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"sum( T.TAX_AMT ) as tax_amt,C.CUST_NAME,S.TRAN_DATE,S.CUST_CODE," +"sum( T.TAX_AMT ) as tax_amt,C.CUST_NAME,S.TRAN_DATE,S.CUST_CODE,"
+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE FROM TAXTRAN T," +"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(C.CUST_TYPE,C.CUST_CODE) as CITY,S.SITE_CODE,S.NET_AMT FROM TAXTRAN T,"
+ "TAX T1,CUSTOMER C,SRETURN S " + "TAX T1,CUSTOMER C,SRETURN S "
+ "WHERE ( T1.TAX_CODE = T.TAX_CODE ) and ( C.CUST_CODE = S.CUST_CODE ) " + "WHERE ( T1.TAX_CODE = T.TAX_CODE ) and ( C.CUST_CODE = S.CUST_CODE ) "
+"and ( T.TRAN_ID = S.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) " +"and ( T.TRAN_ID = S.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) "
...@@ -509,14 +521,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -509,14 +521,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"GROUP BY T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM," +"GROUP BY T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,"
+"T.TAX_FORM_DATE,T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT," +"T.TAX_FORM_DATE,T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,"
+"T.TAX_CODE,T.TAX_CHAP,S.TRAN_DATE,S.CUST_CODE,C.CUST_NAME," +"T.TAX_CODE,T.TAX_CHAP,S.TRAN_DATE,S.CUST_CODE,C.CUST_NAME,"
+"S.EXCISE_REF_NO,S.EXCISE_REF_DATE"; +"S.EXCISE_REF_NO,S.EXCISE_REF_DATE,C.CUST_TYPE,C.CUST_CODE,S.SITE_CODE, S.NET_AMT";
System.out.println("type:D::tranType:CHAP::refSer:S-RET---->Executed ");
} }
else if( refSer.equals("P-RCP")) else if( refSer.equals("P-RCP"))
{ {
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE " +" sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE, "
+" FROM TAXTRAN T,TAX T1,PORCP P," +" DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE,P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P,"
+"SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and " +"SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and "
+"( S.SUPP_CODE = P.SUPP_CODE ) and " +"( S.SUPP_CODE = P.SUPP_CODE ) and "
+"( T.TRAN_ID = P.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) AND " +"( T.TRAN_ID = P.TRAN_ID ) and ( ( T.TRAN_CODE = ? ) AND "
...@@ -529,14 +543,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -529,14 +543,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," +"T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,"
+"T.TAX_CHAP,P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF," +"T.TAX_CHAP,P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,"
+"P.EXCISE_REF_DATE"; +"P.EXCISE_REF_DATE,S.SUPP_TYPE,S.SUPP_CODE,P.SITE_CODE, P.TOT_AMT";
System.out.println("type:D::tranType:CHAP::refSer:P-RCP---->Executed ");
} }
else if(refSer.equals("P-RET")) else if(refSer.equals("P-RET"))
{ {
getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," getDataSql="SELECT T.TRAN_CODE,T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +"T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE " +"sum( T.TAX_AMT ) as tax_amt,S.SUPP_NAME,P.TRAN_DATE,P.SUPP_CODE,P.EXCISE_REF,P.EXCISE_REF_DATE, "
+" FROM TAXTRAN T,TAX T1,PORCP P,SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and " +"DDF_GET_SUNDRY_DETAILS(S.SUPP_TYPE,S.SUPP_CODE) as CITY,P.SITE_CODE,P.TOT_AMT FROM TAXTRAN T,TAX T1,PORCP P,SUPPLIER S WHERE ( T1.TAX_CODE = T.TAX_CODE ) and "
+"( S.SUPP_CODE = P.SUPP_CODE ) and ( T.TRAN_ID = P.TRAN_ID ) and " +"( S.SUPP_CODE = P.SUPP_CODE ) and ( T.TRAN_ID = P.TRAN_ID ) and "
+"( ( T.TRAN_CODE = ? ) AND ( P.SITE_CODE = ? ) AND " +"( ( T.TRAN_CODE = ? ) AND ( P.SITE_CODE = ? ) AND "
+"( P.TRAN_DATE between ? And ? ) AND ( P.SUPP_CODE >= ? And P.SUPP_CODE <= ? ) AND " +"( P.TRAN_DATE between ? And ? ) AND ( P.SUPP_CODE >= ? And P.SUPP_CODE <= ? ) AND "
...@@ -546,17 +562,19 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -546,17 +562,19 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" AND P.TRAN_SER = 'P-RET' )GROUP BY T.TRAN_CODE," +" AND P.TRAN_SER = 'P-RET' )GROUP BY T.TRAN_CODE,"
+" T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE," +" T.TRAN_ID,T.LINE_NO,T.LINE_NO__TAX,T.TAX_FORM,T.TAX_FORM_DATE,"
+" T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP," +" T.TAX_CLASS,T.TAX_PERC,T.TAX_ENV,T.TAXABLE_AMT,T.TAX_CODE,T.TAX_CHAP,"
+"P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,P.EXCISE_REF_DATE"; +"P.TRAN_DATE,P.SUPP_CODE,S.SUPP_NAME,P.EXCISE_REF,P.EXCISE_REF_DATE,S.SUPP_TYPE,S.SUPP_CODE,P.SITE_CODE, P.TOT_AMT";
System.out.println("type:D::tranType:CHAP::refSer:P-RET---->Executed ");
} }
else if( refSer.equals("D-RCP")) else if( refSer.equals("D-RCP"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +"A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE," +" sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE,"
+" case when D.sundry_type = 'O' " +" case when D.sundry_type = 'O' "
+" then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end as sundry_code,C.GP_NO,C.GP_DATE" +" then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end as sundry_code,C.GP_NO,C.GP_DATE,"
+" FROM TAXTRAN A,TAX B,DISTORD_RCP C,DISTORDER D " +" DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT,A.TRAN_CODE FROM TAXTRAN A,TAX B,DISTORD_RCP C,DISTORDER D "
+" WHERE ( B.TAX_CODE = A.TAX_CODE ) and( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and " +" WHERE ( B.TAX_CODE = A.TAX_CODE ) and( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and "
+" ( ( A.TRAN_CODE = ? ) AND( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND " +" ( ( A.TRAN_CODE = ? ) AND( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND "
+" ( case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end between " +" ( case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') end between "
...@@ -565,15 +583,18 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -565,15 +583,18 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" ( A.TAX_CHAP is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " //Added by Jaimin 05/09/2007 +" ( A.TAX_CHAP is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " //Added by Jaimin 05/09/2007
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, " +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, "
+" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, " +" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, "
+" C.GP_NO,C.GP_DATE "; +" C.GP_NO,C.GP_DATE,D.SUNDRY_TYPE,D.SUNDRY_CODE,D.SITE_CODE, D.NET_AMT ";
System.out.println("type:D::tranType:CHAP::refSer:D-RCP---->Executed ");
} }
else if( refSer.equals("D-ISS")) else if( refSer.equals("D-ISS"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE," +" sum( A.TAX_AMT ) as tax_amt,case when D.sundry_type = 'O' then '0' else " +"fn_get_sundry(A.TRAN_CODE,C.dist_order,'N') end as sundry_name,C.TRAN_DATE,"
+" case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') " +" case when D.sundry_type = 'O' then '0' else fn_get_sundry(A.TRAN_CODE,C.dist_order,'C') "
+" end as sundry_code,C.GP_NO,C.GP_DATE " +" end as sundry_code,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.SUNDRY_TYPE,D.SUNDRY_CODE) as CITY,D.SITE_CODE, D.NET_AMT "
+" FROM TAXTRAN A,TAX B,DISTORD_ISS C,DISTORDER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and " +" FROM TAXTRAN A,TAX B,DISTORD_ISS C,DISTORDER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "
+" ( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and " +" ( A.TRAN_ID = C.TRAN_ID ) and ( C.DIST_ORDER = D.DIST_ORDER ) and "
+"( ( A.TRAN_CODE = ? ) AND ( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND " +"( ( A.TRAN_CODE = ? ) AND ( C.site_code = ? ) AND ( C.tran_date between ? And ? ) AND "
...@@ -583,13 +604,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -583,13 +604,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"( A.TAX_CHAP is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " //Added by Jaimin 05/09/2007 +"( A.TAX_CHAP is not null ) AND ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " //Added by Jaimin 05/09/2007
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, " +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,A.TAX_CLASS, "
+" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, " +" A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,C.TRAN_DATE,D.SUNDRY_TYPE,C.DIST_ORDER, "
+" C.GP_NO, C.GP_DATE "; +" C.GP_NO, C.GP_DATE,D.SUNDRY_TYPE,D.SUNDRY_CODE,D.SITE_CODE, D.NET_AMT ";
System.out.println("type:D::tranType:CHAP::refSer:D-ISS---->Executed ");
} }
else if( refSer.equals("S-DSP")) else if( refSer.equals("S-DSP"))
{ {
getDataSql= "SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,sum( A.TAX_AMT ) as tax_amt," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,sum( A.TAX_AMT ) as tax_amt,"
+ " D.CUST_NAME,C.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE " + " D.CUST_NAME,C.DESP_DATE,C.CUST_CODE,C.GP_NO,C.GP_DATE,DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.TOT_VALUE as AMOUNT "
+" FROM TAX B,TAXTRAN A,DESPATCH C,CUSTOMER D " +" FROM TAX B,TAXTRAN A,DESPATCH C,CUSTOMER D "
+" WHERE ( A.TAX_CODE = B.TAX_CODE ) and ( A.TRAN_ID = C.DESP_ID ) " +" WHERE ( A.TAX_CODE = B.TAX_CODE ) and ( A.TRAN_ID = C.DESP_ID ) "
+" and ( C.CUST_CODE = D.CUST_CODE ) and " +" and ( C.CUST_CODE = D.CUST_CODE ) and "
...@@ -601,15 +625,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -601,15 +625,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) " +" ( A.TAX_FORM is null OR A.TAX_FORM_DATE is null ) ) "
+" GROUP BY A.TRAN_CODE, A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM," +" GROUP BY A.TRAN_CODE, A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,"
+"A.TAX_FORM_DATE,A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT," +"A.TAX_FORM_DATE,A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,"
+"A.TAX_CODE,A.TAX_CHAP,C.DESP_DATE,C.CUST_CODE,D.CUST_NAME,C.GP_NO,C.GP_DATE"; +"A.TAX_CODE,A.TAX_CHAP,C.DESP_DATE,C.CUST_CODE,D.CUST_NAME,C.GP_NO,C.GP_DATE,D.CUST_TYPE,D.CUST_CODE,C.SITE_CODE,C.TOT_VALUE";
System.out.println("type:D::tranType:CHAP::refSer:S-DSP---->Executed ");
} }
else if( refSer.equals("S-INV")) else if( refSer.equals("S-INV"))
{ {
getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," getDataSql="SELECT A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,' ',' ' " +" sum( A.TAX_AMT ) as tax_amt,D.CUST_NAME,C.TRAN_DATE,C.CUST_CODE,' ',' ',DDF_GET_SUNDRY_DETAILS(D.CUST_TYPE,D.CUST_CODE) as CITY,C.SITE_CODE,C.NET_AMT "
+" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and " +" FROM TAXTRAN A,TAX B,INVOICE C,CUSTOMER D WHERE ( B.TAX_CODE = A.TAX_CODE ) and "
+" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and " +" ( A.TRAN_ID = C.INVOICE_ID ) and ( C.CUST_CODE = D.CUST_CODE ) and "
+"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND " +"( ( A.TRAN_CODE =? ) AND ( C.site_code = ? ) AND "
...@@ -619,7 +644,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -619,7 +644,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" A.TAX_FORM_DATE is null ) ) " +" A.TAX_FORM_DATE is null ) ) "
+" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE," +" GROUP BY A.TRAN_CODE,A.TRAN_ID,A.LINE_NO,A.LINE_NO__TAX,A.TAX_FORM,A.TAX_FORM_DATE,"
+" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP," +" A.TAX_CLASS,A.TAX_PERC,A.TAX_ENV,A.TAXABLE_AMT,A.TAX_CODE,A.TAX_CHAP,"
+" C.TRAN_DATE,C.CUST_CODE,D.CUST_NAME "; +" C.TRAN_DATE,C.CUST_CODE,D.CUST_NAME,D.CUST_TYPE,D.CUST_CODE,C.SITE_CODE, C.NET_AMT ";
System.out.println("type:D::tranType:CHAP::refSer:S-INV---->Executed ");
} }
else if (refSer.equals("VOUCH")) else if (refSer.equals("VOUCH"))
{ {
...@@ -627,7 +654,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -627,7 +654,7 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC," +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,"
+"TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE," +"TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,"
+"TAXTRAN.TAX_CHAP,SUM( TAXTRAN.TAX_AMT) AS TAX_AMT," +"TAXTRAN.TAX_CHAP,SUM( TAXTRAN.TAX_AMT) AS TAX_AMT,"
+"SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE " +"SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT "
+" FROM TAX,TAXTRAN,SUPPLIER,VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND " +" FROM TAX,TAXTRAN,SUPPLIER,VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND "
+"( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID )" +"( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID )"
+"AND ( ( TAXTRAN.TRAN_CODE = ? ) AND (VOUCHER.SITE_CODE = ? ) AND " +"AND ( ( TAXTRAN.TRAN_CODE = ? ) AND (VOUCHER.SITE_CODE = ? ) AND "
...@@ -638,17 +665,19 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -638,17 +665,19 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," +" TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE," +"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,"
+" TAXTRAN.TAX_CHAP,SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE," +" TAXTRAN.TAX_CHAP,SUPPLIER.SUPP_NAME,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,"
+" VOUCHER.BILL_NO,VOUCHER.BILL_DATE "; +" VOUCHER.BILL_NO,VOUCHER.BILL_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,VOUCHER.SITE_CODE, VOUCHER.NET_AMT ";
System.out.println("type:D::tranType:CHAP::refSer:VOUCH---->Executed ");
} }
else if (refSer.equals("M-VOUC")) else if (refSer.equals("M-VOUC"))
{ {
getDataSql =" SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX," getDataSql =" SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.LINE_NO,TAXTRAN.LINE_NO__TAX,"
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC," +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_PERC,"
+"TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP," +"TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,TAXTRAN.TAX_CHAP,"
+" SUM(TAXTRAN.TAX_AMT) AS TAX_AMT," +" SUM(TAXTRAN.TAX_AMT) AS TAX_AMT,"
+" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME," +" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME,"
+"MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE," +"MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE,"
+"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE" +"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT"
+" FROM TAX,TAXTRAN,MISC_VOUCHER WHERE" +" FROM TAX,TAXTRAN,MISC_VOUCHER WHERE"
+" ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND" +" ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND"
+"( ( TAXTRAN.TRAN_CODE = ? ) AND (MISC_VOUCHER.SITE_CODE = ? ) AND " +"( ( TAXTRAN.TRAN_CODE = ? ) AND (MISC_VOUCHER.SITE_CODE = ? ) AND "
...@@ -661,7 +690,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -661,7 +690,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE," +" TAXTRAN.TAX_PERC,TAXTRAN.TAX_ENV,TAXTRAN.TAXABLE_AMT,TAXTRAN.TAX_CODE,"
+" TAXTRAN.TAX_CHAP,MISC_VOUCHER.TRAN_DATE, MISC_VOUCHER.SUNDRY_CODE," +" TAXTRAN.TAX_CHAP,MISC_VOUCHER.TRAN_DATE, MISC_VOUCHER.SUNDRY_CODE,"
+" MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE" +" MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE"
+",MISC_VOUCHER.SUNDRY_TYPE"; +",MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,MISC_VOUCHER.SITE_CODE, MISC_VOUCHER.NET_AMT";
System.out.println("type:D::tranType:CHAP::refSer:M-VOUC---->Executed ");
} }
//end of inner else if //end of inner else if
} //NOT NULL } //NOT NULL
...@@ -749,6 +780,38 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -749,6 +780,38 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
{ {
retTabSepStrBuff.append(" ").append("\t"); retTabSepStrBuff.append(" ").append("\t");
} }
//added by chandrakant patil start 29 March
//CITY
//
//if( (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")) || (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")))
//{
String str=rs1.getString(19)==null?" ":rs1.getString(19);
if (str.equalsIgnoreCase(null) || str.equalsIgnoreCase(" ") || str.equalsIgnoreCase(""))
{
retTabSepStrBuff.append(" ").append("\t");
}
else
{
String strArr[] = str.split("~n");
retTabSepStrBuff.append((strArr[4]==null?" ":strArr[4])).append("\t");
}
/* }
else
{
retTabSepStrBuff.append((rs1.getString(19)==null?" ":rs1.getString(19))).append("\t");
}
*/
//SITE CODE
retTabSepStrBuff.append((rs1.getString(20)==null?" ":rs1.getString(20))).append("\t");
//NET AMOUNT
retTabSepStrBuff.append((rs1.getString(21)==null?" ":rs1.getString(21))).append("\t");
//chandrakant Finish
retTabSepStrBuff.append("\n"); retTabSepStrBuff.append("\n");
count++; count++;
System.out.println("#####Counter"+count); System.out.println("#####Counter"+count);
...@@ -782,64 +845,74 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -782,64 +845,74 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +"TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE FROM TAXTRAN,TAX,CUSTOMER,SRETURN WHERE " +"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,SRETURN.SITE_CODE,SRETURN.NET_AMT FROM TAXTRAN,TAX,CUSTOMER,SRETURN WHERE "
+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND " +"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND "
+"( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( SRETURN.SITE_CODE = ? ) AND" +"( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( SRETURN.SITE_CODE = ? ) AND"
+" ( SRETURN.TRAN_DATE BETWEEN ? AND ? ) AND ( SRETURN.CUST_CODE BETWEEN ? AND ? ) AND " +" ( SRETURN.TRAN_DATE BETWEEN ? AND ? ) AND ( SRETURN.CUST_CODE BETWEEN ? AND ? ) AND "
+"( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL )" +"( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL )"
+" AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+"GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV," +"GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,"
+"SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE"; +"SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,SRETURN.SITE_CODE, SRETURN.NET_AMT";
System.out.println("type:S::tranType:CLASS::refSer:S-RET---->Executed ");
} }
else if (refSer.equals("P-RCP")) else if (refSer.equals("P-RCP"))
{ {
getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV, PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,sum( TAXTRAN.TAX_AMT ) as tax_amt," +"TAXTRAN.TAX_ENV, PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,sum( TAXTRAN.TAX_AMT ) as tax_amt,"
+"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE FROM TAXTRAN,TAX,PORCP,SUPPLIER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) " +"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,PORCP.SITE_CODE,PORCP.TOT_AMT FROM TAXTRAN,TAX,PORCP,SUPPLIER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) "
+"AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND " +"AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND "
+"( ( TAXTRAN.TRAN_CODE = ? ) AND ( PORCP.SITE_CODE = ? ) AND ( PORCP.TRAN_DATE BETWEEN ? AND ? ) AND " +"( ( TAXTRAN.TRAN_CODE = ? ) AND ( PORCP.SITE_CODE = ? ) AND ( PORCP.TRAN_DATE BETWEEN ? AND ? ) AND "
+"( PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) " +"( PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) "
+"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR " +"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR "
+" TAXTRAN.TAX_FORM_DATE IS NULL ) AND PORCP.TRAN_SER = 'P-RCP' ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID," +" TAXTRAN.TAX_FORM_DATE IS NULL ) AND PORCP.TRAN_SER = 'P-RCP' ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,"
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME," +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,"
+"PORCP.EXCISE_REF, PORCP.EXCISE_REF_DATE "; +"PORCP.EXCISE_REF, PORCP.EXCISE_REF_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,PORCP.SITE_CODE, PORCP.TOT_AMT ";
System.out.println("type:S::tranType:CLASS::refSer:P-RCP---->Executed ");
} }
else if (refSer.equals("P-RET")) else if (refSer.equals("P-RET"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +"TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE FROM TAXTRAN,TAX,PORCP,SUPPLIER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE )" +"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,PORCP.SITE_CODE,PORCP.TOT_AMT FROM TAXTRAN,TAX,PORCP,SUPPLIER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE )"
+" AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND" +" AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND"
+" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( PORCP.SITE_CODE = ?) AND ( PORCP.TRAN_DATE BETWEEN ? AND ? )" +" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( PORCP.SITE_CODE = ?) AND ( PORCP.TRAN_DATE BETWEEN ? AND ? )"
+"AND ( PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? )" +"AND ( PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? )"
+" AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR" +" AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR"
+" TAXTRAN.TAX_FORM_DATE IS NULL ) AND PORCP.TRAN_SER = 'P-RET' ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID," +" TAXTRAN.TAX_FORM_DATE IS NULL ) AND PORCP.TRAN_SER = 'P-RET' ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,"
+" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE, " +" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE, "
+"PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE"; +"PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,PORCP.SITE_CODE, PORCP.TOT_AMT";
System.out.println("type:S::tranType:CLASS::refSer:P-RET---->Executed ");
} }
else if (refSer.equals("D-RCP")) else if (refSer.equals("D-RCP"))
{ {
System.out.println("2nd executed");
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE, " +"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE, "
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END AS SUNDRY_CODE, " +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END AS SUNDRY_CODE, "
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'N') END AS SUNDRY_NAME, " +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'N') END AS SUNDRY_NAME, "
+" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE FROM TAXTRAN,TAX,DISTORD_RCP,DISTORDER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND" +" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE,DDF_GET_SUNDRY_DETAILS(DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE) as CITY,"
+"( TAXTRAN.TRAN_ID = DISTORD_RCP.TRAN_ID ) AND ( DISTORD_RCP.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( ( TAXTRAN.TRAN_CODE = ? )" +" DISTORDER.SITE_CODE, DISTORDER.NET_AMT FROM TAXTRAN,TAX,DISTORD_RCP,DISTORDER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND "
+" AND ( DISTORD_RCP.SITE_CODE = ? ) AND ( DISTORD_RCP.TRAN_DATE BETWEEN ? AND ? ) AND" +" ( TAXTRAN.TRAN_ID = DISTORD_RCP.TRAN_ID ) AND ( DISTORD_RCP.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( ( TAXTRAN.TRAN_CODE = ? )"
+" ( CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END BETWEEN ? AND ? )" +" AND ( DISTORD_RCP.SITE_CODE = ? ) AND ( DISTORD_RCP.TRAN_DATE BETWEEN ? AND ? ) AND"
+" AND( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND" +" ( CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END BETWEEN ? AND ? )"
+" ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" AND( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND"
+" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID, TAXTRAN.TAX_FORM, TAXTRAN.TAX_FORM_DATE, TAXTRAN.TAX_CLASS," +" ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE,DISTORDER.SUNDRY_TYPE, DISTORD_RCP.DIST_ORDER, DISTORD_RCP.GP_NO," +" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID, TAXTRAN.TAX_FORM, TAXTRAN.TAX_FORM_DATE, TAXTRAN.TAX_CLASS,"
+"DISTORD_RCP.GP_DATE"; +"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE,DISTORDER.SUNDRY_TYPE, DISTORD_RCP.DIST_ORDER, DISTORD_RCP.GP_NO,DISTORDER.SITE_CODE, D.NET_AMT"
+"DISTORD_RCP.GP_DATE,DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE,DISTORDER.SITE_CODE, DISTORDER.NET_AMT";
System.out.println("type:S::tranType:CLASS::refSer:D-RCP---->Executed ");
} }
else if (refSer.equals("D-ISS")) else if (refSer.equals("D-ISS"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE," +"TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE,"
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C') END AS SUNDRY_CODE," +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C') END AS SUNDRY_CODE,"
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'N') END AS SUNDRY_NAME," +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'N') END AS SUNDRY_NAME,"
+" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE FROM TAXTRAN,TAX,DISTORD_ISS,DISTORDER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE )" +" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE,DDF_GET_SUNDRY_DETAILS(DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE) as CITY,DISTORDER.SITE_CODE, DISTORDER.NET_AMT FROM TAXTRAN,TAX,DISTORD_ISS,DISTORDER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE )"
+" AND ( TAXTRAN.TRAN_ID = DISTORD_ISS.TRAN_ID ) AND ( DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND" +" AND ( TAXTRAN.TRAN_ID = DISTORD_ISS.TRAN_ID ) AND ( DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND"
+" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( DISTORD_ISS.SITE_CODE = ? ) AND" +" ( ( TAXTRAN.TRAN_CODE = ? ) AND ( DISTORD_ISS.SITE_CODE = ? ) AND"
+" ( DISTORD_ISS.TRAN_DATE BETWEEN ? AND ? ) AND " +" ( DISTORD_ISS.TRAN_DATE BETWEEN ? AND ? ) AND "
...@@ -847,27 +920,30 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -847,27 +920,30 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL )" +" AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL )"
+" AND( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE," +" AND( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,"
+" TAXTRAN.TRAN_ID, TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE," +" TAXTRAN.TRAN_ID, TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE,"
+"DISTORDER.SUNDRY_TYPE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.GP_NO, DISTORD_ISS.GP_DATE"; +"DISTORDER.SUNDRY_TYPE,DISTORD_ISS.DIST_ORDER,DISTORD_ISS.GP_NO, DISTORD_ISS.GP_DATE,DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE,DISTORDER.SITE_CODE,DISTORDER.NET_AMT";
System.out.println("type:S::tranType:CLASS::refSer:D-ISS---->Executed ");
} }
else if (refSer.equals("S-DSP")) else if (refSer.equals("S-DSP"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DESPATCH.DESP_DATE,DESPATCH.CUST_CODE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DESPATCH.DESP_DATE,DESPATCH.CUST_CODE,"
+"CUSTOMER.CUST_NAME, SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DESPATCH.GP_NO," +"CUSTOMER.CUST_NAME, SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DESPATCH.GP_NO,"
+"DESPATCH.GP_DATE FROM TAXTRAN,TAX,DESPATCH,CUSTOMER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND" +"DESPATCH.GP_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,DESPATCH.SITE_CODE,DESPATCH.TOT_VALUE as AMOUNT FROM TAXTRAN,TAX,DESPATCH,CUSTOMER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND"
+" ( TAXTRAN.TRAN_ID = DESPATCH.DESP_ID ) AND ( DESPATCH.CUST_CODE = CUSTOMER.CUST_CODE ) AND " +" ( TAXTRAN.TRAN_ID = DESPATCH.DESP_ID ) AND ( DESPATCH.CUST_CODE = CUSTOMER.CUST_CODE ) AND "
+"( ( TAXTRAN.TRAN_CODE = ? ) AND ( DESPATCH.SITE_CODE = ? ) AND " +"( ( TAXTRAN.TRAN_CODE = ? ) AND ( DESPATCH.SITE_CODE = ? ) AND "
+"( DESPATCH.DESP_DATE BETWEEN ? AND ? ) AND ( DESPATCH.CUST_CODE BETWEEN ? AND ? ) AND" +"( DESPATCH.DESP_DATE BETWEEN ? AND ? ) AND ( DESPATCH.CUST_CODE BETWEEN ? AND ? ) AND"
+" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND" +" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND"
+" ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV," +" GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,"
+"DESPATCH.DESP_DATE,DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,DESPATCH.GP_NO,DESPATCH.GP_DATE"; +"DESPATCH.DESP_DATE,DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,DESPATCH.GP_NO,DESPATCH.GP_DATE,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,DESPATCH.SITE_CODE,DESPATCH.TOT_VALUE";
System.out.println("type:S::tranType:CLASS::refSer:S-DSP---->Executed ");
} }
else if (refSer.equals("S-INV")) else if (refSer.equals("S-INV"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT, ' ' ,' ' " +"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT, ' ' ,' ',"
+" FROM TAXTRAN,TAX,INVOICE,CUSTOMER WHERE " +"DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,INVOICE.SITE_CODE,INVOICE.NET_AMT FROM TAXTRAN,TAX,INVOICE,CUSTOMER WHERE "
+"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = INVOICE.INVOICE_ID )" +"( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = INVOICE.INVOICE_ID )"
+" AND ( INVOICE.CUST_CODE = CUSTOMER.CUST_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND" +" AND ( INVOICE.CUST_CODE = CUSTOMER.CUST_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND"
+" ( INVOICE.SITE_CODE = ? ) AND ( INVOICE.TRAN_DATE BETWEEN ? AND ? ) AND " +" ( INVOICE.SITE_CODE = ? ) AND ( INVOICE.TRAN_DATE BETWEEN ? AND ? ) AND "
...@@ -875,13 +951,15 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -875,13 +951,15 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR " +"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR "
+"TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM," +"TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,"
+"TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE," +"TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,"
+"INVOICE.CUST_CODE,CUSTOMER.CUST_NAME "; +"INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,INVOICE.SITE_CODE, INVOICE.NET_AMT ";
System.out.println("type:S::tranType:CLASS::refSer:S-INV---->Executed ");
} }
else if (refSer.equals("VOUCH")) else if (refSer.equals("VOUCH"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME," +"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME,"
+" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE " +" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT "
+" FROM TAXTRAN,TAX,SUPPLIER,VOUCHER" +" FROM TAXTRAN,TAX,SUPPLIER,VOUCHER"
+" WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND " +" WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND "
+"( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND " +"( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
...@@ -890,14 +968,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -890,14 +968,16 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR " +"AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CLASS IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR "
+"TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID," +"TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,"
+"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV," +"TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,"
+"VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME,VOUCHER.BILL_NO,VOUCHER.BILL_DATE"; +"VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,VOUCHER.SITE_CODE, VOUCHER.NET_AMT";
System.out.println("type:S::tranType:CLASS::refSer:VOUCH---->Executed ");
} }
else if (refSer.equals("M-VOUC")) else if (refSer.equals("M-VOUC"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE," +"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE,"
+" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME," +" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME,"
+" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE " +" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT "
+" FROM TAXTRAN,TAX,MISC_VOUCHER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND " +" FROM TAXTRAN,TAX,MISC_VOUCHER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND "
+"( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND " +"( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
+" ( MISC_VOUCHER.SITE_CODE = ? ) AND ( MISC_VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND " +" ( MISC_VOUCHER.SITE_CODE = ? ) AND ( MISC_VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND "
...@@ -907,7 +987,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -907,7 +987,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM," +" TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,"
+"TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE," +"TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,"
+" MISC_VOUCHER.SUNDRY_CODE," +" MISC_VOUCHER.SUNDRY_CODE,"
+"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,MISC_VOUCHER.SUNDRY_TYPE" ; +"MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,MISC_VOUCHER.SITE_CODE, MISC_VOUCHER.NET_AMT" ;
System.out.println("type:S::tranType:CLASS::refSer:M-VOUC---->Executed ");
} }
} }
} }
...@@ -919,100 +1001,115 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -919,100 +1001,115 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS" getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS"
+",TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +",TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE FROM TAX,TAXTRAN,CUSTOMER,SRETURN WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE )" +"SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,SRETURN.SITE_CODE,SRETURN.NET_AMT FROM TAX,TAXTRAN,CUSTOMER,SRETURN WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE )"
+" AND ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND ( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? )" +" AND ( CUSTOMER.CUST_CODE = SRETURN.CUST_CODE ) AND ( TAXTRAN.TRAN_ID = SRETURN.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? )"
+" AND (SRETURN.SITE_CODE = ? ) AND (SRETURN.TRAN_DATE BETWEEN ? AND ? ) AND " +" AND (SRETURN.SITE_CODE = ? ) AND (SRETURN.TRAN_DATE BETWEEN ? AND ? ) AND "
+"(SRETURN.CUST_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND" +"(SRETURN.CUST_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND"
+" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+" GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE," +" GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,SRETURN.TRAN_DATE,SRETURN.CUST_CODE,"
+"CUSTOMER.CUST_NAME,SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE"; +"CUSTOMER.CUST_NAME,SRETURN.EXCISE_REF_NO,SRETURN.EXCISE_REF_DATE,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,SRETURN.SITE_CODE, SRETURN.NET_AMT";
System.out.println("type:S::tranType:CHAP::refSer:S-RET---->Executed ");
} }
else if (refSer.equals("P-RCP")) else if (refSer.equals("P-RCP"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE ,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +"TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE ,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE FROM TAX,TAXTRAN,PORCP,SUPPLIER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND" +"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,PORCP.SITE_CODE,PORCP.TOT_AMT FROM TAX,TAXTRAN,PORCP,SUPPLIER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND"
+" ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND" +" ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND"
+" (PORCP.SITE_CODE = ? ) AND (PORCP.TRAN_DATE BETWEEN ? AND ? ) AND" +" (PORCP.SITE_CODE = ? ) AND (PORCP.TRAN_DATE BETWEEN ? AND ? ) AND"
+" (PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND" +" (PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND"
+" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL" +" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL"
+" OR TAXTRAN.TAX_FORM_DATE IS NULL ) AND (PORCP.TRAN_SER = 'P-RCP')) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID," +" OR TAXTRAN.TAX_FORM_DATE IS NULL ) AND (PORCP.TRAN_SER = 'P-RCP')) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,"
+" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME," +" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,"
+" PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE"; +" PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,PORCP.SITE_CODE, PORCP.TOT_AMT";
System.out.println("type:S::tranType:CHAP::refSer:P-RCP---->Executed ");
} }
else if (refSer.equals("P-RET")) else if (refSer.equals("P-RET"))
{ {
getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV, PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT," +"TAXTRAN.TAX_ENV, PORCP.TRAN_DATE,PORCP.SUPP_CODE,SUPPLIER.SUPP_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,"
+"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE FROM TAX,TAXTRAN,PORCP,SUPPLIER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND" +"PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,PORCP.SITE_CODE,PORCP.TOT_AMT FROM TAX,TAXTRAN,PORCP,SUPPLIER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND"
+" ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND " +" ( TAXTRAN.TRAN_ID = PORCP.TRAN_ID ) AND ( SUPPLIER.SUPP_CODE = PORCP.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
+"(PORCP.SITE_CODE = ? ) AND (PORCP.TRAN_DATE BETWEEN ? AND ? ) AND" +"(PORCP.SITE_CODE = ? ) AND (PORCP.TRAN_DATE BETWEEN ? AND ? ) AND"
+" (PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND" +" (PORCP.SUPP_CODE BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND"
+" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR" +" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR"
+" TAXTRAN.TAX_FORM_DATE IS NULL ) AND (PORCP.TRAN_SER = 'P-RET')) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM," +" TAXTRAN.TAX_FORM_DATE IS NULL ) AND (PORCP.TRAN_SER = 'P-RET')) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,"
+" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE," +" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,PORCP.TRAN_DATE,PORCP.SUPP_CODE,"
+"SUPPLIER.SUPP_NAME, PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE"; +"SUPPLIER.SUPP_NAME, PORCP.EXCISE_REF,PORCP.EXCISE_REF_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,PORCP.SITE_CODE, PORCP.TOT_AMT";
System.out.println("type:S::tranType:CHAP::refSer:P-RET---->Executed ");
} }
else if (refSer.equals("D-RCP")) else if (refSer.equals("D-RCP"))
{ {
System.out.println("4th executed");
getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE," +"TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE,"
+" CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END AS SUNDRY_CODE," +" CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END AS SUNDRY_CODE,"
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'N') END AS SUNDRY_NAME," +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'N') END AS SUNDRY_NAME,"
+" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE FROM TAX,TAXTRAN,DISTORD_RCP,DISTORDER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND" +" SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE,DDF_GET_SUNDRY_DETAILS(DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE) as CITY,DISTORDER.SITE_CODE, DISTORDER.NET_AMT FROM TAX,TAXTRAN,DISTORD_RCP,DISTORDER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND"
+" ( TAXTRAN.TRAN_ID = DISTORD_RCP.TRAN_ID ) AND ( DISTORD_RCP.DIST_ORDER = DISTORDER.DIST_ORDER ) AND" +" ( TAXTRAN.TRAN_ID = DISTORD_RCP.TRAN_ID ) AND ( DISTORD_RCP.DIST_ORDER = DISTORDER.DIST_ORDER ) AND"
+" ( ( TAXTRAN.TRAN_CODE = ? ) AND (DISTORD_RCP.SITE_CODE = ? ) AND (DISTORD_RCP.TRAN_DATE BETWEEN ? AND ? ) AND" +" ( ( TAXTRAN.TRAN_CODE = ? ) AND (DISTORD_RCP.SITE_CODE = ? ) AND (DISTORD_RCP.TRAN_DATE BETWEEN ? AND ? ) AND"
+" (CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END BETWEEN ? AND ?) AND" +" (CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_RCP.DIST_ORDER,'C') END BETWEEN ? AND ?) AND"
+" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND" +" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND"
+" ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID," +" ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE, TAXTRAN.TRAN_ID,"
+" TAXTRAN.TAX_FORM, TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE," +" TAXTRAN.TAX_FORM, TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,DISTORD_RCP.TRAN_DATE,"
+" DISTORDER.SUNDRY_TYPE,DISTORD_RCP.DIST_ORDER,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE"; +" DISTORDER.SUNDRY_TYPE,DISTORD_RCP.DIST_ORDER,DISTORD_RCP.GP_NO,DISTORD_RCP.GP_DATE,DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE,DISTORDER.SITE_CODE, DISTORDER.NET_AMT";
System.out.println("type:S::tranType:CHAP::refSer:D-RCP---->Executed ");
} }
else if (refSer.equals("D-ISS")) else if (refSer.equals("D-ISS"))
{ {
getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = " SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE," +"TAXTRAN.TAX_ENV,DISTORD_ISS.TRAN_DATE,"
+"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C') END AS SUNDRY_CODE," +"CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C') END AS SUNDRY_CODE,"
+" CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'N') END AS SUNDRY_NAME," +" CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'N') END AS SUNDRY_NAME,"
+"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE FROM TAX,TAXTRAN,DISTORD_ISS,DISTORDER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND" +"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE,DDF_GET_SUNDRY_DETAILS(DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE) as CITY,DISTORDER.SITE_CODE, DISTORDER.NET_AMT FROM TAX,TAXTRAN,DISTORD_ISS,DISTORDER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND"
+" ( TAXTRAN.TRAN_ID = DISTORD_ISS.TRAN_ID ) AND ( DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND" +" ( TAXTRAN.TRAN_ID = DISTORD_ISS.TRAN_ID ) AND ( DISTORD_ISS.DIST_ORDER = DISTORDER.DIST_ORDER ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND"
+" (DISTORD_ISS.SITE_CODE = ? ) AND (DISTORD_ISS.TRAN_DATE BETWEEN ? AND ? ) AND" +" (DISTORD_ISS.SITE_CODE = ? ) AND (DISTORD_ISS.TRAN_DATE BETWEEN ? AND ? ) AND"
+" (CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C')" +" (CASE WHEN DISTORDER.SUNDRY_TYPE = 'O' THEN '0' ELSE FN_GET_SUNDRY(TAXTRAN.TRAN_CODE,DISTORD_ISS.DIST_ORDER,'C')"
+" END BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ?) AND" +" END BETWEEN ? AND ? ) AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ?) AND"
+" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+" GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV," +" GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,"
+" DISTORD_ISS.TRAN_DATE,DISTORDER.SUNDRY_TYPE, DISTORD_ISS.DIST_ORDER, DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE"; +" DISTORD_ISS.TRAN_DATE,DISTORDER.SUNDRY_TYPE, DISTORD_ISS.DIST_ORDER, DISTORD_ISS.GP_NO,DISTORD_ISS.GP_DATE,DISTORDER.SUNDRY_TYPE,DISTORDER.SUNDRY_CODE,DISTORDER.SITE_CODE, DISTORDER.NET_AMT";
System.out.println("type:S::tranType:CHAP::refSer:D-ISS---->Executed ");
} }
else if (refSer.equals("S-DSP")) else if (refSer.equals("S-DSP"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,DESPATCH.DESP_DATE," +"TAXTRAN.TAX_ENV,DESPATCH.DESP_DATE,"
+"DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DESPATCH.GP_NO,DESPATCH.GP_DATE FROM TAX, TAXTRAN,DESPATCH,CUSTOMER WHERE" +"DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,DESPATCH.GP_NO,DESPATCH.GP_DATE,DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,DESPATCH.SITE_CODE,DESPATCH.TOT_VALUE as AMOUNT FROM TAX, TAXTRAN,DESPATCH,CUSTOMER WHERE"
+" ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = DESPATCH.DESP_ID ) AND ( DESPATCH.CUST_CODE = CUSTOMER.CUST_CODE )" +" ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = DESPATCH.DESP_ID ) AND ( DESPATCH.CUST_CODE = CUSTOMER.CUST_CODE )"
+" AND ( ( TAXTRAN.TRAN_CODE = ? ) AND (DESPATCH.SITE_CODE = ? ) AND" +" AND ( ( TAXTRAN.TRAN_CODE = ? ) AND (DESPATCH.SITE_CODE = ? ) AND"
+" (DESPATCH.DESP_DATE BETWEEN ? AND ? ) AND (DESPATCH.CUST_CODE BETWEEN ? AND ? )" +" (DESPATCH.DESP_DATE BETWEEN ? AND ? ) AND (DESPATCH.CUST_CODE BETWEEN ? AND ? )"
+" AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL )" +" AND ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL )"
+" AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )" +" AND ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) )"
+"GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV," +"GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,"
+"DESPATCH.DESP_DATE,DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,DESPATCH.GP_NO,DESPATCH.GP_DATE"; +"DESPATCH.DESP_DATE,DESPATCH.CUST_CODE,CUSTOMER.CUST_NAME,DESPATCH.GP_NO,DESPATCH.GP_DATE,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,DESPATCH.SITE_CODE,DESPATCH.TOT_VALUE";
System.out.println("type:S::tranType:CHAP::refSer:S-DSP---->Executed ");
} }
else if (refSer.equals("S-INV")) else if (refSer.equals("S-INV"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,"
+"TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,' ',' ' " +"TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,INVOICE.CUST_CODE,CUSTOMER.CUST_NAME,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,' ',' ',DDF_GET_SUNDRY_DETAILS(CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE) as CITY,INVOICE.SITE_CODE,INVOICE.NET_AMT "
+" FROM TAXTRAN,TAX,INVOICE,CUSTOMER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = INVOICE.INVOICE_ID ) AND " +" FROM TAXTRAN,TAX,INVOICE,CUSTOMER WHERE ( TAX.TAX_CODE = TAXTRAN.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = INVOICE.INVOICE_ID ) AND "
+" ( INVOICE.CUST_CODE = CUSTOMER.CUST_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( INVOICE.SITE_CODE = ?) AND" +" ( INVOICE.CUST_CODE = CUSTOMER.CUST_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND ( INVOICE.SITE_CODE = ?) AND"
+" ( INVOICE.TRAN_DATE BETWEEN ? AND ? ) AND ( INVOICE.CUST_CODE BETWEEN ? AND ? ) AND" +" ( INVOICE.TRAN_DATE BETWEEN ? AND ? ) AND ( INVOICE.CUST_CODE BETWEEN ? AND ? ) AND"
+" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND " +" ( TAXTRAN.TAX_CODE BETWEEN ? AND ? ) AND ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND "
+" ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID," +" ( TAXTRAN.TAX_FORM IS NULL OR TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,"
+" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE," +" TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,INVOICE.TRAN_DATE,"
+"INVOICE.CUST_CODE, CUSTOMER.CUST_NAME"; +"INVOICE.CUST_CODE, CUSTOMER.CUST_NAME,CUSTOMER.CUST_TYPE,CUSTOMER.CUST_CODE,INVOICE.SITE_CODE,INVOICE.NET_AMT ";
System.out.println("type:S::tranType:CHAP::refSer:S-INV---->Executed ");
} }
else if (refSer.equals("VOUCH")) else if (refSer.equals("VOUCH"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME," +"TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME,"
+"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE FROM TAX,TAXTRAN,SUPPLIER," +"SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT,VOUCHER.BILL_NO,VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE) as CITY,VOUCHER.SITE_CODE,VOUCHER.NET_AMT FROM TAX,TAXTRAN,SUPPLIER,"
+" VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND " +" VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND ( TAXTRAN.TRAN_ID = VOUCHER.TRAN_ID ) AND "
+" ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND " +" ( VOUCHER.SUPP_CODE = SUPPLIER.SUPP_CODE ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
+" (VOUCHER.SITE_CODE = ? ) AND (VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND " +" (VOUCHER.SITE_CODE = ? ) AND (VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND "
...@@ -1020,15 +1117,17 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -1020,15 +1117,17 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR " +" ( TAX.FORM_REQD = 'Y' ) AND ( TAXTRAN.TAX_CHAP IS NOT NULL ) AND ( TAXTRAN.TAX_FORM IS NULL OR "
+" TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM," +" TAXTRAN.TAX_FORM_DATE IS NULL ) ) GROUP BY TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,"
+" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE," +" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,VOUCHER.TRAN_DATE,"
+" VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME, VOUCHER.BILL_NO,VOUCHER.BILL_DATE"; +" VOUCHER.SUPP_CODE,SUPPLIER.SUPP_NAME, VOUCHER.BILL_NO,VOUCHER.BILL_DATE,SUPPLIER.SUPP_TYPE,SUPPLIER.SUPP_CODE,VOUCHER.SITE_CODE, VOUCHER.NET_AMT";
System.out.println("type:S::tranType:CHAP::refSer:VOUCH---->Executed ");
} }
else if (refSer.equals("M-VOUC")) else if (refSer.equals("M-VOUC"))
{ {
getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE," getDataSql = "SELECT TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,TAXTRAN.TAX_FORM_DATE,"
+" TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE," +" TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,MISC_VOUCHER.SUNDRY_CODE,"
+" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME " +" FN_SUNDRY_NAME(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,' ') AS SUNDRY_NAME "
+" ,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT" +" ,SUM( TAXTRAN.TAX_AMT ) AS TAX_AMT"
+",MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE " +",MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE,DDF_GET_SUNDRY_DETAILS(MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE) as CITY,MISC_VOUCHER.SITE_CODE,MISC_VOUCHER.NET_AMT "
+" FROM TAX,TAXTRAN,MISC_VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND " +" FROM TAX,TAXTRAN,MISC_VOUCHER WHERE ( TAXTRAN.TAX_CODE = TAX.TAX_CODE ) AND "
+" ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND " +" ( TAXTRAN.TRAN_ID = MISC_VOUCHER.TRAN_ID ) AND ( ( TAXTRAN.TRAN_CODE = ? ) AND "
+" (MISC_VOUCHER.SITE_CODE = ? ) AND (MISC_VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND " +" (MISC_VOUCHER.SITE_CODE = ? ) AND (MISC_VOUCHER.TRAN_DATE BETWEEN ? AND ? ) AND "
...@@ -1038,7 +1137,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -1038,7 +1137,9 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
+" TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM," +" TAXTRAN.TRAN_CODE,TAXTRAN.TRAN_ID,TAXTRAN.TAX_FORM,"
+" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE," +" TAXTRAN.TAX_FORM_DATE,TAXTRAN.TAX_CLASS,TAXTRAN.TAX_ENV,MISC_VOUCHER.TRAN_DATE,"
+" MISC_VOUCHER.SUNDRY_CODE,MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE" +" MISC_VOUCHER.SUNDRY_CODE,MISC_VOUCHER.BILL_NO,MISC_VOUCHER.BILL_DATE"
+",MISC_VOUCHER.SUNDRY_TYPE"; +",MISC_VOUCHER.SUNDRY_TYPE,MISC_VOUCHER.SUNDRY_CODE,MISC_VOUCHER.SITE_CODE, MISC_VOUCHER.NET_AMT";
System.out.println("type:S::tranType:CHAP::refSer:M-VOUC---->Executed ");
} }
} }
} }
...@@ -1130,6 +1231,33 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca ...@@ -1130,6 +1231,33 @@ public class TaxFormRecoMulti extends ProcessEJB implements TaxFormRecoMultiLoca
} }
} }
//added by chandrakant patil start 29 March
//CITY
//if( (refSer.equals("D-RCP")) || (refSer.equals("D-ISS")) || (refSer.equals("M-VOUC")))
//{
String str=rs1.getString(13)==null?" ":rs1.getString(13);
if (str.equalsIgnoreCase(null) || str.equalsIgnoreCase(" ") || str.equalsIgnoreCase(""))
{
retTabSepStrBuff.append(" ").append("\t");
}
else
{
String strArr[] = str.split("~n");
retTabSepStrBuff.append((strArr[4]==null?" ":strArr[4])).append("\t");
}
/*
}
else
{
retTabSepStrBuff.append((rs1.getString(13)==null?" ":rs1.getString(13))).append("\t");
}
*/
//SITE CODE
retTabSepStrBuff.append((rs1.getString(14)==null?" ":rs1.getString(14))).append("\t");
//NET AMOUNT
retTabSepStrBuff.append((rs1.getString(15)==null?" ":rs1.getString(15))).append("\t");
//chandrakant Finish
retTabSepStrBuff.append("\n"); retTabSepStrBuff.append("\n");
count++; count++;
System.out.println("#####Counter"+count); System.out.println("#####Counter"+count);
......
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