Skip to content

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

commited changes of gp_no 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179259 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6c20f6d2
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 64 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 518bcfb3
...@@ -820,8 +820,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -820,8 +820,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE, " // R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE, " // R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/* changed by kaustubh*/ /* changed by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+" case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +" case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " Commented on 29 jan 2018 as told by devendra sir.
// +" i.invoice_id as DOC_NO," +" i.invoice_id as DOC_NO,"
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," changed on 7 sep 2017 // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," changed on 7 sep 2017
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -1055,8 +1055,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -1055,8 +1055,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/*modified by kaustubh*/ /*modified by kaustubh*/
/*+" i.GP_NO as DOC_NO,"*/ /*+" i.GP_NO as DOC_NO,"*/
+" case when i.GP_NO is null then i.tran_id else i.GP_NO end as DOC_NO, " // +" case when i.GP_NO is null then i.tran_id else i.GP_NO end as DOC_NO, "
// +" i.tran_id as DOC_NO, " +" i.tran_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE,"*/ /*+" i.gp_date as DOC_DATE,"*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -1287,8 +1287,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -1287,8 +1287,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject +" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
+" case when i.gp_no is null then i.tran_id else i.gp_no end as DOC_NO," //---changed by kaustubh on 9 sep 2017 // +" case when i.gp_no is null then i.tran_id else i.gp_no end as DOC_NO," //---changed by kaustubh on 29 jan 2018 as told by devendra sir
//+" i.tran_id as DOC_NO, " +" i.tran_id as DOC_NO, "
// +" case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +" case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.net_amt as AMOUNT," +" i.net_amt as AMOUNT,"
...@@ -2200,8 +2200,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -2200,8 +2200,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/*modified by kaustubh*/ /*modified by kaustubh*/
/*+" i.gp_no as DOC_NO,"*/ /*+" i.gp_no as DOC_NO,"*/
+"case when i.gp_no is null then i.invoice_id else i.gp_no end as DOC_NO," // +"case when i.gp_no is null then i.invoice_id else i.gp_no end as DOC_NO,"
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE,"*/ /*+" i.gp_date as DOC_DATE,"*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," changed on 7 sep // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," changed on 7 sep
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -2658,8 +2658,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -2658,8 +2658,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'WPAY' as DOC_TYPE, " +" 'WPAY' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/*+" i.GP_NO as DOC_NO, "*/ /*+" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -2889,8 +2889,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -2889,8 +2889,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'WOPAY' as DOC_TYPE, " +" 'WOPAY' as DOC_TYPE, "
/* modofied by kaustubh*/ /* modofied by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -3120,8 +3120,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -3120,8 +3120,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'SEWP' as DOC_TYPE, " +" 'SEWP' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/*+" i.GP_NO as DOC_NO, "*/ /*+" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -3348,8 +3348,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -3348,8 +3348,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'SEWOP' as DOC_TYPE, " +" 'SEWOP' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -3571,11 +3571,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -3571,11 +3571,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'DE' as DOC_TYPE, " +" 'DE' as DOC_TYPE, "
/* modified by Kaustubh*/ /* modified by Kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
// +" i.net_amt as AMOUNT, " // +" i.net_amt as AMOUNT, "
+" (i.NET_AMT * i.EXCH_RATE) as AMOUNT, " +" (i.NET_AMT * i.EXCH_RATE) as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
...@@ -3798,11 +3798,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -3798,11 +3798,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE, " +" 'R' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/*+" i.GP_NO as DOC_NO, "*/ /*+" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
+" i.net_amt as AMOUNT, " +" i.net_amt as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
...@@ -4014,8 +4014,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4014,8 +4014,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE, " +" 'R' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -4232,8 +4232,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4232,8 +4232,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NRATD' as DOC_TYPE, " +" 'NRATD' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
//+" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -4447,8 +4447,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4447,8 +4447,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'EXEMP' as DOC_TYPE, " +" 'EXEMP' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +"i.invoice_id as DOC_NO, " +"i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -4663,8 +4663,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4663,8 +4663,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NOGST' as DOC_TYPE, " +" 'NOGST' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -4874,8 +4874,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -4874,8 +4874,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/*modified by kaustubh*/ /*modified by kaustubh*/
/*+" i.GP_NO as DOC_NO,"*/ /*+" i.GP_NO as DOC_NO,"*/
+" case when i.GP_NO is null then i.tran_id else i.GP_NO end as DOC_NO, " // +" case when i.GP_NO is null then i.tran_id else i.GP_NO end as DOC_NO, "
// +" i.tran_id as DOC_NO, " +" i.tran_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE,"*/ /*+" i.gp_date as DOC_DATE,"*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -5080,8 +5080,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5080,8 +5080,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '' as DOC_CHECKSUM," +" '' as DOC_CHECKSUM,"
+" 'NRATD' as DOC_TYPE, " +" 'NRATD' as DOC_TYPE, "
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO," +" i.invoice_id as DOC_NO,"
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -5296,8 +5296,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5296,8 +5296,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'EXEMP' as DOC_TYPE, " +" 'EXEMP' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +"i.invoice_id as DOC_NO," +"i.invoice_id as DOC_NO,"
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -5507,8 +5507,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5507,8 +5507,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NOGST' as DOC_TYPE, " +" 'NOGST' as DOC_TYPE, "
/* modfied by kaustubh */ /* modfied by kaustubh */
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -5725,8 +5725,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5725,8 +5725,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NRATD' as DOC_TYPE, " +" 'NRATD' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -5940,8 +5940,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -5940,8 +5940,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'EXEMP' as DOC_TYPE, " +" 'EXEMP' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " //+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -6157,8 +6157,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6157,8 +6157,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NOGST' as DOC_TYPE, " +" 'NOGST' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE, " +" i.tran_date as DOC_DATE, "
...@@ -6377,8 +6377,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6377,8 +6377,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NRATD' as DOC_TYPE, " +" 'NRATD' as DOC_TYPE, "
/*modified by kaustubh*/ /*modified by kaustubh*/
/*+" i.GP_NO as DOC_NO, "*/ /*+" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -6592,8 +6592,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6592,8 +6592,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'EXEMP' as DOC_TYPE, " +" 'EXEMP' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -6808,8 +6808,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -6808,8 +6808,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'NOGST' as DOC_TYPE, " +" 'NOGST' as DOC_TYPE, "
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -7028,11 +7028,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7028,11 +7028,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 'WPAY' as DOC_TYPE, " +" 'WPAY' as DOC_TYPE, "
/* modfified by kaustubh*/ /* modfified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
+"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
// +" i.invoice_id as DOC_NO, " +" i.invoice_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE, "*/ /*+" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.net_amt as AMOUNT, " +" i.net_amt as AMOUNT, "
+" 'N' as REVERSE_CHRG, " +" 'N' as REVERSE_CHRG, "
+" ' ' as LR_NO, " +" ' ' as LR_NO, "
...@@ -7271,7 +7271,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7271,7 +7271,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, " +" ' ' as REAS_CODE, "
// +" i.invoice_id as REF_ID__INV, " // +" i.invoice_id as REF_ID__INV, "
+" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, " // +" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, "
+" inv.invoice_id as REF_ID__INV,"
// +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, " // +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" inv.tran_date as REF_DATE__INV, " +" inv.tran_date as REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, " +" 'N' as PROV_ASSMNT, "
...@@ -7514,7 +7515,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7514,7 +7515,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, " +" ' ' as REAS_CODE, "
// +" i.invoice_id as REF_ID__INV, " // +" i.invoice_id as REF_ID__INV, "
+" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, " // +" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, "
+" inv.invoice_id as REF_ID__INV,"
// +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, " // +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" inv.tran_date as REF_DATE__INV, " +" inv.tran_date as REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, " +" 'N' as PROV_ASSMNT, "
...@@ -7839,7 +7841,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -7839,7 +7841,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, " +" ' ' as REAS_CODE, "
// +" i.invoice_id as REF_ID__INV, " // +" i.invoice_id as REF_ID__INV, "
+" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, " // +" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, "
+" inv.invoice_id as REF_ID__INV,"
// +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, " // +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
+" inv.tran_date as REF_DATE__INV, " +" inv.tran_date as REF_DATE__INV, "
+" 'N' as PROV_ASSMNT, " +" 'N' as PROV_ASSMNT, "
...@@ -8067,7 +8070,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -8067,7 +8070,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" null as LR_DATE," commented by kaustubh 27 july 2017 // +" null as LR_DATE," commented by kaustubh 27 july 2017
+" ' ' as REAS_CODE, " +" ' ' as REAS_CODE, "
// +" i.invoice_id as REF_ID__INV, " // +" i.invoice_id as REF_ID__INV, "
+" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, " // +" case when inv.gp_no is null then inv.invoice_id else inv.gp_no end AS REF_ID__INV, "
+" inv.invoice_id as REF_ID__INV,"
// +" (select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT," // +" (select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT,"
+" '' as UNIT, " +" '' as UNIT, "
// +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, " // +"case when inv.gp_date is null then inv.tran_date else inv.gp_date end as REF_DATE__INV, "
...@@ -13566,7 +13570,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -13566,7 +13570,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/* modified by kaustubh*/ /* modified by kaustubh*/
/* +" i.GP_NO as DOC_NO, "*/ /* +" i.GP_NO as DOC_NO, "*/
// +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, " // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
+" i.tran_id as DOC_NO, " +" i.tran_id as DOC_NO, "
/* +" i.gp_date as DOC_DATE, "*/ /* +" i.gp_date as DOC_DATE, "*/
// + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // + "case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -13751,8 +13755,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc ...@@ -13751,8 +13755,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/*+" i.GP_NO as DOC_NO,"*/ /*+" i.GP_NO as DOC_NO,"*/
+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, " //+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, "
// +" i.tran_id as DOC_NO, " +" i.tran_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE,"*/ /*+" i.gp_date as DOC_DATE,"*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
...@@ -17691,7 +17695,8 @@ hdrSql = " select '' as TRAN_ID," ...@@ -17691,7 +17695,8 @@ hdrSql = " select '' as TRAN_ID,"
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject +" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, " //+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, "
+"i.tran_id__ISS as DOC_NO,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.net_amt as AMOUNT," +" i.net_amt as AMOUNT,"
+" 'N' as REVERSE_CHRG," +" 'N' as REVERSE_CHRG,"
...@@ -17860,7 +17865,8 @@ hdrSql = " select '' as TRAN_ID," ...@@ -17860,7 +17865,8 @@ hdrSql = " select '' as TRAN_ID,"
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject +" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, " //+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, "
+" i.tran_id__ISS as DOC_NO,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.net_amt as AMOUNT," +" i.net_amt as AMOUNT,"
+" 'N' as REVERSE_CHRG," +" 'N' as REVERSE_CHRG,"
...@@ -20642,7 +20648,8 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -20642,7 +20648,8 @@ dtlSql = " select '' as TRAN_ID, "
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
/*+" i.GP_NO as DOC_NO,"*/ /*+" i.GP_NO as DOC_NO,"*/
+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, " // +" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, "
+" i.tran_id__ISS as DOC_NO, "
// +" i.tran_id as DOC_NO, " // +" i.tran_id as DOC_NO, "
/*+" i.gp_date as DOC_DATE,"*/ /*+" i.gp_date as DOC_DATE,"*/
// +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE," // +"case when i.gp_date is null then i.tran_date else i.gp_date end as DOC_DATE,"
...@@ -25261,7 +25268,8 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -25261,7 +25268,8 @@ dtlSql = " select '' as TRAN_ID, "
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject +" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM," +" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment +" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
+" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, " // +" case when i.GP_NO is null then i.tran_id__ISS else i.GP_NO end as DOC_NO, "
+"i.tran_id__ISS as DOC_NO,"
+" i.tran_date as DOC_DATE," +" i.tran_date as DOC_DATE,"
+" i.net_amt as AMOUNT," +" i.net_amt as AMOUNT,"
+" 'N' as REVERSE_CHRG," +" 'N' as REVERSE_CHRG,"
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