Skip to content

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

commit the following changes 

- Remove the special character from doc_no
- Correct the NVL condition while fetching 'HSN' from function.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@193481 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c58745bb
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 31 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ e7aeb6cc
......@@ -23,6 +23,8 @@ import java.util.Calendar;
import java.util.Date;
//import javax.ejb.Stateless;
//import oracle.sql.TIMESTAMP;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.w3c.dom.Document;
......@@ -10060,6 +10062,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
hdrSql = hdrSql
+" and (select count(1) from taxtran ti where ti.tran_code = 'MDRCRC' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+" and trim(c.tax_reg_2) <> 'UNREGISTER' "
+" 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') AND to_number(trim(ti.line_no)) = d.line_no ) > 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 = 'MDRCRC' and ref_id = i.tran_id ) = 0 )"
......@@ -26232,7 +26236,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -26432,7 +26436,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -26612,7 +26616,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -26971,7 +26975,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ " from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -27147,7 +27151,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -27319,7 +27323,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -27658,7 +27662,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -27828,7 +27832,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -28000,7 +28004,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -28370,7 +28374,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ " from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -28542,7 +28546,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -28714,7 +28718,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -29090,7 +29094,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -29259,7 +29263,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -29431,7 +29435,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -29941,7 +29945,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -30115,7 +30119,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -30309,7 +30313,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -30481,7 +30485,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -30671,7 +30675,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -31073,7 +31077,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -31249,7 +31253,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -32036,7 +32040,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32192,7 +32196,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32351,7 +32355,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32510,7 +32514,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32673,7 +32677,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32830,7 +32834,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -32989,7 +32993,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) as GS_CODE, " ;
......@@ -33148,7 +33152,7 @@ dtlSql = " select '' as TRAN_ID, "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GH.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code<>'X') "
+" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=GD.anal_code) "
+" WHEN (NVL(GH.anal_code,'X')='X' AND GD.anal_code='X') "
+" WHEN (NVL(GH.anal_code,'X')='X' AND NVL(GD.anal_code,'X')='X') "
+ " THEN fn_get_hsn_sac(GH.site_code,'',GD.acct_code) END "
+ "from misc_voucher GH,misc_vouchdet GD where GH.tran_id=GD.tran_id and GH.tran_id=i.tran_id "
+ " and it.line_no=GD.line_no ) GS_CODE, " ;
......@@ -38150,7 +38154,7 @@ dtlSql = " select '' as TRAN_ID, "
pstmtInsHdr.setString(12,"M");
pstmtInsHdr.setString(13,docCheckSum);
pstmtInsHdr.setString(14,docType);
pstmtInsHdr.setString(15,docNo);
pstmtInsHdr.setString(15,removeSpecialChar(docNo));
pstmtInsHdr.setTimestamp(16,docDate);
pstmtInsHdr.setDouble(17,amount);
pstmtInsHdr.setString(18,"N");
......@@ -38604,6 +38608,34 @@ dtlSql = " select '' as TRAN_ID, "
/***
* Added New Method by kaustubh to remove special characters from doc_no 27 Nov 2018 Start
*/
private String removeSpecialChar (String billNo) throws ITMException, Exception
{
System.out.println("inside removeSpecialChar");
if(billNo != null && !billNo.equals(""))
{
Pattern pt = Pattern.compile("[^a-zA-Z0-9]");
Matcher match= pt.matcher(billNo);
while(match.find())
{
String s= match.group();
billNo=billNo.replaceAll("\\"+s, "");
}
System.out.println("Doc_no after Remove Specail Characters"+billNo);
}
return billNo;
}
/***
* Added New Method by kaustubh to remove special characters from doc_no 27 Nov 2018 End
*/
}
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