Skip to content

B
business-java
Commit 1aa978e0 authored by pchavan's avatar pchavan
Browse files
Options

commited new chnages to resolve issue of connection time out 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@172112 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fa73b7a8
Show whitespace changes
Inline Side-by-side
Showing with 683 additions and 289 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableData.java
View file @ 1aa978e0
......@@ -2,11 +2,13 @@ package ibase.webitm.ejb.gstclient;
import ibase.system.config.ConnDriver;
import ibase.utility.CommonConstants;
import ibase.webitm.bean.gstclient.GstDetailData;
import ibase.webitm.bean.gstclient.GstHeaderData;
import ibase.webitm.bean.gstclient.GstHrdDetData;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
......@@ -16,9 +18,11 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import org.jboss.ejb3.annotation.TransactionTimeout;
import org.json.JSONObject;
import org.w3c.dom.Document;
......@@ -27,15 +31,18 @@ import com.itextpdf.text.log.SysoCounter;
import com.mashape.unirest.http.HttpResponse;
import com.mashape.unirest.http.JsonNode;
import com.mashape.unirest.http.Unirest;
import com.mashape.unirest.request.HttpRequest;
import com.mashape.unirest.request.HttpRequestWithBody;
import com.mashape.unirest.request.body.RequestBodyEntity;
@Stateless
//@TransactionTimeout(60000)
//@StatelessDeployment(transactionTimeout=6000)
public class GetGstTableData extends ActionHandlerEJB implements GetGstTableDataRemote, GetGstTableDataLocal
{
@Override
public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String forced_flag) throws RemoteException,ITMException
@Override
public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag) throws RemoteException,ITMException
{
System.out.println("Json for gst table data transfer called");
Document dom = null;
......@@ -52,7 +59,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
}
*/
System.out.println("TRAN id:"+tran_id+":");
resString = getGstTableData(tran_id,xtraParams,sitecode,forced_flag);
resString = getGstTableData(tran_id,xtraParams,sitecode, period, type,forced_flag);
}catch(Exception e)
{
......@@ -65,13 +72,13 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
}
//Changed by wasim on to overload getGstTableData with connection parameter [START]
public String getGstTableData(String tran_id, String xtraParams ,String sitecode,String forced_flag) throws Exception
public String getGstTableData(String tran_id, String xtraParams ,String sitecode, String period, String type, String forced_flag) throws Exception
{
String retString = "";
Connection conn = null;
try
{
retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode, conn);
retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode,period,type, conn);
}
catch(Exception e)
{
......@@ -85,10 +92,21 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
//Changed by wasim on to overload getGstTableData with connection parameter [END]
//public String getGstTableData(String tran_id, String xtraParams , String forced_flag) throws RemoteException,ITMException
public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, Connection conn) throws RemoteException,ITMException
public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, String period, String type, Connection conn) throws RemoteException,ITMException
{
System.out.println("Inside GetGstTableData");
System.out.println("Newsitecode::"+sitecode);
System.out.println("New period::"+period);
System.out.println("New type::"+type);
String s=period;
String s1= s.substring(0,4);
String s2= s.substring(4,6);
String newPeriod=s2.concat(s1);
System.out.println(s1);
System.out.println(s2);
System.out.println("after conversion::"+newPeriod);
//Connection conn = null;
String sql,sql1,sql2;
......@@ -96,8 +114,8 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
//final String APPLICATION_JSON = "application/json";
final String APPLICATION_JSON = "APPLICATION_FORM_URLENCODED";
ArrayList<GstHeaderData> headerDatalist = new ArrayList<GstHeaderData>();
ArrayList<String> tranIDList = new ArrayList<String>();
ArrayList<GstHeaderData> headerDatalist = null;
ArrayList<String> tranIDList = null;
ArrayList<GstDetailData> detailDatalist = null;
GstHrdDetData gstHrdDetData = new GstHrdDetData();
......@@ -105,14 +123,17 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
GstDetailData gstDetailData = null;
String retString="";
boolean isError = false;
DistCommon distCommon = new DistCommon();
//String GST_TABLE_URL="http://192.168.0.225:9090/ibase/rest/service/insertdata";
String GST_TABLE_URL="";
int connectionTimeout=0,socketTimeout=0,totalNoRecords=0,
multipleOfRecords=0,noOfIteration=0,reminder = 0, noOfSlots = 10, newType=0;
PreparedStatement pstmt = null, pstmt1 = null, pstmt2 = null;
ResultSet rs = null, rs1 = null;
boolean isLocConn = false;
boolean isSuccess = false;
ConnDriver connDriver = null;
try
......@@ -160,14 +181,125 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
return retString;
}
sql = " SELECT count(*) FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? and PRD_CODE= ? and REC_TYPE= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sitecode);
pstmt.setString(2, newPeriod);
if ("S".equalsIgnoreCase(type))
{
pstmt.setInt(3, 1);
}
else
{
pstmt.setInt(3, 2);
}
System.out.println("query::"+pstmt);
rs = pstmt.executeQuery();
if(rs.next())
{
totalNoRecords = rs.getInt(1);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(totalNoRecords==0)
{
System.out.println("inside error condition::"+totalNoRecords);
return retString = itmDBAccessLocal.getErrorString("","VNINVDATA","","",conn);
//retString="No Data Found For Sync Operation";
}
System.out.println("totalNoRecords::"+totalNoRecords);
String slotCount = distCommon.getDisparams("999999", "NO_OF_SLOT", conn);
if("NULLFOUND".equalsIgnoreCase(slotCount))
{
noOfSlots = 100;
}
else
{
noOfSlots = Integer.parseInt(slotCount);
}
if(totalNoRecords >= totalNoRecords)
{
noOfIteration = totalNoRecords / noOfSlots;
reminder = totalNoRecords % noOfSlots;
System.out.println("noOfIteration::"+noOfIteration);
System.out.println("reminder::"+reminder);
}
else
{
noOfIteration = 1;
}
if(reminder > 0)
{
noOfIteration = noOfIteration + 1;
}
// totalNoRecords=
//lOOP Total no of Records SELECT count(*) FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? and PRD_CODE= ?, for 1g 1050;
//Parmater for Multiple of records in one slot, for e.g 100
//Total no of iteration = no of Records / records in one slot 10
//Reminder = no of Records % records in one slot 50
//if Reminder > 0 then iteration + 1 eg. 11
//SELECT * FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? and PRD_CODE= ? and row_num = ?
//if remider == no of Records - Parmater ro num =reminder else paramter
//sql = "SELECT * FROM GST_DATA_HDR WHERE TRAN_ID IN ('0000000974','0000000989','0000001039')";
//sql = " SELECT * FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' ";
sql = " SELECT * FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? ";
pstmt = conn.prepareStatement(sql);
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = " SELECT * FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? and PRD_CODE= ? AND REC_TYPE = ? and FETCH FIRST ? ROWS ONLY<= ? ";
}
else
{
sql = " SELECT * FROM GST_DATA_HDR WHERE SUBMIT_STATUS = 'P' and site_code = ? and PRD_CODE= ? AND REC_TYPE = ? and rownum <= ?";
}
/* pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sitecode);
pstmt.setString(2, newPeriod);*/
if ("S".equalsIgnoreCase(type))
{
newType= 1;
}
else
{
newType= 2;
}
//pstmt.setInt(4, noOfSlots);
for(int lCtr = 0 ;lCtr <= noOfIteration; lCtr++)
{
System.out.println("query::"+pstmt);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sitecode);
pstmt.setString(2, newPeriod);
pstmt.setInt(3, newType);
pstmt.setInt(4, noOfSlots);
rs = pstmt.executeQuery();
headerDatalist = new ArrayList<GstHeaderData>();
tranIDList = new ArrayList<String>();
while(rs.next())
{
detailDatalist = new ArrayList<GstDetailData>();
......@@ -254,7 +386,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
gstDetailData.itcCess=rs1.getDouble("ITC_CESS");
gstDetailData.gstRate=rs1.getDouble("GST_RATE");
System.out.println("ITC_CESS"+rs1.getInt("ITC_CESS"));
//System.out.println("ITC_CESS"+rs1.getInt("ITC_CESS"));
detailDatalist.add(gstDetailData);
......@@ -273,8 +405,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
headerDatalist.add(gstHeaderData);
}
}//while(rs.next())
if(pstmt != null)
{
......@@ -287,11 +418,80 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
rs = null;
}
if(tranIDList != null)
{
System.out.println("headerDatalist Size ===>["+tranIDList.size()+"]["+tranIDList.toString()+"]");
}
System.out.println("headerDatalist Size ===>["+headerDatalist.size()+"]");
if(headerDatalist.size()>0)
{
gstHrdDetData.headerData=headerDatalist;
ObjectMapper objectMapper = new ObjectMapper();
String json = objectMapper.writeValueAsString(gstHrdDetData);
JSONObject gstr1HeaderObj = new JSONObject();
gstr1HeaderObj.put("data", json);
RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
// .setTimeouts(connectionTimeout,socketTimeout)
.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED)
.body(new JsonNode(gstr1HeaderObj.toString()));
System.out.println("request body ["+request.getBody()+"]");
HttpResponse<String> gstr1Resp = request.getHttpRequest().asString();
System.out.println("status["+gstr1Resp.getStatus()+"]body["+gstr1Resp.getBody()+"]");
String status =gstr1Resp.getBody();
if("successfull".equalsIgnoreCase(status))
{
sql2="update gst_data_hdr set submit_status='Y' where tran_id=?";
pstmt2 = conn.prepareStatement(sql2);
for (int i = 0; i < tranIDList.size(); i++)
{
pstmt2.setString(1,tranIDList.get(i));
pstmt2.addBatch();
pstmt2.clearParameters();
}
pstmt2.executeBatch();
if(pstmt2 != null)
{
pstmt2.close();
pstmt2 = null;
}
isSuccess = true;
}
}
}//for(int lCtr = 0 ;lCtr <= noOfIteration; lCtr++)
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
//System.out.println("headerDatalist Size ===>["+headerDatalist.size()+"]");
if(isSuccess)
{
retString = itmDBAccessLocal.getErrorString("","PRCSUCCESS","","",conn);
}
/*if(headerDatalist.size()>0)
{
gstHrdDetData.headerData=headerDatalist;
......@@ -309,13 +509,15 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
//Form f = new Form();
// f.param("data", json);
/*RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
.header("Content-Type", APPLICATION_JSON)
.header("data", json)
.body(new JsonNode(gstr1HeaderObj.toString()));*/
.body(new JsonNode(gstr1HeaderObj.toString()));
//RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
// Unirest.setTimeouts(0,0);
RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
// .setTimeouts(connectionTimeout,socketTimeout)
.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED)
.body(new JsonNode(gstr1HeaderObj.toString()));
System.out.println("request body ["+request.getBody()+"]");
......@@ -347,7 +549,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
retString = itmDBAccessLocal.getErrorString("","PRCSUCCESS","","",conn);
}
//retString = itmDBAccessLocal.getErrorString("","PRCSUCCESS","","",conn);
}
}*/
/*else
{
retString = itmDBAccessLocal.getErrorString("","PRCSUCCESS","","",conn);
......@@ -356,7 +558,8 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
}
catch(Exception e)
{
System.out.println("Exception GSTRegNoPosEJB ==>"+e.getMessage());
//System.out.println("Exception GSTRegNoPosEJB ==>"+e.getMessage());
System.out.println("Exception GetGstTableDataEJB ==>"+e.getMessage());
isError = true;
e.printStackTrace();
throw new ITMException(e);
......
webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableDataLocal.java
View file @ 1aa978e0
......@@ -11,7 +11,7 @@ import javax.ejb.Local;
public interface GetGstTableDataLocal extends ActionHandlerLocal{
public String actionHandler(String tran_id , String xtraParams , String forced_flag)throws RemoteException,ITMException;
public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag)throws RemoteException,ITMException;
}
......
webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableDataRemote.java
View file @ 1aa978e0
......@@ -14,7 +14,7 @@ public interface GetGstTableDataRemote extends ActionHandlerRemote {
public String actionHandler(String tran_id , String xtraParams , String forced_flag) throws RemoteException,ITMException;
public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String synctype , String forced_flag) throws RemoteException,ITMException;
}
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 1aa978e0
......@@ -51,7 +51,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
GST_PUREXE_TAXCLASS="",GST_PUREXE_TAXENV="",GST_PURNIL_TAXCLASS="",GST_PURNIL_TAXENV="",GST_PURNON_TAXCLASS="",
GST_PURNON_TAXENV="",GST_IMPSER_TAXCLASS="",GST_IMPSER_TAXENV="",GST_IMPGD_TAXCLASS="",GST_IMPGD_TAXENV="",
GST_IMPGDSEZ_TAXCLASS="",GST_IMPGDSEZ_TAXENV="",GST_PURSEZWP_TAXENV="",GST_PURSEZWP_TAXCLASS="",GST_PURSEZWOP_TAXENV="",GST_PURSEZWOP_TAXCLASS="",
GST_PURDE_TAXENV="",GST_PURDE_TAXCLASS="",GST_RCM_TAXCLASS="",GST_RCM_TAXENV="",SALES_DATA_MISC="",PURCHASE_DATA_PORCP="";
GST_PURDE_TAXENV="",GST_PURDE_TAXCLASS="",GST_RCM_TAXCLASS="",GST_RCM_TAXENV="",SALES_DATA_MISC="",PURCHASE_DATA_PORCP="",MISC_VOUC_TYPE="";
Timestamp fromDate = null, toDate = null , fromdateOracle = null, todateOracle=null;
......@@ -1043,7 +1043,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '01' as TRAN_TYPE,"// -- b2b,b2c
+" i.site_code__dlv as CUST_CODE,"
+" c.descr as CUST_NAME,"
+" state.GST_CODE,"// -- 2 digit code
// +" state.GST_CODE,"// -- 2 digit code
/* changed by kaustubh on 11-oct-2017 as per direction of devendra Sir */
+" st.GST_CODE,"// -- 2 digit code
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
......@@ -4678,7 +4680,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" '18' as TRAN_TYPE,"// -- b2b,b2c
+" i.site_code__dlv as CUST_CODE,"
+" c.descr as CUST_NAME,"
+" state.GST_CODE,"// -- 2 digit code
// +" state.GST_CODE,"// -- 2 digit code
/* changed by kaustubh on 11 oct 2017 as per direction of devendra Sir */
+" st.GST_CODE,"// -- 2 digit code
+" ' ' as SUBMISSION_TYPE,"// -- M-Modify, D-Delete, A-Accept, R-Reject
+" ' ' as DOC_CHECKSUM,"
+" 'R' as DOC_TYPE,"// -- R- Regular B2B Invoices, DE – Deemed Exports, SEWP – SEZ Exports with payment,SEWOP – SEZ exports without payment
......@@ -9101,7 +9105,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
GST_RCM_TAXCLASS=distCommon.getDisparams("999999", "GST_RCM_TAXCLASS", connGST);
GST_RCM_TAXENV=distCommon.getDisparams("999999", "GST_RCM_TAXENV", connGST);
PURCHASE_DATA_PORCP = distCommon.getDisparams("999999", "PURCHASE_DATA_PORCP", connGST);
MISC_VOUC_TYPE = distCommon.getDisparams("999999", "MISC_VOUC_TYPE", connGST);
PORD_TYP_IMP_SERVICE=PORD_TYP_IMP_SERVICE.replace(",", "','");
PORD_TYP_IMP_SERVICE= "'"+PORD_TYP_IMP_SERVICE+"'";
......@@ -9459,7 +9463,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and (select count(1) from gst_data_hdr where ref_ser = 'M-VOUC' and ref_id = i.tran_id ) = 0 ";
/**
* Detail MISC-Voucher 3(B) M-VOUC *
* Detail MISC-Voucher 3(A) M-VOUC *
*/
dtlSql = " select '' as TRAN_ID, ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
......@@ -9476,9 +9480,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" case when it.item_code is null then 'S' else 'G' end as LINE_TYPE, ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
//dtlSql = dtlSql; //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
......@@ -9489,9 +9503,19 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
else
{
//dtlSql = dtlSql
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
// + "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
// +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
......@@ -9828,28 +9852,48 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" case when it.item_code is null then 'S' else 'G' end as LINE_TYPE";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
}
else
{
//dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -9863,13 +9907,13 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
......@@ -9889,7 +9933,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" where i.tran_id = it.tran_id "
+" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'M-VOUCH' "
+"and ti.tran_code = 'M-VOUC' "
+"and ti.tran_id = i.tran_id "
+"and tx.TAX_GROUP = 'RCM' "
+"and tx.tax_type in ('G','H','I','J')" ;
......@@ -9908,7 +9952,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and i.tran_id = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) SEWP(M-VOUCH)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) SEWP(M-VOUC)");
......@@ -10178,28 +10222,48 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"case when it.item_code is null then 'S' else 'G' end as LINE_TYPE ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
}
else
{
//dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -10212,34 +10276,34 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
+" 'is' as ITC_TYPE , "
// +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate "
// +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
+" from misc_voucher i,misc_vouchdet it, item item ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
// +" from voucher i,vouchrcp it, item item "
+" where i.tran_id = it.tran_id "
+" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'M-VOUCH' "
+"and ti.tran_code = 'M-VOUC' "
+"and ti.tran_id = i.tran_id "
+"and tx.TAX_GROUP = 'RCM' "
+"and tx.tax_type in ('G','H','I','J')" ;
......@@ -10258,7 +10322,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and i.tran_id = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) SEWOP(M-VOUCH)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) SEWOP(M-VOUC)");
/**
......@@ -10531,28 +10595,48 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"case when it.item_code is null then 'S' else 'G' end as LINE_TYPE ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
// +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
}
else
{
//dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -10565,25 +10649,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, , CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, , CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
+" 'is' as ITC_TYPE , ";
//+"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate "
//+"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from misc_voucher i,misc_vouchdet it, item item "
......@@ -10591,7 +10675,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" where i.tran_id = it.tran_id "
+" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'M-VOUCH' "
+"and ti.tran_code = 'M-VOUC' "
+"and ti.tran_id = i.tran_id "
+"and tx.TAX_GROUP = 'RCM' "
+"and tx.tax_type in ('G','H','I','J')" ;
......@@ -10609,7 +10693,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" and i.tran_id = ? ";
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) DE(M-VOUCH)");
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(3A) DE(M-VOUC)");
/******* 4A started ********/
......@@ -10792,7 +10876,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
retString = executeSqlAndPopulateData(hdrSql,dtlSql,"(4A) B2B");
/**
* 4(a) B2B supplies M-VOUCH *
* 4(a) B2B supplies M-VOUC *
*/
hdrSql = " select '' as TRAN_ID, "
......@@ -10875,7 +10959,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
/**
* Detail --- B2B supplies M-VOUCH *
* Detail --- B2B supplies M-VOUC *
*/
dtlSql = " select '' as TRAN_ID, "
......@@ -10886,28 +10970,48 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"case when it.item_code is null then 'S' else 'G' end as LINE_TYPE , ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, ";
/*+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";*/
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, ";
/*+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, it.line_no, CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";*/
}
else
{
//dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,";
/*+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";*/
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,";
/*+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";*/
}
dtlSql = dtlSql
+" 0 as IGST_PERC "
......@@ -10925,32 +11029,32 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
+" 'is' as ITC_TYPE , ";
// +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate "
// +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from misc_voucher i,misc_vouchdet it, item item "
+" where i.tran_id = it.tran_id "
+" and item.item_code = it.item_code "
+" and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+" and ti.tran_code = 'M-VOUCH' "
+" and ti.tran_code = 'M-VOUC' "
+" and ti.tran_id = i.tran_id "
// +" and tx.TAX_GROUP <> 'NITC' " commented on 14 aug
// +" and tx.TAX_GROUP = 'RCM' "
......@@ -11246,28 +11350,50 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"case when it.item_code is null then 'S' else 'G' end as LINE_TYPE ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
}
else
{
//dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
System.out.println("misc_vouch_code::"+MISC_VOUC_TYPE);
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -11280,32 +11406,32 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
+" 'is' as ITC_TYPE , ";
//+"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate "
//+"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" from misc_voucher i,misc_vouchdet it, item item "
+" where i.tran_id = it.tran_id "
+" and item.item_code = it.item_code "
+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
+"and ti.tran_code = 'VOUCH' "
+"and ti.tran_code = 'M-VOUC' "
+"and ti.tran_id = i.tran_id "
+" and tx.TAX_GROUP IN ('ITC') "
+"and tx.tax_type in ('G','H','I','J')) > 0 " ;
......@@ -11592,28 +11718,48 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+"case when it.item_code is null then 'S' else 'G' end as LINE_TYPE ,";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
//dtlSql = dtlSql //+"fn_get_hsn_no(i.site_code,it.item_code) AS GS_CODE,"
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST(' ' AS CHAR(1)), CAST('T' AS CHAR(1))) AS TAXABLE_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('R' AS CHAR(1))) AS IGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('I' AS CHAR(1)), CAST('A' AS CHAR(1))) AS IGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('H' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CGST_AMT, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('R' AS CHAR(1))) AS SGST_PERC, "
+" fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('G' AS CHAR(1)), CAST('A' AS CHAR(1))) AS SGST_AMT, ";
}
else
{
//dtlSql = dtlSql
if ("A".equalsIgnoreCase(MISC_VOUC_TYPE))
{
dtlSql = dtlSql +"i.anal_code as GS_CODE,";
}
else
{
dtlSql = dtlSql +"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,";
}
dtlSql = dtlSql
//+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
+"fn_get_hsn_sac(i.site_code,it.item_code,it.acct_code) AS GS_CODE,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'R') as IGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'I', 'A') as IGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'R') as CGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'H', 'A') as CGST_AMT,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'R') as SGST_PERC,"
+ "fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
......@@ -11625,26 +11771,26 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUCH' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
dtlSql = dtlSql + "fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
+"fn_gst_rate_amt(CAST('M-VOUC' AS VARCHAR(6)),i.tran_id, CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('A' AS CHAR(1))) AS CESS_AMT,";
}
else
{
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUCH',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
dtlSql = dtlSql +"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'R') as CESS_PERC,"
+"fn_gst_rate_amt('M-VOUC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
}
dtlSql = dtlSql
+" '' as REMARKS ,"
+" 'is' as ITC_TYPE , ";
//+"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate "
//+"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate "
//+" from misc_voucher i,misc_vouchdet it, item item "
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
}
else
{
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUCH',i.tran_id, it.line_no) as gst_rate ";
dtlSql = dtlSql +"fn_get_gst_rate('M-VOUC',i.tran_id, it.line_no) as gst_rate ";
}
dtlSql = dtlSql
+" where i.tran_id = it.tran_id "
......@@ -14948,6 +15094,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
System.out.println("GST_DATA_SYNC ["+gstDataSink+"]");
System.out.println("sitecode::"+sitecode);
System.out.println("period::"+period);
if(sitecode == null || sitecode.trim().length() == 0)
{
//retString = itmDBAccessEJB.getErrorString("","INVPRD","","",connLocal);
......@@ -14997,7 +15144,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
{
GetGstTableData gstDataSinkObj = new GetGstTableData();
retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,connGST);
// retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,connGST);
retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,period,type,connGST);
System.out.println("Return String from GST_DATA_SYNC["+retString+"]");
}
......@@ -15011,6 +15160,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
{
errorMessage.append("\n GST Data synched successfully");
}
else if(retString.contains("VNINVDATA"))
{
errorMessage.append("\n No Data Found For Sync Operation");
}
else if(retString.contains("URLNOTFOUND"))
{
errorMessage.append("\n URL not found for synching GST data, GST data not synched successfully");
......@@ -15066,6 +15219,44 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// sql = "delete FROM GST_DATA_HDR WHERE SUBMIT_STATUS ='P' and rec_type= ? and site_code= ? and doc_date between ? and ? " ; changed on 15 sep 2017
//sql = "delete FROM GST_DATA_HDR WHERE rec_type= ? and site_code= ? and doc_date between ? and ? " ;
sql="delete from gst_data_det where tran_id in " +
"(select tran_id from gst_data_hdr where rec_type= ? and site_code= ? and doc_date between ? and ?)";
pstmt = connGST.prepareStatement(sql);
if ("S".equalsIgnoreCase(type))
{
pstmt.setInt(1, 1);
}
else
{
pstmt.setInt(1, 2);
}
pstmt.setString(2,sitecode);
pstmt.setTimestamp(3,fromDate);
pstmt.setTimestamp(4,toDate);
int detCount = pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(detCount > 0)
{
errorMessage.append("\n All pending data cleared successfully ! No Of records deleted "+detCount);
}
else
{
errorMessage.append("\n No Pending Records found for clear operation !!!");
}
sql = "delete FROM GST_DATA_HDR WHERE rec_type= ? and site_code= ? and doc_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