Skip to content

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

minor changes in section B2B,B2CL,B2CS 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180312 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5cce8c50
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 4505dd50
......@@ -868,7 +868,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 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+") ";
//hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
if(taxEnvAllStr.length() > 0)
{
......@@ -1026,6 +1028,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"4(A) S-INV");
System.out.println("inside D-ISS");
/**
* 4(A) D-ISS Header DistOrd Issue *
*/
......@@ -1108,6 +1111,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if(taxClassAllStr.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
//hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
if(taxEnvAllStr.length() > 0)
{
......@@ -1337,6 +1341,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if(taxClassAllStr.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
//hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
if(taxEnvAllStr.length() > 0)
{
......@@ -1547,6 +1552,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if(taxClassAllStr.length() > 0)
{
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
//hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
if(taxEnvAllStr.length() > 0)
{
......@@ -2399,8 +2405,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and ti.tran_id = i.invoice_id and tm.tax_type in ('I','J') ";
if(taxClassAllStr.length() > 0)
{
//hdrSql = hdrSql +" and ti.tax_class in ("+taxClassAllStr+") "; changed by kaustubh on 22 aug
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
// hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
hdrSql = hdrSql +" ) > 0 "
+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
......@@ -4147,8 +4153,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 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 in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
// hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+") ) ";
}
hdrSql = hdrSql +" ) > 0 "
+" and i.tran_date between ? and ? "
......@@ -4512,8 +4518,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 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 in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
// hdrSql = hdrSql +" and ti.tax_class not in ("+taxClassAllStr+") ";
hdrSql = hdrSql +" and (ti.tax_class not in ("+taxClassAllStr+") or ti.tax_chap not in ("+TAX_CHAP_STR+")) ";
}
hdrSql = hdrSql +" ) > 0 "
+" and i.tran_date between ? and ? "
......@@ -21448,13 +21455,6 @@ dtlSql = " select '' as TRAN_ID, "
System.out.println("strDte"+strDate);
try{
/**** Added on 09-02-2018 Query for Bank charges applied in case of Direct Payments as Service received from Bank -START ****/
......@@ -31228,7 +31228,6 @@ dtlSql = " select '' as TRAN_ID, "
*/
private java.sql.Timestamp getTimeStamp(String dateStr) throws ITMException, Exception
{
String dbDateStr = "";
......@@ -31252,6 +31251,8 @@ 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