Skip to content

B
business-java
Commit ec028058 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@106677 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7c3b5c91
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 97 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ ec028058
......@@ -6296,8 +6296,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
// +" i.tran_id as DOC_NO, "
+" i.invoice_id as DOC_NO, "
+" i.tran_id as DOC_NO, "
//+" i.invoice_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,"
......@@ -6389,25 +6389,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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,";
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -6427,22 +6427,22 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_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.tran_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 +"fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('CRNRCP',i.tran_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 "
+" fn_get_gst_rate('CRNRCP',i.tran_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 "
......@@ -6460,7 +6460,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*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 ti.tran_id = i.tran_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -6474,7 +6474,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
//+" and i.invoice_id = ? ";
+" and i.tran_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
......@@ -6516,8 +6517,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
// +" i.tran_id as DOC_NO, "
+" i.invoice_id as DOC_NO, "
+" i.tran_id as DOC_NO, "
// +" i.invoice_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,"
......@@ -6610,25 +6611,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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,";
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -6648,15 +6649,15 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 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,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_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.tran_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 +"fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
......@@ -6664,7 +6665,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as REMARKS ,"
/*added by kaustubh on 20-07-2017*/
+" fn_get_gst_rate('DRNRCP',i.invoice_id, it.line_no) as gst_rate "
+" fn_get_gst_rate('DRNRCP',i.tran_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 "
......@@ -6682,7 +6683,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*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 ti.tran_id = i.tran_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -6696,7 +6697,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
// +" and i.invoice_id = ? ";
+" and i.tran_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
......@@ -6820,8 +6822,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
// +" i.tran_id as DOC_NO, "
+" i.invoice_id as DOC_NO, "
+" i.tran_id as DOC_NO, "
// +" i.invoice_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,"
......@@ -6912,25 +6914,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
+" fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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,";
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -6950,22 +6952,22 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('CRNRCP' AS VARCHAR(6)),i.tran_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.tran_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 +"fn_gst_rate_amt('CRNRCP',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('CRNRCP',i.tran_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 "
+" fn_get_gst_rate('CRNRCP',i.tran_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 "
......@@ -6983,7 +6985,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*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 ti.tran_id = i.tran_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -6997,7 +6999,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
// +" and i.invoice_id = ? ";
+" and i.tran_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
......@@ -7038,8 +7041,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as SUBMISSION_TYPE,"
+" '' as DOC_CHECKSUM,"
+" i.drcr_flag as DOC_TYPE, "
// +" i.tran_id as DOC_NO, "
+" i.invoice_id as DOC_NO, "
+" i.tran_id as DOC_NO, "
//+" i.invoice_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,"
......@@ -7131,25 +7134,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
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,";
+" fn_gst_rate_amt(CAST('DRNRCP' AS VARCHAR(6)),i.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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.tran_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,";
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('DRNRCP',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -7203,7 +7206,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*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 ti.tran_id = i.tran_id "
+"and tx.tax_type in ('G','H','I','J')" ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -7217,7 +7220,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
+" and i.tran_id = ? ";
/*added by kaustubh on 20-07-2017*/
/*+" and u.unit = item.unit ";*/
......@@ -8324,7 +8327,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as ORDER_NO,"// -- not required
// +" null as ORDER_DATE,"// -- not required
//+" i.tran_id as REMARKS,"
+" 'c.site_code' as REMARKS, " // added on 9 aug
+" c.site_code as REMARKS, " // added on 9 aug
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS,"
// +" null SUBMIT_DATE,"
......@@ -8488,7 +8491,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as ORDER_NO,"// -- not required
// +" null as ORDER_DATE,"// -- not required
//+" i.tran_id as REMARKS,"
+" 's.site_code' as REMARKS, " // on 9 aug
+" s.site_code as REMARKS, " // on 9 aug
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS,"
// +" null SUBMIT_DATE,"
......@@ -8631,7 +8634,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '02' as TRAN_TYPE,"
+" i.supp_code as CUST_CODE, "
......@@ -8791,7 +8794,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '02' as TRAN_TYPE,"
+" i.sundry_code as CUST_CODE, "
......@@ -9120,7 +9123,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '03' as TRAN_TYPE,"
+" i.sundry_code as CUST_CODE, "
......@@ -9288,7 +9291,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '04' as TRAN_TYPE,"
+" i.supp_code as CUST_CODE, "
......@@ -9449,7 +9452,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '04' as TRAN_TYPE,"
+" i.sundry_code as CUST_CODE, "
......@@ -9620,7 +9623,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '01' as TRAN_TYPE,"
+" i.supp_code as CUST_CODE, "
......@@ -9787,7 +9790,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
+" '2' as REC_TYPE, "
+" 'I' as GST_TYPE,"
+" '01' as TRAN_TYPE,"
+" i.sundry_code as CUST_CODE, "
......@@ -10446,7 +10449,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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.
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'S' as GST_TYPE,"
+" '07' as TRAN_TYPE,"// -- b2b,b2c
+" i.sundry_code as CUST_CODE,"
......
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