Skip to content

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

Fixed Syntax error in GSTR2 detail queries 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188541 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6b9379e1
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 29 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 2949375c
...@@ -1447,9 +1447,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -1447,9 +1447,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
} }
dtlSql = dtlSql dtlSql = dtlSql
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC," +" ' ' as REMARKS ,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT," +" 'is' as ITC_TYPE , ";
+" ' ' as REMARKS ,";
//+"fn_get_gst_rate('VOUCH',i.tran_id, it.line_no) as gst_rate " //+"fn_get_gst_rate('VOUCH',i.tran_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
...@@ -5652,7 +5651,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5652,7 +5651,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and st_c.GST_CODE <> '00' " +" and st_c.GST_CODE <> '00' "
// +" and (select count(1) from taxtran ti where ti.tran_code = 'MDRCRD' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP // +" and (select count(1) from taxtran ti where ti.tran_code = 'MDRCRD' ) > 0 " //modified by kaustubh on 26 july 2017 add DRNCRP
+"AND (SELECT COUNT(1) FROM taxtran ti,tax tm WHERE tm.tax_code = ti.tax_code " +"AND (SELECT COUNT(1) FROM taxtran ti,tax tm WHERE tm.tax_code = ti.tax_code "
+ " and ti.tran_code = 'MDRCRC'" + " and ti.tran_code = 'MDRCRD'"
+ " and i.TRAN_ID =ti.TRAN_ID" + " and i.TRAN_ID =ti.TRAN_ID"
+" and ti.tax_perc > 0" +" and ti.tax_perc > 0"
+ " and tm.tax_type in ('G','H','I','J')"; + " and tm.tax_type in ('G','H','I','J')";
...@@ -6057,7 +6056,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6057,7 +6056,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " //+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -6201,7 +6200,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6201,7 +6200,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -6346,7 +6345,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6346,7 +6345,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -6491,7 +6490,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6491,7 +6490,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -6633,7 +6632,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6633,7 +6632,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -6777,7 +6776,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6777,7 +6776,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -6921,7 +6920,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6921,7 +6920,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7063,7 +7062,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7063,7 +7062,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7208,7 +7207,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7208,7 +7207,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " //+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7350,7 +7349,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7350,7 +7349,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7492,7 +7491,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7492,7 +7491,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7634,7 +7633,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7634,7 +7633,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7784,7 +7783,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7784,7 +7783,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -7928,7 +7927,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7928,7 +7927,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8071,7 +8070,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8071,7 +8070,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8215,7 +8214,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8215,7 +8214,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " //+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8361,7 +8360,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8361,7 +8360,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8505,7 +8504,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8505,7 +8504,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8647,7 +8646,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8647,7 +8646,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -8791,7 +8790,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8791,7 +8790,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql dtlSql = dtlSql
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+" (it.QUANTITY) as QUANTITY," +" (it.QUANTITY) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -9021,7 +9020,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -9021,7 +9020,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.descr as GS_DESCR," // +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY," // +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -9265,7 +9264,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -9265,7 +9264,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.descr as GS_DESCR," // +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY," // +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -9585,7 +9584,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -9585,7 +9584,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/*+" u.descr as UNIT,"*/ /*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT," // +" item.UNIT as UNIT,"
//+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, " //+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY," // +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
...@@ -9822,7 +9821,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -9822,7 +9821,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.descr as GS_DESCR," // +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, " +" ' ' 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, " // +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
+"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, " +"(select case when udf_str2 is null then 'OTH' else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY," // +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY," +" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ; +" 'OE' as SUPPLY_TYPE," ;
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