Skip to content

B
business-java
Commit 55813fdf authored by kdabholkar's avatar kdabholkar
Browse files
Options

commit the changes regarding CHG_DATE in GSTR 2. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183139 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6a7469b7
Show whitespace changes
Inline Side-by-side
Showing with 382 additions and 548 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 55813fdf
......@@ -2,8 +2,8 @@ package ibase.webitm.ejb.gstclient;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
//import ibase.utility.E12GenericUtility;
import ibase.utility.E12GenericUtility;
//import ibase.utility.E12GenericUtility;
//import ibase.utility.GenericUtility;
//import ibase.utility.GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
......@@ -485,315 +485,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
{
retString= processForFortune();
/*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 ," 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,"
+" ' ' as TRAN_TYPE,"
+" i.cust_code__dlv 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, "
// +"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,"
+" ' ' as REAS_CODE, "
+" ' ' as REF_ID__INV, "
// +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" '' as REF_DATE_INV,"
+" 'N' as PROV_ASSMNT, "
+" ' ' as ORDER_NO,"
// +" null as ORDER_DATE, "
+" s.site_code as REMARKS, "
+" i.tran_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, "
+" '' ADD_USER, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
+" ' ' as ECOM_REG_NO, "
+" 'MDRCRD' as ref_ser "
+" from misc_drcr_rcp i,customer c, site s, state"
// +" from misc_drcr_rcp i,customer c, site s, state, invoice inv "
+" where c.cust_code = i.cust_code__dlv "
+" 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'"
+" 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 = 'MDRCRD' and ti.tran_id = i.tran_id ";
if(GST_DE_TAXCLASS.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class in ("+taxClassAllStr+") ";
}
hdrSql = hdrSql +" ) > 0 "
+" and c.tax_reg_2 <> 'UNREGISTER' "
// +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
+" and i.tran_date between ? and ? "
+" and (select count(1) from gst_data_hdr where ref_ser = 'MDRCRD' and ref_id = i.tran_id ) = 0 ";
*//**
* Detail FOR fortune Client sales invoice through misc debit note and invoice 3(A) FOR ) *
*//*
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,"
+" accounts.sac_no as GS_CODE,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
// dtlSql = dtlSql +"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
// dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
dtlSql = dtlSql +" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC,"
+" fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), 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,"
//dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
dtlSql = dtlSql + "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('MDRCRD' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT," ;
}
dtlSql = dtlSql
+" '' as REMARKS ,";
// +" fn_get_gst_rate('MDRCRD',i.tran_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRD',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRD',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from drcr_rcp i,drcr_rdet it,taxtran tx, siteitem si, tax t, item,uom u "
// +" from misc_drcr_rcp i,misc_drcr_rdet it, item "
+" from misc_drcr_rcp i,misc_drcr_rdet it, accounts "
+" where i.tran_id = it.tran_id "
// +" and item.item_code = it.item_code "
+" and accounts.acct_code=it.acct_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'MDRCRD' "
+"and ti.tran_id = i.tran_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.tran_id = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"3(A) FOR");*/
}//if ("Y".equalsIgnoreCase(SALES_DATA_MISC)) else
else
{
/*hdrSql = " select '' as TRAN_ID, "
+" 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 ," 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,"
+" '01' as TRAN_TYPE," // b2b,b2c
+" i.cust_code as CUST_CODE, "
+" c.cust_name as CUST_NAME, "
+" state.GST_CODE, " // 2 digit code
+" '' as SUBMISSION_TYPE," // M-Modify, D-Delete, A-Accept, R-Reject
+" '' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE, " // R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
+" case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
+"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.net_amt as AMOUNT, "
+" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, "
// +" null as LR_DATE,"
+" ' ' as REAS_CODE, "
+" ' ' as REF_ID__INV, "
// +" null REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, " // not required
+" '' as ORDER_NO," //not required
// +" null as ORDER_DATE, "// not required
//+" i.invoice_id as REMARKS, "
+" s.site_code as REMARKS, "
+" i.invoice_id as REF_ID, "
+" ' ' as SUBMIT_STATUS, "
// +" null SUBMIT_DATE, "
+" '' ADD_USER, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
+" ' ' as ECOM_REG_NO, "
+" 'S-INV' as ref_ser "
+" from invoice i,customer c, site s, state state"
+" where c.cust_code = i.cust_code "
+" and s.site_code = i.site_code "
+" and state.state_code = c.state_code "
+" and c.tax_reg_2 <> 'UNREGISTER' "
+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'S-INV'"
+" and ti.tran_id = i.invoice_id and tm.tax_type in ('G','H','I','J') ";
if(taxClassAllStr.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
}
if(taxEnvAllStr.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_env not in ("+taxEnvAllStr+") ";
}
hdrSql = hdrSql +" ) > 0 "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
+" and i.tran_date between ? and ? "
+" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
*//**
* Detail Sales Invoice Detail 3(A) S-INV*
*//*
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, " //-- M – Modification, A – Accept D – Delete
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,"; // -- G – Goods, S – Serice
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('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC,"
+" fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), 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('S-INV',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
+"item.UNIT as UNIT,"
+" (it.quantity__stduom) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;// -- E/OE (Ecom/Other than Ecom)
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + " fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,";
//+"fn_get_gst_rate('S-INV',i.invoice_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +" fn_get_gst_rate('S-INV',i.invoice_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +" fn_get_gst_rate('S-INV',i.invoice_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from invoice i,invoice_trace it, item"
+" where i.invoice_id = it.invoice_id "
+" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'S-INV' "
+"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(ti.line_no as integer) = it.line_no ) > 0";
//dtlSql = dtlSql +" and cast(tx.line_no as integer) = it.line_no ";
}
else
{
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
//dtlSql = dtlSql +" and to_number(trim(tx.line_no)) = it.line_no ";
}
dtlSql = dtlSql
+" and i.invoice_id = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"3(A) S-INV");*/
/******* 4A started ********/
/**
......@@ -2153,7 +1847,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" 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 ,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+ " i.tran_date as PRD_CODE,"
+" i.tran_date as PRD_CODE,"
/*+" to_char(i.gp_date,'MMYYYY') as PRD_CODE,"*/
/*if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) commented by kaustubh 25 july 2017
{
......@@ -10593,11 +10287,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
taxClassAllStrOfPurchase = GST_COMP_TAXCLASS +","+ GST_PUREXE_TAXCLASS +","+ GST_PURNIL_TAXCLASS +","+ GST_PURNON_TAXCLASS +","+ GST_IMPSER_TAXCLASS +","+
GST_IMPGD_TAXCLASS +","+ GST_IMPGDSEZ_TAXCLASS+","+ GST_PURSEZWP_TAXCLASS+ ","+GST_PURSEZWOP_TAXCLASS+","+GST_PURDE_TAXCLASS;
GST_IMPGD_TAXCLASS +","+ GST_IMPGDSEZ_TAXCLASS+","+ GST_PURSEZWP_TAXCLASS+ ","+GST_PURSEZWOP_TAXCLASS+","+GST_RCM_TAXCLASS+","+GST_PURDE_TAXCLASS;
taxEnvAllStrOfPurchase = GST_COMP_TAXENV +","+ GST_PUREXE_TAXENV +","+ GST_PURNIL_TAXENV +","+ GST_PURNON_TAXENV +","+ GST_IMPSER_TAXENV +","+
GST_IMPGD_TAXENV +","+ GST_IMPGDSEZ_TAXENV +","+ GST_PURSEZWP_TAXENV +","+GST_PURSEZWOP_TAXENV+","+GST_PURDE_TAXENV;
GST_IMPGD_TAXENV +","+ GST_IMPGDSEZ_TAXENV +","+ GST_PURSEZWP_TAXENV +","+GST_PURSEZWOP_TAXENV+","+GST_RCM_TAXENV+","+GST_PURDE_TAXENV;
/*GRN SQLs
*
......@@ -14471,6 +14165,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -14629,6 +14324,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -14783,6 +14479,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -14937,6 +14634,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15092,6 +14790,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15246,6 +14945,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15399,6 +15099,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15554,6 +15255,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15710,6 +15412,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -15868,6 +15571,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -16014,6 +15718,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -16168,6 +15873,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" sysdate ADD_DATE," commented by kaustubh 27 july 2017
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE," commented by kaustubh 27 july 2017
+" ' 'CHG_TERM,"
+" ddf_get_siteregno(i.site_code__ship,'GSTIN_NO') as TAX_REG_NO,"
......@@ -16349,6 +16055,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -16531,6 +16238,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" sysdate ADD_DATE,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE,"
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
......@@ -16747,6 +16455,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -16931,6 +16640,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -17151,6 +16861,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -17334,6 +17045,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -17550,6 +17262,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -17736,6 +17449,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -17947,6 +17661,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -18134,6 +17849,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -18353,6 +18069,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' ' CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -18528,6 +18245,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" sysdate ADD_DATE,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE,"
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
......@@ -18724,6 +18442,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -18903,6 +18622,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -19111,6 +18831,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -19293,6 +19014,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -19476,6 +19198,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -19643,6 +19366,7 @@ hdrSql = " select '' as TRAN_ID,"
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -19812,6 +19536,7 @@ hdrSql = " select '' as TRAN_ID,"
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -19980,6 +19705,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -20147,6 +19873,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE," commented by kaustubh 27 july 2017
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" ddf_get_siteregno(i.site_code__ship,'GSTIN_NO') as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -20317,6 +20044,7 @@ hdrSql = " select '' as TRAN_ID,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE," commented by kaustubh 27 july 2017
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" ddf_get_siteregno(i.site_code__ship,'GSTIN_NO') as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -20491,6 +20219,7 @@ hdrSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -20668,6 +20397,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -20846,6 +20576,7 @@ hdrSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21022,6 +20753,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21201,6 +20933,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21388,6 +21121,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21580,6 +21314,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21758,6 +21493,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -21938,6 +21674,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -22103,6 +21840,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -22264,6 +22002,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -22434,6 +22173,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -22599,6 +22339,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -22760,6 +22501,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -22945,6 +22687,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -23079,6 +22822,8 @@ dtlSql = " select '' as TRAN_ID, "
System.out.println("inside ITC Reversal Purchase Return");
{
hdrSql = " select '' as TRAN_ID,"
+" '' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
......@@ -23109,6 +22854,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -23232,11 +22978,14 @@ dtlSql = " select '' as TRAN_ID, "
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"ITC-REV PUR-RET");
}
/**
* (A) D-RCP Header distribution receipt *
*/
{
hdrSql = " select '' as TRAN_ID,"
+" '' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
......@@ -23275,6 +23024,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE," commented by kaustubh 27 july 2017
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" ddf_get_siteregno(i.site_code__ship,'GSTIN_NO') as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -23404,6 +23154,8 @@ dtlSql = " select '' as TRAN_ID, "
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"D-RCP(B2B)");
}
/******* 3 started Inward supplies received from a registered person other than the supplies attracting reverse charge ********/
/**
* 3 porcp Header B2B-Reg*
......@@ -23454,6 +23206,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -23642,6 +23395,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -23829,6 +23583,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -24047,6 +23802,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -24266,6 +24022,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -24451,6 +24208,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" null SUBMIT_DATE, "
+" '' ADD_USER, "
// +" sysdate as ADD_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
......@@ -24641,6 +24399,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -24865,6 +24624,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -25084,6 +24844,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -25268,6 +25029,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -25456,6 +25218,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -25680,6 +25443,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -25899,6 +25663,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -26086,6 +25851,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -26276,6 +26042,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -26506,6 +26273,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -26734,6 +26502,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -26923,6 +26692,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -27114,6 +26884,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -27340,6 +27111,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -27575,6 +27347,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' ' CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -27763,6 +27536,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' ' CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -27945,6 +27719,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -28155,6 +27930,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -28364,6 +28140,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -28551,6 +28328,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -28768,6 +28546,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -28982,6 +28761,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29165,6 +28945,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29334,6 +29115,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29483,6 +29265,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29638,6 +29421,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29792,6 +29576,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -29946,6 +29731,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30101,6 +29887,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30261,6 +30048,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30414,6 +30202,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30569,6 +30358,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30725,6 +30515,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_USER,"
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -30893,6 +30684,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -31063,6 +30855,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -31233,6 +31026,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -31401,6 +31195,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -32234,6 +32029,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE," commented by kaustubh 27 july 2017
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" ddf_get_siteregno(i.site_code__ship,'GSTIN_NO') as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -32408,6 +32204,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -32597,6 +32394,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -32789,6 +32587,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -32979,6 +32778,7 @@ dtlSql = " select '' as TRAN_ID, "
// +" sysdate as ADD_DATE, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
+" i.TRAN_DATE as CHG_DATE, "
// +" sysdate CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
......@@ -33169,6 +32969,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -33349,6 +33150,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -33532,6 +33334,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -33711,6 +33514,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -33889,6 +33693,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34071,6 +33876,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34251,6 +34057,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34425,6 +34232,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34601,6 +34409,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34775,6 +34584,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -34951,6 +34761,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -35127,6 +34938,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM, "
+" ' ' CHG_USER, "
// +" sysdate CHG_DATE, "
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM, "
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -35304,6 +35116,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -35465,6 +35278,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -35622,6 +35436,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -35784,6 +35599,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO, "
+" ' ' as RECO_STATUS, "
......@@ -35952,6 +35768,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -36121,6 +35938,7 @@ dtlSql = " select '' as TRAN_ID, "
+" '' ADD_TERM,"
+" ' ' CHG_USER,"
// +" sysdate CHG_DATE,"
+" i.TRAN_DATE as CHG_DATE, "
+" ' 'CHG_TERM,"
+" c.tax_reg_2 as TAX_REG_NO,"
+" ' ' as RECO_STATUS,"
......@@ -36404,11 +36222,10 @@ dtlSql = " select '' as TRAN_ID, "
String period = "", type = "", sql = "",prdcode = "";
Timestamp docDate = null,lrDate = null,refDateInv = null,orderDate = null;
Timestamp docDate = null,lrDate = null,refDateInv = null,orderDate = null,chgDate = null;
String invoiceid = "",gstTranId = "",tranidRef = "", sitecode="",prdCode = "",recType = "",tranType = "",custCode = "",custName = "",
gstCode = "",submissionType = "",docCheckSum = "",docNo = "",revCharge = "",lrNo = "",reasCode = "",refIdInv = "",
prvAssment = "",orderNo = "",remarks = "",submitStatus = "",
gstCode = "",submissionType = "",docCheckSum = "",docNo = "",revCharge = "",lrNo = "",reasCode = "",refIdInv = "",prvAssment = "",orderNo = "",remarks = "",submitStatus = "",
taxRegNo = "",recoStatus = "",ecomRegNo = "",refSer = "",stateCode = "",docType = "",
lineType = "",gsCode = "",gsDescr = "",unit = "",supplyType = "",remarksDet = "",distOrdTranID = "",
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "",invoiceRef = "", itc_type="",invoiceDate="";
......@@ -36535,6 +36352,14 @@ dtlSql = " select '' as TRAN_ID, "
//invoiceRef = rsSelHdr.getString("invoice_ref");
//Added by kaustubh on 4 April 2018 start
if("2".equalsIgnoreCase(recType))
{
chgDate = rsSelHdr.getTimestamp("CHG_DATE");
}
//Added by kaustubh on 4 April 2018 end
//Added by Kaustubh on 23 jan 2018 start
if("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY) && ("9B1(MISC-CRN-REG)".equals(tranSer) || "9B1(MISC-DN-REG)".equals(tranSer) || "9B2(MISC-CRN-UNREG)".equals(tranSer) || "9B2(MISC-DN-UNREG)".equals(tranSer)))
......@@ -36555,7 +36380,6 @@ dtlSql = " select '' as TRAN_ID, "
lrDate = rsSelHdr.getTimestamp("LR_DATE");
}
if ("9B(1)".equals(tranSer) || "9B1(CRN-REG)".equals(tranSer) ||"9B1(DRN-REG)".equals(tranSer) || "9B2(CRN-UNREG)".equals(tranSer) || "9B2(DRN-UNREG)".equals(tranSer) || "9B2(CRN-UNREG)".equals(tranSer) )
{
refDateInv = rsSelHdr.getTimestamp("REF_DATE__INV");
......@@ -36644,7 +36468,16 @@ dtlSql = " select '' as TRAN_ID, "
pstmtInsHdr.setTimestamp(29,sysDate);
pstmtInsHdr.setString(30,chgTerm);
pstmtInsHdr.setString(31,chgUser);
// pstmtInsHdr.setTimestamp(32,sysDate);
if(chgDate != null)
{
pstmtInsHdr.setTimestamp(32,chgDate);
}
else
{
pstmtInsHdr.setTimestamp(32,sysDate);
}
pstmtInsHdr.setString(33,chgTerm);
pstmtInsHdr.setString(34,taxRegNo);
pstmtInsHdr.setString(35,recoStatus);
......@@ -37071,6 +36904,7 @@ dtlSql = " select '' as TRAN_ID, "
}
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