Skip to content

B
business-java
Commit 263a2d8e authored by kdabholkar's avatar kdabholkar
Browse files
Options

commited to add new changes of GSTR1 and GSTR2 data queries. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106672 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1f3bd445
Show whitespace changes
Inline Side-by-side
Showing with 666 additions and 141 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 263a2d8e
......@@ -183,6 +183,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
System.out.println("strDte"+strDate);
// System.out.println("currMonthStartDate"+to_char(currMonthStartDate,'DD-MMM-YYY');
period = checkNull(genericUtility.getColumnValue("prd_code", headerDom));
......@@ -233,8 +235,15 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
toDate = Timestamp.valueOf(genericUtility.getValidDateString( sdf.format(cal.getTime()) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");;
}
SimpleDateFormat formatter1 = new SimpleDateFormat("dd-MMM-yyyy");
String endDate= formatter.format(toDate);
System.out.println("endDate"+endDate);
System.out.println("From Date["+fromDate+"] To Date["+toDate+"] Period Code["+prdcode+"]");
if ("S".equalsIgnoreCase(type))
{
//modified by kaustubh on 18-07-2017 to resolve missing expression issue start
......@@ -363,7 +372,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
hdrSql = " select '' as TRAN_ID, "
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ," changed on 23 aug
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+" i.tran_date as PRD_CODE ,"
+" '1' as REC_TYPE, "
+" ' ' as GST_TYPE,"
......@@ -506,8 +516,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ," changes on 23 aug
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, " // GSTR1,GSTR2,etc.
+" 'I' as GST_TYPE,"
......@@ -657,9 +668,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
/* changed by kaustubh on 20 july 2017*/
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -875,9 +887,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end ) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
/*modified by kaustubh 20 july 2017*/
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -1086,8 +1099,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.excise_ref_date) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.gp_date is null then i.tran_date else i.gp_date end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.gp_date is null then i.tran_date else i.gp_date end as PRD_CODE,"
/*modified by kaustubh on 20 july 2017*/
/*+" to_char(i.excise_ref_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
......@@ -1156,7 +1170,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// hdrSql = hdrSql +" ) = 0 " Commented on 22 aug 2017
hdrSql = hdrSql +" ) > 0 "
+"and (select count(1) from voucher vh, vouchrcp vr, porcp pr where vr.tran_id = vh.tran_id and vh.purc_order = pr.purc_order "
+"and pr.tran_ser = 'P-RET' and vr.PRCP_ID = pr.tran_id) > 0"
+"and pr.tran_ser = 'P-RET' and vr.PRCP_ID = pr.tran_id and i.tran_id=vh.tran_id ) > 0"
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
//+" and i.conf_date between ? and ? " commented by kaustubh on 27 july 2017
+" and i.tran_date between ? and ? "
......@@ -1269,7 +1283,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and item.item_code = it.item_code "
/*commented by kaustubh on 21-7-2017 / 3 aug */
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'P-RET' "
+"and ti.tran_code = 'VOUCH' "
+"and ti.tran_id = i.tran_id "
+"and tx.tax_type in ('G','H','I','J')" ;
......@@ -1312,8 +1326,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* modify by kaustubh */
/*+" to_char(i.gp_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
......@@ -1535,8 +1550,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.gp_date is null then i.tran_date else i.gp_date end) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.gp_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -1756,8 +1772,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.gp_date is null then i.tran_date else i.gp_date end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 uag
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.gp_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh 25 july 2017
{
......@@ -1975,8 +1992,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.excise_ref_date) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.excise_ref_date is null then i.tran_date else i.excise_ref_date end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.excise_ref_date is null then i.tran_date else i.excise_ref_date end as PRD_CODE,"
/*+" to_char(i.excise_ref_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -2188,8 +2206,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -2398,8 +2417,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
{
......@@ -2607,8 +2627,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july
{
......@@ -2815,8 +2836,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh 25 july 2017
{
......@@ -3018,8 +3040,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july
{
......@@ -3225,8 +3248,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -3427,8 +3451,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -3631,8 +3656,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july
{
......@@ -3832,8 +3858,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -4034,8 +4061,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commnetde by kaustubh on 25 july 2017
{
......@@ -4228,8 +4256,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -4429,8 +4458,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july
{
......@@ -4626,8 +4656,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -4819,8 +4850,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commnmeted by kaustubh on 25 july 2017
{
......@@ -5020,8 +5053,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh 25 july
{
......@@ -5223,8 +5257,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -5419,8 +5454,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/*+" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -5620,8 +5656,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -5822,8 +5859,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -6018,8 +6056,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{
......@@ -6210,14 +6249,462 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*changed by kaustubh on 19-07-2017*/
/*+" and u.unit = item.unit ";*/
// retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9A(1)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9A(1)");
}
/******* 9B started ********/
/**
* 9B(1) Header CDNR Credit Note registered (CRNRCP)*
*/
{
/**
* 9B(1) Header CDNR Credit Note registered (CRNRCP)*
*/
hdrSql = " select '' as TRAN_ID, "
/*modified by kaustubh*/
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july 2017
{
hdrSql = hdrSql +" cast(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE, ";
}
else
{
hdrSql = hdrSql +"to_char(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE,";
}
hdrSql=hdrSql*/
+" '1' as REC_TYPE, "
+" 'C' as GST_TYPE,"
+" '29' as TRAN_TYPE,"
/*commented by kaustubh*/
// +" case when i.drcr_flag = 'C' then '29' else '30' end as TRAN_TYPE, "
+" i.cust_code as CUST_CODE, "
+" c.cust_name as CUST_NAME, "
+" state.GST_CODE, "
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
+" i.tran_id as DOC_NO, "
/*modified by kaustubh on 25 july 2017*/
/*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, "
+" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, "
+" i.invoice_id as REF_ID__INV, "
+"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, "
+" ' ' as ORDER_NO,"
// +" null as ORDER_DATE, " commented by kaustubh 27 july 2017
//+" i.invoice_id as REMARKS, "
+" '' as REMARKS, "
+" i.invoice_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
// +" sysdate as ADD_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, " commented by kaustubh 27 july 2017
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
+" ' ' as ECOM_REG_NO, "
/*chnaged by kaustubh*/
+" 'CRNRCP' as ref_ser "
// +" case when i.drcr_flag = 'C' then 'CRNRCP' else 'DRNRCP' end as ref_ser "
+" from drcr_rcp i,customer c, site s, state, invoice inv "
+" where c.cust_code = i.cust_code "
+" and s.site_code = i.site_code "
+" and state.state_code = c.STATE_CODE "
+" and inv.invoice_id = i.invoice_id "
+" and i.drcr_flag ='C'" //added by kaustubh on 26 july to seperate Debit and credit note data
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
+" and (select count(1) from taxtran ti where ti.tran_code = 'CRNRCP' ) > 0 " ; //modified by kaustubh on 26 july 2017 add DRNCRP
/* +" and to_date(inv.conf_date) < '"+currMonthStartDate+"' " commented by kaustubh on 26 july remove to_date for DB2*/
// +" and inv.conf_date < '"+currMonthStartDate+"' " commented by kaustubh on 27 july
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
hdrSql = hdrSql +" and inv.tran_date between '"+fromDate+"'and '" +toDate+"'";
}
else
{
hdrSql = hdrSql +" and inv.tran_date between '"+strDate+"'and '" +endDate+"'";
}
hdrSql = hdrSql
// +" and inv.tran_date between ? and ? "
+" and c.tax_reg_2 <> 'UNREGISTER' "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
// +" and i.conf_date between ? and ? " commented by kaustubh on 27 july 2017
+" and i.tran_date between ? and ? "
/*changed by kaustubh*/
//+" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+" and (select count(1) from gst_data_hdr where ref_ser = 'CRNRCP' and ref_id = i.invoice_id ) = 0 ";
/**
* Detail CDNR Credit Note registered 9B(1) (CRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
/*changed by kaustubh on 20-07-2017*/
/*+" si.hsn_no as GS_CODE, "
+" tx.TAXABLE_AMT as TAXABLE_AMT, "
+" case when t.tax_type = 'I' then tx.tax_perc else 0 end as IGST_PERC,"
+" (case when t.tax_type = 'I' then tx.tax_amt else 0 end) as IGST_AMT,"
+" case when t.tax_type = 'H' then tx.tax_perc else 0 end as CGST_PERC,"
+" (case when t.tax_type = 'H' then tx.tax_amt else 0 end) as CGST_AMT,"
+" case when t.tax_type = 'G' then tx.tax_perc else 0 end as SGST_PERC,"
+" (case when t.tax_type = 'G' then tx.tax_amt else 0 end) as SGST_AMT,"*/
/* + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC,"
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT,";
}
else
{
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
/*changed by kaustubh on 20-07-2017*/
/*+" case when t.tax_type = 'J' then tx.tax_perc else 0 end as CESS_PERC,"
+" (case when t.tax_type = 'J' then tx.tax_amt else 0 end) as CESS_AMT,"*/
/*+" fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
+" fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,"*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('CRNRCP',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
/*added by kaustubh on 20-07-2017*/
+" fn_get_gst_rate('CRNRCP',i.invoice_id, it.line_no) as gst_rate "
/*changed by kaustubh on 20-07-2017*/
/*+" from drcr_rcp i,drcr_rdet it,taxtran tx, siteitem si, tax t, item,uom u "*/
+" from drcr_rcp i,drcr_rdet it, item "
+" where i.tran_id = it.tran_id "
/*added by kaustubh on 20-07-2017*/
/*+" and si.site_code = i.site_code "
+" and si.item_code = it.item_code "*/
+" and item.item_code = it.item_code "
/*+" and t.tax_code = tx.tax_code "
+" and t.tax_type in ('G','H','I','J') "
+" and tx.tran_code in ( 'CRNRCP','DRNRCP') "
+" and tx.tran_id = i.invoice_id ";*/
/*added by kaustubh on 20-07-2017 / 3 aug */
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'CRNRCP' "
+"and ti.tran_id = i.invoice_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
//dtlSql = dtlSql +" and cast(tx.line_no as integer) = it.line_no ";
dtlSql =dtlSql +" and cast(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
//dtlSql = dtlSql +" and to_number(trim(tx.line_no)) = it.line_no ";
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B(1)");
}
/**
* 9B(1) Header Debit Note registered (DRNRCP)*
*/
{
hdrSql = " select '' as TRAN_ID, "
/*modified by kaustubh*/
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july 2017
{
hdrSql = hdrSql +" cast(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE, ";
}
else
{
hdrSql = hdrSql +"to_char(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE,";
}
hdrSql=hdrSql*/
+" '1' as REC_TYPE, "
+" 'D' as GST_TYPE,"
+" '30' as TRAN_TYPE,"
/*commented by kaustubh*/
// +" case when i.drcr_flag = 'C' then '29' else '30' end as TRAN_TYPE, "
+" i.cust_code as CUST_CODE, "
+" c.cust_name as CUST_NAME, "
+" state.GST_CODE, "
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
+" i.tran_id as DOC_NO, "
/*modified by kaustubh on 25 july 2017*/
/*+" i.conf_date as DOC_DATE, "*/
// +"case when i.conf_date is null then i.tran_date else i.conf_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE,"
+" i.amount as AMOUNT, "
+" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, "
// +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, "
+" i.invoice_id as REF_ID__INV, "
+"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, "
+" ' ' as ORDER_NO,"
// +" null as ORDER_DATE, " commented by kaustubh 27 july 2017
//+" i.invoice_id as REMARKS, "
+" s.site_code as REMARKS, "
+" i.invoice_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
// +" sysdate as ADD_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, " commented by kaustubh 27 july 2017
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
+" ' ' as ECOM_REG_NO, "
/*chnaged by kaustubh*/
+" 'DRNRCP' as ref_ser "
// +" case when i.drcr_flag = 'C' then 'CRNRCP' else 'DRNRCP' end as ref_ser "
+" from drcr_rcp i,customer c, site s, state, invoice inv "
+" where c.cust_code = i.cust_code "
+" and s.site_code = i.site_code "
+" and state.state_code = c.STATE_CODE "
+" and inv.invoice_id = i.invoice_id "
+" and i.drcr_flag ='D'" //added by kaustubh on 26 july to seperate Debit and credit note data
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
+" and (select count(1) from taxtran ti where ti.tran_code = 'DRNRCP' ) > 0 " ; //modified by kaustubh on 26 july 2017 add DRNCRP
/* +" and to_date(inv.conf_date) < '"+currMonthStartDate+"' " commented by kaustubh on 26 july remove to_date for DB2*/
// +" and inv.conf_date < '"+currMonthStartDate+"' " commented by kaustubh on 27 july 2017
//+" and inv.tran_date < '"+currMonthStartDate+"' " changed by kaustubh on 31 july 2017
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
hdrSql = hdrSql +" and inv.tran_date < '"+currMonthStartDate+"' ";
}
else
{
hdrSql = hdrSql +" and inv.tran_date between '"+strDate+"'and '" +endDate+"'";
}
hdrSql = hdrSql
// +" and inv.tran_date between ? and ? "
+" and c.tax_reg_2 <> 'UNREGISTER' "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
// +" and i.conf_date between ? and ? " commented by kaustubh on 27 july 2017
+" and i.tran_date between ? and ? "
/*changed by kaustubh*/
//+" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+" and (select count(1) from gst_data_hdr where ref_ser = 'DRNRCP' and ref_id = i.invoice_id ) = 0 ";
/**
* Detail CDNR Debit Note registered 9B(1) (DRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
/*changed by kaustubh on 20-07-2017*/
/*+" si.hsn_no as GS_CODE, "
+" tx.TAXABLE_AMT as TAXABLE_AMT, "
+" case when t.tax_type = 'I' then tx.tax_perc else 0 end as IGST_PERC,"
+" (case when t.tax_type = 'I' then tx.tax_amt else 0 end) as IGST_AMT,"
+" case when t.tax_type = 'H' then tx.tax_perc else 0 end as CGST_PERC,"
+" (case when t.tax_type = 'H' then tx.tax_amt else 0 end) as CGST_AMT,"
+" case when t.tax_type = 'G' then tx.tax_perc else 0 end as SGST_PERC,"
+" (case when t.tax_type = 'G' then tx.tax_amt else 0 end) as SGST_AMT,"*/
/* + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC,"
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT,";
}
else
{
dtlSql = dtlSql + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2107
+" item.descr as GS_DESCR,"
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
/*changed by kaustubh on 20-07-2017*/
/*+" case when t.tax_type = 'J' then tx.tax_perc else 0 end as CESS_PERC,"
+" (case when t.tax_type = 'J' then tx.tax_amt else 0 end) as CESS_AMT,"*/
/*+" fn_gst_rate_amt('DRNquantityRCP',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
+" fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,"*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.invoice_id, it.line_no, CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('DRNRCP',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
/*added by kaustubh on 20-07-2017*/
+" fn_get_gst_rate('DRNRCP',i.invoice_id, it.line_no) as gst_rate "
/*changed by kaustubh on 20-07-2017*/
/*+" from drcr_rcp i,drcr_rdet it,taxtran tx, siteitem si, tax t, item,uom u "*/
+" from drcr_rcp i,drcr_rdet it, item "
+" where i.tran_id = it.tran_id "
/*added by kaustubh on 20-07-2017*/
/*+" and si.site_code = i.site_code "
+" and si.item_code = it.item_code "*/
+" and item.item_code = it.item_code "
/*+" and t.tax_code = tx.tax_code "
+" and t.tax_type in ('G','H','I','J') "
+" and tx.tran_code in ( 'CRNRCP','DRNRCP') "
+" and tx.tran_id = i.invoice_id ";*/
/*added by kaustubh on 21-07-2017 / 3 aug */
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'DRNRCP' "
+"and ti.tran_id = i.invoice_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
//dtlSql = dtlSql +" and cast(tx.line_no as integer) = it.line_no ";
dtlSql =dtlSql +" and cast(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
//dtlSql = dtlSql +" and to_number(trim(tx.line_no)) = it.line_no ";
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B(1)");
}
/******* 9C started ********/
{
/**
* 9C(1) Header CDNR Credit Note registered (CRNRCP)*
*/
/* hdrSql = " select '' as TRAN_ID, "
modified by kaustubh
......@@ -6304,8 +6791,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july 2017
......@@ -6389,7 +6877,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and (select count(1) from gst_data_hdr where ref_ser = 'CRNRCP' and ref_id = i.invoice_id ) = 0 ";
/**
* Detail CDNR Credit Note registered 9B(1) (CRNRCP)*
* Detail CDNR Credit Note registered 9C(1) (CRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
......@@ -6507,11 +6995,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B(1)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9C(1)");
}
/**
* 9B(1) Header Debit Note registered (DRNRCP)*
* 9C(1) Header Debit Note registered (DRNRCP)*
*/
{
hdrSql = " select '' as TRAN_ID, "
......@@ -6520,8 +7008,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* +" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
/* if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) commented by kaustubh on 25 july 2017
{
......@@ -6604,7 +7093,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+" and (select count(1) from gst_data_hdr where ref_ser = 'DRNRCP' and ref_id = i.invoice_id ) = 0 ";
/**
* Detail CDNR Debit Note registered 9B(1) (DRNRCP)*
* Detail CDNR Debit Note registered 9C(1) (DRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
......@@ -6724,11 +7213,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B(1)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9C(1)");
}
/******11A Started ******/
{
/**
......@@ -6738,7 +7225,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(sysdate) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, ";
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , ";
/* + " ' ' as PRD_CODE,"*/
/* +" to_char(sysdate,'MMYYYY') as PRD_CODE, "*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
......@@ -6949,7 +7437,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(sysdate) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, ";
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , " ;
// + "' ' as PRD_CODE,"
/* +" to_char(sysdate,'MMYYYY') as PRD_CODE, "*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
......@@ -7175,7 +7664,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(sysdate) as TRAN_DATE, " commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, ";
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , " ;
// + "' ' as PRD_CODE,"
/* +" to_char(sysdate,'MMYYYY') as PRD_CODE, "*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
......@@ -7423,7 +7913,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, ";
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,";
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , " ;
//+ "' ' as PRD_CODE,"
/* +" to_char(sysdate,'MMYYYY') as PRD_CODE, "*/
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
......@@ -7800,7 +8291,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" to_date(case when i.conf_date is null then i.tran_date else i.conf_date end) as TRAN_DATE,"
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " changed by kaustubh on on 9 aug
+" ddf_get_siteregno(c.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(c.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ "case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'I' as GST_TYPE," //need to ask
......@@ -7962,7 +8454,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.gp_date is null then i.tran_date else i.gp_date end) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , "
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'R' as GST_TYPE,"
......@@ -8127,8 +8620,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 uag
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '02' as TRAN_TYPE,"
......@@ -8286,8 +8780,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , "
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '02' as TRAN_TYPE,"
......@@ -8455,8 +8950,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
/// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '03' as TRAN_TYPE,"
......@@ -8613,7 +9109,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
......@@ -8780,7 +9277,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
......@@ -8940,8 +9438,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '04' as TRAN_TYPE,"
......@@ -9110,7 +9609,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , "
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
......@@ -9276,8 +9776,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '01' as TRAN_TYPE,"
......@@ -9450,8 +9951,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
/* modify by kaustubh */
/*+" to_char(i.gp_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh on 25 july 2017
......@@ -9618,8 +10120,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'U' as GST_TYPE,"
+" '06' as TRAN_TYPE,"// -- b2b,b2c
......@@ -9768,8 +10271,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" to_date(case when i.conf_date is null then i.tran_date else i.conf_date end) as TRAN_DATE,"
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'S' as GST_TYPE," //need to ask
+" '07' as TRAN_TYPE,"// -- b2b,b2c
......@@ -9931,8 +10435,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(case when i.gp_date is null then i.tran_date else i.gp_date end) as TRAN_DATE," commented by kaustubh on 25 july 2017*/
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '1' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'S' as GST_TYPE,"
+" '07' as TRAN_TYPE,"// -- b2b,b2c
......@@ -10094,8 +10599,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" to_date(case when i.conf_date is null then i.tran_date else i.conf_date end) as TRAN_DATE,"
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'G' as GST_TYPE," //need to ask
+" '08' as TRAN_TYPE,"// -- b2b,b2c
......@@ -10258,8 +10764,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" to_date(case when i.conf_date is null then i.tran_date else i.conf_date end) as TRAN_DATE,"
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.conf_date is null then i.tran_date else i.conf_date end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'G' as GST_TYPE," //need to ask
+" '09' as TRAN_TYPE,"// -- b2b,b2c
......@@ -10424,8 +10931,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'C' as GST_TYPE,"
+" '12' as TRAN_TYPE,"
......@@ -10569,8 +11077,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'C' as GST_TYPE,"
+" '13' as TRAN_TYPE,"
......@@ -10713,8 +11222,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , "
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'D' as GST_TYPE,"
+" '10' as TRAN_TYPE,"
......@@ -10857,8 +11367,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'D' as GST_TYPE,"
+" '11' as TRAN_TYPE,"
......@@ -11001,8 +11512,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '22' as TRAN_TYPE,"
......@@ -11167,8 +11679,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, " on 9 aug
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '23' as TRAN_TYPE,"
......@@ -11320,8 +11833,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '25' as TRAN_TYPE,"
......@@ -11474,8 +11988,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '24' as TRAN_TYPE,"
......@@ -11624,7 +12139,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
......@@ -11776,8 +12292,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '19' as TRAN_TYPE,"
......@@ -11927,8 +12444,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '21' as TRAN_TYPE,"
......@@ -12079,8 +12597,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
+" '' as TRAN_ID__REF, "
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE, "
+" 'L' as GST_TYPE,"
+" '20' as TRAN_TYPE,"
......@@ -12234,8 +12753,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'A' as GST_TYPE,"
+" '14' as TRAN_TYPE,"// -- b2b,b2c
......@@ -12382,8 +12902,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " case when i.GP_DATE is null then i.tran_date else i.GP_DATE end as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'A' as GST_TYPE,"
+" '15' as TRAN_TYPE,"// -- b2b,b2c
......@@ -12527,8 +13048,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "i.tran_date as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " i.tran_date as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'T' as GST_TYPE,"
+" '16' as TRAN_TYPE,"// -- b2b,b2c
......@@ -12682,8 +13204,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "i.tran_date as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE , "
+ " i.tran_date as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'T' as GST_TYPE,"
+" '17' as TRAN_TYPE,"// -- b2b,b2c
......@@ -12817,8 +13340,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
// +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "i.tran_date as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " i.tran_date as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'T' as GST_TYPE,"
+" '16' as TRAN_TYPE,"// -- b2b,b2c
......@@ -12968,8 +13492,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" to_date(i.gp_date) as TRAN_DATE,"*/
+" '' as TRAN_ID__REF,"
//+" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
+" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+ "i.tran_date as PRD_CODE,"
// +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " i.tran_date as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'T' as GST_TYPE,"
+" '17' as TRAN_TYPE,"// -- b2b,b2c
......@@ -13394,7 +13919,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
prvAssment = "",orderNo = "",remarks = "",submitStatus = "",
taxRegNo = "",recoStatus = "",ecomRegNo = "",refSer = "",stateCode = "",docType = "",
lineType = "",gsCode = "",gsDescr = "",unit = "",supplyType = "",remarksDet = "",distOrdTranID = "",
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "";
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "", itc_type="";
int srNoOld = 0;
String prdCodeGstHdr ;
String prdCodenew = "";
......
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