Skip to content

B
business-java
Commit d02e3d0d 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@106674 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 039def63
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 17 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ d02e3d0d
......@@ -6296,7 +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.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,"
......@@ -6313,7 +6314,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as ORDER_DATE, " commented by kaustubh 27 july 2017
//+" i.invoice_id as REMARKS, "
+" '' as REMARKS, "
+" i.invoice_id as REF_ID, "
// +" i.invoice_id as REF_ID, "
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
......@@ -6514,7 +6516,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.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,"
......@@ -6531,7 +6534,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
// +" i.invoice_id as REF_ID, "
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
......@@ -6816,8 +6820,9 @@ 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, "
/*modified by kaustubh on 25 july 2017*/
// +" 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,"
+" i.tran_date as DOC_DATE,"
......@@ -6833,7 +6838,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as ORDER_DATE, " commented by kaustubh 27 july 2017
//+" i.invoice_id as REMARKS, "
+" '' as REMARKS, "
+" i.invoice_id as REF_ID, "
// +" i.invoice_id as REF_ID, "
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
......@@ -7032,7 +7038,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.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,"
......@@ -7049,7 +7056,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" 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, "
// +" i.invoice_id as REF_ID, "
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, " commented by kaustubh 27 july 2017
+" '' ADD_USER, "
......@@ -9666,7 +9674,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
if(GST_RCM_TAXENV.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class in ("+GST_RCM_TAXENV+") ";
hdrSql = hdrSql +" and ti.tax_env in ("+GST_RCM_TAXENV+") ";
}
hdrSql = hdrSql +" ) > 0 "
......@@ -9834,7 +9842,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
if(GST_RCM_TAXENV.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class in ("+GST_RCM_TAXENV+") ";
hdrSql = hdrSql +" and ti.tax_env in ("+GST_RCM_TAXENV+") ";
}
hdrSql = hdrSql +" ) > 0 "
......@@ -10015,7 +10023,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
if(GST_RCM_TAXENV.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class in ("+GST_RCM_TAXENV+") ";
hdrSql = hdrSql +" and ti.tax_env in ("+GST_RCM_TAXENV+") ";
}
hdrSql = hdrSql +" and tm.tax_group = 'RCM' ) = 0 "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
......@@ -10175,7 +10183,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
if(GST_RCM_TAXENV.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class in ("+GST_RCM_TAXENV+") ";
hdrSql = hdrSql +" and ti.tax_env in ("+GST_RCM_TAXENV+") ";
}
hdrSql = hdrSql +" and tm.tax_group = 'RCM' ) = 0 "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
......@@ -10321,7 +10329,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and ti.tran_code = 'VOUCH' and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I')";
if(GST_IMPSER_TAXCLASS.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_env in ("+GST_IMPSER_TAXCLASS+") ";
hdrSql = hdrSql +" and ti.tax_class in ("+GST_IMPSER_TAXCLASS+") ";
}
if(GST_IMPSER_TAXENV.length() > 0)
{
......@@ -10486,7 +10494,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and ti.tran_code = 'M-VOUC' and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I')";
if(GST_IMPSER_TAXCLASS.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_env in ("+GST_IMPSER_TAXCLASS+") ";
hdrSql = hdrSql +" and ti.tax_class in ("+GST_IMPSER_TAXCLASS+") ";
}
if(GST_IMPSER_TAXENV.length() > 0)
{
......@@ -10650,7 +10658,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if(GST_IMPGD_TAXCLASS.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_env in ("+GST_IMPGD_TAXCLASS+") ";
hdrSql = hdrSql +" and ti.tax_class in ("+GST_IMPGD_TAXCLASS+") ";
}
if(GST_IMPGD_TAXENV.length() > 0)
{
......@@ -10812,7 +10820,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and ti.tran_code = 'VOUCH' and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I') ";
if(GST_IMPGDSEZ_TAXCLASS.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_env in ("+GST_IMPGDSEZ_TAXCLASS+") ";
hdrSql = hdrSql +" and ti.tax_class in ("+GST_IMPGDSEZ_TAXCLASS+") ";
}
if(GST_IMPGDSEZ_TAXENV.length() > 0)
{
......
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