Commit a3b7a7ce authored by kdabholkar's avatar kdabholkar

commit the changes regarding tran_type chnage in GSTR2 queries

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183847 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 485b07bb
...@@ -23770,7 +23770,7 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -23770,7 +23770,7 @@ dtlSql = " select '' as TRAN_ID, "
+ "i.tran_date as PRD_CODE," + "i.tran_date as PRD_CODE,"
+" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc. +" '2' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
+" 'R' as GST_TYPE," +" 'R' as GST_TYPE,"
+" '01' as TRAN_TYPE,"// -- b2b,b2c +" '06' as TRAN_TYPE,"// -- b2b,b2c
+" i.sundry_code as CUST_CODE," +" i.sundry_code as CUST_CODE,"
+" c.supp_name as CUST_NAME," +" c.supp_name as CUST_NAME,"
+" state.GST_CODE,"// -- 2 digit code +" state.GST_CODE,"// -- 2 digit code
...@@ -36355,6 +36355,7 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -36355,6 +36355,7 @@ dtlSql = " select '' as TRAN_ID, "
//Added by kaustubh on 4 April 2018 start //Added by kaustubh on 4 April 2018 start
if("2".equalsIgnoreCase(recType)) if("2".equalsIgnoreCase(recType))
{ {
chgDate = rsSelHdr.getTimestamp("CHG_DATE"); chgDate = rsSelHdr.getTimestamp("CHG_DATE");
} }
//Added by kaustubh on 4 April 2018 end //Added by kaustubh on 4 April 2018 end
...@@ -36365,7 +36366,7 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -36365,7 +36366,7 @@ dtlSql = " select '' as TRAN_ID, "
if("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY) && ("9B1(MISC-CRN-REG)".equals(tranSer) || "9B1(MISC-DN-REG)".equals(tranSer) || "9B2(MISC-CRN-UNREG)".equals(tranSer) || "9B2(MISC-DN-UNREG)".equals(tranSer))) if("Y".equalsIgnoreCase(IMPL_MIN_RATE_HISTORY) && ("9B1(MISC-CRN-REG)".equals(tranSer) || "9B1(MISC-DN-REG)".equals(tranSer) || "9B2(MISC-CRN-UNREG)".equals(tranSer) || "9B2(MISC-DN-UNREG)".equals(tranSer)))
{ {
if(refIdInv != null && "".equalsIgnoreCase(refIdInv.trim()) ) if(refIdInv != null && refIdInv.trim().length() > 0 )
{ {
refIdInv = getInvoiceId(refIdInv); refIdInv = getInvoiceId(refIdInv);
refDateInv = getInvoicedate(refIdInv,connGST); refDateInv = getInvoicedate(refIdInv,connGST);
...@@ -36792,7 +36793,7 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -36792,7 +36793,7 @@ dtlSql = " select '' as TRAN_ID, "
public String getInvoiceId(String varValue) public String getInvoiceId(String varValue)
{ {
System.out.println("str"+varValue); System.out.println("Invoice_ref_str"+varValue);
varValue = varValue.trim(); varValue = varValue.trim();
String[] varValueArry = varValue.split(","); String[] varValueArry = varValue.split(",");
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