Commit 72bb8650 authored by kdabholkar's avatar kdabholkar

added new changes regarding misc debit/credit note.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179018 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 60f1dab2
......@@ -51,7 +51,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
GST_PUREXE_TAXCLASS="",GST_PUREXE_TAXENV="",GST_PURNIL_TAXCLASS="",GST_PURNIL_TAXENV="",GST_PURNON_TAXCLASS="",
GST_PURNON_TAXENV="",GST_IMPSER_TAXCLASS="",GST_IMPSER_TAXENV="",GST_IMPGD_TAXCLASS="",GST_IMPGD_TAXENV="",
GST_IMPGDSEZ_TAXCLASS="",GST_IMPGDSEZ_TAXENV="",GST_PURSEZWP_TAXENV="",GST_PURSEZWP_TAXCLASS="",GST_PURSEZWOP_TAXENV="",GST_PURSEZWOP_TAXCLASS="",
GST_PURDE_TAXENV="",GST_PURDE_TAXCLASS="",GST_RCM_TAXCLASS="",GST_RCM_TAXENV="",SALES_DATA_MISC="",PURCHASE_DATA_PORCP="",MISC_VOUC_TYPE="",INV_ACCT_PORCP="";
GST_PURDE_TAXENV="",GST_PURDE_TAXCLASS="",GST_RCM_TAXCLASS="",GST_RCM_TAXENV="",SALES_DATA_MISC="",PURCHASE_DATA_PORCP="",MISC_VOUC_TYPE="",INV_ACCT_PORCP="",IMPL_MIN_RATE_HISTORY="";
Timestamp fromDate = null, toDate = null , fromdateOracle = null, todateOracle=null;
......@@ -377,6 +377,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
GST_NIL_TAXENV = distCommon.getDisparams("999999", "GST_NIL_TAXENV", connGST);
GST_EXE_TAXENV = distCommon.getDisparams("999999", "GST_EXE_TAXENV", connGST);
SALES_DATA_MISC = distCommon.getDisparams("999999", "SALES_DATA_MISC", connGST);
IMPL_MIN_RATE_HISTORY = distCommon.getDisparams("999999", "IMPL_MIN_RATE_HISTORY", connGST);
//modified by kaustubh on 18-07-2017 to resolve missing expression issue end
......@@ -443,6 +446,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
taxClassAllStr = GST_EXPWP_TAXCLASS +","+ GST_EXPWOP_TAXCLASS +","+ GST_SEZWP_TAXCLASS +","+ GST_SEZWOP_TAXCLASS +","+ GST_DE_TAXCLASS +","+
GST_NIL_TAXCLASS +","+ GST_EXE_TAXCLASS;
......@@ -7879,7 +7883,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.tran_id ) = 0 ";
/**
* Detail CDNR Credit Note registered 9C(1) (CRNRCP)*
* Detail CDNR Credit Note registered 9B(1) (CRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
......@@ -8108,7 +8112,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.tran_id ) = 0 ";
/**
* Detail CDNR Debit Note registered 9C(1) (DRNRCP)*
* Detail CDNR Debit Note registered 9B(1) (DRNRCP)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
......@@ -8245,8 +8249,592 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" and u.unit = item.unit ";*/
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B2(DRN-UNREG)");
}
/**
* 9B(1) Header Credit Note registered (CDNRA) - Misc Credit Note registered *
*/
{
hdrSql = "select "
+"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT, "
+"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+"from "
+"(SELECT '' AS TRAN_ID, "
+"'' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+"i.tran_date AS PRD_CODE ,"
+"'1' AS REC_TYPE,"
+"'C' AS GST_TYPE,"
+"'29' AS TRAN_TYPE,"
+"i.sundry_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,"
+"i.tran_date AS DOC_DATE,"
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
+"s.site_code AS REMARKS,"
+"i.tran_id AS REF_ID,"
+"' ' AS SUBMIT_STATUS,"
+"'' ADD_USER,"
+"'' ADD_TERM,"
+"' ' CHG_USER,"
+"' 'CHG_TERM,"
+"c.tax_reg_2 AS TAX_REG_NO,"
+"' ' AS RECO_STATUS,"
+"' ' as ECOM_REG_NO,"
+"'MDRCRC' as REF_SER "
+"FROM misc_drcr_rcp i,misc_drcr_rdet d,customer c,site s,state "
+"WHERE c.cust_code = i.sundry_code "
+"AND s.site_code = i.site_code "
+"AND state.state_code = c.STATE_CODE "
+"AND i.drcr_flag ='C' "
+"AND i.tran_id = d.tran_id "
+"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 = 'MDRCRC' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+" 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 = 'MDRCRC' and ref_id = i.tran_id ) = 0 )"
+" group by "
+" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT,ORDER_NO, "
+" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
/**
* Detail CDNR Credit Note registered 9C(1) (MDRCRC)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
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('MDRCRC' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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,"
+"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" ' ' as GS_DESCR, "
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('MDRCRC' 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('MDRCRC' 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('MDRCRC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
//+" from drcr_rcp i,drcr_rdet it, item "
+" from MISC_DRCR_RCP i,MISC_DRCR_RDET it, item "
+" where i.tran_id = it.tran_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 = 'MDRCRC' "
+"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(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
+" and i.tran_id = ? and it.invoice_ref = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B1(MISC-CRN-REG)");
}
/**
* 9C(1) Header MISC debit Note registered (CDNRA) -MISC Debit Note registered *
*/
{
hdrSql = "select "
+"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT, "
+"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+"from "
+"(SELECT '' AS TRAN_ID, "
+"'' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+"i.tran_date AS PRD_CODE ,"
+"'1' AS REC_TYPE,"
+"'D' AS GST_TYPE,"
+"'30' AS TRAN_TYPE,"
+"i.sundry_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,"
+"i.tran_date AS DOC_DATE,"
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
+"s.site_code AS REMARKS,"
+"i.tran_id AS REF_ID,"
+"' ' AS SUBMIT_STATUS,"
+"'' ADD_USER,"
+"'' ADD_TERM,"
+"' ' CHG_USER,"
+"' '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,misc_drcr_rdet d,customer c,site s,state "
+"WHERE c.cust_code = i.sundry_code "
+"AND s.site_code = i.site_code "
+"AND state.state_code = c.STATE_CODE "
+"AND i.drcr_flag ='D' "
+"AND i.tran_id = d.tran_id "
+"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' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+" 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 )"
+" group by "
+" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT,ORDER_NO, "
+" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
/**
* Detail CDNR debit Note registered 9C(1) (MDRCRD)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
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('MDRCRD' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE 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,"
+"fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE 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
+" ' ' as GS_DESCR, "
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) 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 ,";
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, item "
+" from MISC_DRCR_RCP i,MISC_DRCR_RDET it, item "
+" where i.tran_id = it.tran_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 = '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(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
//+" and i.tran_id = ? ";
+" and i.tran_id = ? and it.invoice_ref = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B1(MISC-DN-REG)");
}
/**
* 9C(1) Header Credit Note Un-registered (CDNRA) - Credit Note Un-registered *
*/
{
hdrSql = "select "
+"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT, "
+"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+"from "
+"(SELECT '' AS TRAN_ID, "
+"'' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+"i.tran_date AS PRD_CODE ,"
+"'1' AS REC_TYPE,"
+"'C' AS GST_TYPE,"
+"'31' AS TRAN_TYPE,"
+"i.sundry_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,"
+"i.tran_date AS DOC_DATE,"
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
+"s.site_code AS REMARKS,"
+"i.tran_id AS REF_ID,"
+"' ' AS SUBMIT_STATUS,"
+"'' ADD_USER,"
+"'' ADD_TERM,"
+"' ' CHG_USER,"
+"' 'CHG_TERM,"
+"c.tax_reg_2 AS TAX_REG_NO,"
+"' ' AS RECO_STATUS,"
+"' ' as ECOM_REG_NO,"
+"'MDRCRC' as REF_SER "
+"FROM misc_drcr_rcp i,misc_drcr_rdet d,customer c,site s,state "
+"WHERE c.cust_code = i.sundry_code "
+"AND s.site_code = i.site_code "
+"AND state.state_code = c.STATE_CODE "
+"AND i.drcr_flag ='C' "
+"AND i.tran_id = d.tran_id "
+"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 = 'MDRCRC' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+" 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 = 'MDRCRC' and ref_id = i.tran_id ) = 0 )"
+" group by "
+" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT,ORDER_NO, "
+" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
/**
* Detail CDNR Credit Note registered 9C(1) (MDRCRC)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
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('MDRCRC' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE AS TAXABLE_AMT,"
+" fn_gst_rate_amt(CAST('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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('MDRCRC' 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,"
+"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE as TAXABLE_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" ' ' as GS_DESCR, "
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('MDRCRC' 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('MDRCRC' 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('MDRCRC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from MISC_DRCR_RCP i,MISC_DRCR_RDET it, item "
+" where i.tran_id = it.tran_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 = 'MDRCRC' "
+"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(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
//+" and i.tran_id = ? ";
+" and i.tran_id = ? and it.invoice_ref = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B2(MISC-CRN-UNREG)");
}
/**
* 9C(2) Header Debit Note Un-registered () - Debit Note un-register registered *
*/
{
hdrSql = "select "
+"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT, "
+"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+"from "
+"(SELECT '' AS TRAN_ID, "
+"'' as TRAN_ID__REF,"
+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+"i.tran_date AS PRD_CODE ,"
+"'1' AS REC_TYPE,"
+"'D' AS GST_TYPE,"
+"'32' AS TRAN_TYPE,"
+"i.sundry_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,"
+"i.tran_date AS DOC_DATE,"
+"(i.amount * i.EXCH_RATE) AS AMOUNT,"
+"'N' AS REVERSE_CHRG,"
+"' ' AS LR_NO,"
+"' ' AS REAS_CODE,"
+"d.invoice_ref AS REF_ID__INV,"
+" '' AS REF_DATE_INV,"
+"'N' AS PROV_ASSMNT,"
+"' ' AS ORDER_NO,"
+"s.site_code AS REMARKS,"
+"i.tran_id AS REF_ID,"
+"' ' AS SUBMIT_STATUS,"
+"'' ADD_USER,"
+"'' ADD_TERM,"
+"' ' CHG_USER,"
+"' '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,misc_drcr_rdet d,customer c,site s,state "
+"WHERE c.cust_code = i.sundry_code "
+"AND s.site_code = i.site_code "
+"AND state.state_code = c.STATE_CODE "
+"AND i.drcr_flag ='D' "
+"AND i.tran_id = d.tran_id "
+"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' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+" 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 )"
+" group by "
+" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
+" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE_INV,PROV_ASSMNT,ORDER_NO, "
+" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
/**
* Detail CDNR Debit Note un-registered 9C(2) (MDRCRD)*
*/
dtlSql = " select '' as TRAN_ID, "
+" it.line_no as LINE_NO, "
+" 'A' as STATUS, "
+" 0 as SR_NO__OLD, "
+" 'G' as LINE_TYPE,";
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('MDRCRD' AS VARCHAR(6)),i.tran_id,CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) * i.EXCH_RATE 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,"
+"fn_gst_rate_amt('MDRCRD',i.tran_id, it.line_no, ' ', 'T') * i.EXCH_RATE 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
+" ' ' as GS_DESCR, "
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) 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 ,";
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, item "
+" from MISC_DRCR_RCP i,MISC_DRCR_RDET it, item "
+" where i.tran_id = it.tran_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 = '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(ti.line_no as integer) = it.line_no ) > 0";
}
else
{
dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
}
dtlSql = dtlSql
//+" and i.tran_id = ? ";
+" and i.tran_id = ? and it.invoice_ref = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"9B2(MISC-DN-UNREG)");
}
/******11A Started ******/
{
/**
......@@ -27389,7 +27977,7 @@ dtlSql = " select '' as TRAN_ID, "
prvAssment = "",orderNo = "",remarks = "",submitStatus = "",
taxRegNo = "",recoStatus = "",ecomRegNo = "",refSer = "",stateCode = "",docType = "",
lineType = "",gsCode = "",gsDescr = "",unit = "",supplyType = "",remarksDet = "",distOrdTranID = "",
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "", itc_type="";
tranIDPorcp = "",gstType = "",remarksHdr = "", refID = "",invoiceRef = "", itc_type="",invoiceDate="";
int srNoOld = 0;
String prdCodeGstHdr ;
String prdCodenew = "";
......@@ -27491,7 +28079,7 @@ dtlSql = " select '' as TRAN_ID, "
lrNo = rsSelHdr.getString("LR_NO");
// lrDate = rsSelHdr.getTimestamp("LR_DATE"); commented by kaustubh 26 july 2017
reasCode = rsSelHdr.getString("REAS_CODE");
refIdInv = rsSelHdr.getString("REF_ID__INV");
// refIdInv = rsSelHdr.getString("REF_ID__INV"); commented by kaustubh on 23 JAN 2018
// refDateInv = rsSelHdr.getTimestamp("REF_DATE__INV"); commented by kaustubh 26 july 2017
prvAssment = rsSelHdr.getString("PROV_ASSMNT");
orderNo = rsSelHdr.getString("ORDER_NO");
......@@ -27510,6 +28098,20 @@ dtlSql = " select '' as TRAN_ID, "
refSer = rsSelHdr.getString("REF_SER");
remarksHdr = rsSelHdr.getString("REMARKS");
refID = rsSelHdr.getString("REF_ID");
invoiceRef = rsSelHdr.getString("invoice_ref");
//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)))
{
refIdInv = getInvoiceId(invoiceRef);
refDateInv = getInvoicedate(refIdInv,connGST);
}
//Added by Kaustubh on 23 jan 2018 end
if("(6A) WPAY".equals(tranSer) || "(6A) WOPAY".equals(tranSer) || "(6B) SEWP".equals(tranSer) || "(6B) SEWOP".equals(tranSer) || "(6C) DE)".equals(tranSer) || "7DIS(Nill)".equals(tranSer))
{
......@@ -27624,6 +28226,7 @@ dtlSql = " select '' as TRAN_ID, "
sql = dtlSql;
pstmtSelDet = connGST.prepareStatement(sql);
if("11(A.1)".equals(tranSer) || "11(A.2)".equals(tranSer) || "11(B.1)".equals(tranSer) || "11(B.2)".equals(tranSer))
{
pstmtSelDet.setTimestamp(1, fromDate);
......@@ -27910,4 +28513,117 @@ dtlSql = " select '' as TRAN_ID, "
return true;
}
public String getInvoiceId(String varValue)
{
System.out.println("str"+varValue);
varValue = varValue.trim();
String[] varValueArry = varValue.split(",");
String lastIndex = varValueArry[varValueArry.length - 1];
System.out.println("lastIndex-invoiceID["+lastIndex+"]");
return lastIndex;
}
public java.sql.Timestamp getInvoicedate(String invoiceId,Connection conn)
{
PreparedStatement pstmt = null;
ResultSet rs = null;
String selSql = "";
java.sql.Timestamp tranDate = null;
try
{
selSql = " select tran_date from invoice where INVOICE_ID = ? ";
pstmt = conn.prepareStatement(selSql);
pstmt.setString(1, invoiceId);
rs = pstmt.executeQuery();
if (rs.next())
{
tranDate = rs.getTimestamp("tran_date");
}
System.out.println("tran_date"+tranDate);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("tran_date from invoice [" + tranDate+"]");
}
catch (SQLException ex)
{
System.out.println("Exception in getInvoicedate::" + selSql + ex.getMessage() + ":");
ex.printStackTrace();
}
return tranDate;
}
/*
public String getDocKey(String invoiceRef,Connection conn)
{
DistCommon distCommon = new DistCommon();
String docKey = "",NoOfKeys = "";
int noOfKeys = 0;
try
{
NoOfKeys = distCommon.getDisparams("999999","IMPL_MIN_RATE_HISTORY",conn);
if ( "NULLFOUND".equals( NoOfKeys ) )
{
docKey = "";
}
else
{
noOfKeys = Integer.parseInt(NoOfKeys);
}
for(int keyCtr = 1; keyCtr <= noOfKeys; keyCtr++)
{
}
}
catch(Exception e)
{
System.out.println("GstDataPrc.returnDocKey()["+e.getMessage()+"]");
}
return docKey;
}
*/
private java.sql.Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{
String dbDateStr = "";
if(dateStr != null && !dateStr.equals(""))
{
if(dateStr.indexOf(":") != -1)
{
System.out.println("inside logic"+dateStr);
return java.sql.Timestamp.valueOf(dateStr);
}
else
{
System.out.println("inside ");
dbDateStr =(new E12GenericUtility()).getValidDateTimeString(dateStr, (new E12GenericUtility()).getApplDateFormat(), (new E12GenericUtility()).getDBDateTimeFormat());
return java.sql.Timestamp.valueOf(dbDateStr);
}
}
else
{
return null;
}
}
}
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