Commit 9cf6156a authored by kdabholkar's avatar kdabholkar

changes in nill distributed query


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106700 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1e213394
...@@ -4316,15 +4316,15 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4316,15 +4316,15 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id "; //+" and (select count(1) from taxtran ti where ti.tran_code = 'D-ISS' and ti.tran_id = i.tran_id ";
+" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'D-ISS' " +" and (select count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_code = 'D-ISS' "
+" and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I','J') "; +" and ti.tran_id = i.tran_id and tm.tax_type in ('G','H','I','J') ";
if(taxClassAllStr.length() > 0) if(GST_NIL_TAXCLASS.length() > 0)
{ {
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") "; hdrSql = hdrSql +" and ti.tax_class in ("+GST_NIL_TAXCLASS+") ";
} }
if(taxEnvAllStr.length() > 0) if(GST_NIL_TAXENV.length() > 0)
{ {
hdrSql = hdrSql +" and ti.tax_env not in ("+taxEnvAllStr+") "; hdrSql = hdrSql +" and ti.tax_env in ("+GST_NIL_TAXENV+") ";
} }
hdrSql = hdrSql +" ) > 0 " hdrSql = hdrSql +" ) > 0 "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' " +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
/*+" and i.conf_date between ? and ? " modified by kaustubh on 27 july */ /*+" and i.conf_date between ? and ? " modified by kaustubh on 27 july */
+" and i.tran_date between ? and ? " +" and i.tran_date between ? and ? "
......
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