Skip to content

B
business-java
Commit 6ed94372 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 source code commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106378 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7bd00554
Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 22 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 6ed94372
...@@ -7,7 +7,6 @@ import java.sql.Connection; ...@@ -7,7 +7,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
...@@ -572,6 +571,27 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -572,6 +571,27 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
retXML += downloadGstr1Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK); retXML += downloadGstr1Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
} }
} }
if("GSTR2".equalsIgnoreCase(returnType))
{
if("SUBMIT".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr2Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
if(summaryDataJsonStr!= null && summaryDataJsonStr.trim().length() > 0)
{
retXML += "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
retXML += downloadGstr2Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
}
else if("FILE".equalsIgnoreCase(action))
{
summaryDataJsonStr += getGstr2Summary(authToken, stateCode, userName, gstinNo, periodCode, authSEK, appKeyEncryptedAndCoded, xtraParams, conn);
retXML = "<summary_data>" + XML.toString(new JSONObject(summaryDataJsonStr)) + "</summary_data>";
}
else if("GETINV".equalsIgnoreCase(action))
{
retXML += downloadGstr2Data(gstinNo, periodCode, authToken, userName, stateCode, appKeyEncryptedAndCoded, xtraParams, authSEK);
}
}
} }
valueXmlString.append("<Detail2 domID='1'>"); valueXmlString.append("<Detail2 domID='1'>");
...@@ -837,7 +857,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -837,7 +857,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
rs.close(); rs.close();
rs = null; rs = null;
} }
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?"; /*sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, periodCode); pstmt.setString(1, periodCode);
pstmt.setString(2, loginSiteCode); pstmt.setString(2, loginSiteCode);
...@@ -859,7 +879,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -859,7 +879,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
rs.close(); rs.close();
rs = null; rs = null;
} }*/
} }
if("FILE".equalsIgnoreCase(action)) if("FILE".equalsIgnoreCase(action))
{ {
...@@ -1618,6 +1638,201 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1618,6 +1638,201 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
System.out.println("final retStringBuff.toSting["+retStringBuff.toString()+"]"); System.out.println("final retStringBuff.toSting["+retStringBuff.toString()+"]");
return retStringBuff.toString(); return retStringBuff.toString();
} }
private String downloadGstr2Data (String gstinNo, String periodCode, String authToken, String userName, String stateCode, String appKeyEncryptedAndCoded, String xtraParams, byte[] authSek) throws ITMException
{
StringBuffer retStringBuff = new StringBuffer();
String[] gstr2Section = {"B2B","IMPG","IMPS","CDN","NIL","TXLI","TXP","HSNSUM","B2BUR","ITCRVSL","CDNUR"};
String gspAuthString = "", gspAuthSignature = "";
String siteCode = "", loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "";
try
{
siteCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
for(String action : gstr2Section)
{
long timeStamp = new Timestamp().getDateTime();
System.out.println("calling for ["+action+"]");
String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getDataReq = Unirest.get(String.format("%s%s", GSP_API_URL,GSTR2_URL_V3))
.queryString("action", action)
.queryString("gstin", gstinNo)
.queryString("ret_period", periodCode)
.header("Content-Type", APPLICATION_JSON)
.header("state-cd", stateCode)
.header("clientid", clientId)
.header("client-secret", clientSecret)
.header("ip-usr", ipAddress)
.header("username", userName)
.header("auth-token", authToken)
.header("app_key", appKeyEncryptedAndCoded)
.header("txn", transactionId)
.header("ret_period", periodCode)
.header("gstin", gstinNo)
.header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature)
.getHttpRequest();
System.out.println("get GSTR2 ["+action+"] invoices url["+getDataReq.getUrl()+"]");
System.out.println("get GSTR2 ["+action+"] invoices method["+getDataReq.getHttpMethod()+"]");
System.out.println("get GSTR2 ["+action+"] invoices request header["+getDataReq.getHeaders()+"]");
HttpResponse<JsonNode> getDataResp = getDataReq.asJson();
System.out.println("getDataResp.getStatus()["+getDataResp.getStatus()+"]");
if(getDataResp.getStatus() == 200)
{
JSONObject getDataRespObj = getDataResp.getBody().getObject();
if(getDataRespObj.has("data") && getDataRespObj.has("rek"))
{
callStatus = "1";
String getdata = getDataRespObj.getString("data");
String getrek = getDataRespObj.getString("rek");
byte[] getapiEK = aesEncryption.decrypt(getrek, authSek);
String getrespJsoninBase64 = new String(aesEncryption.decrypt(getdata, getapiEK));
byte[] getrespJsonInBytes = aesEncryption.decodeBase64StringTOByte(getrespJsoninBase64);
String getjsonData = new String(getrespJsonInBytes);
System.out.println("json response["+getjsonData+"] for ["+action+"]");
if("B2B".equalsIgnoreCase(action))
{
String b2bXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<b2b_invoices>");
retStringBuff.append(b2bXML);
retStringBuff.append("</b2b_invoices>");
}
else if("IMPG".equalsIgnoreCase(action))
{
String impgXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<impg_data>");
retStringBuff.append(impgXML);
retStringBuff.append("</impg_data>");
}
else if("IMPS".equalsIgnoreCase(action))
{
String impsXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<b2cs_invoices>");
retStringBuff.append(impsXML);
retStringBuff.append("</b2cs_invoices>");
}
else if("CDN".equalsIgnoreCase(action))
{
String cdnrXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<cdnr_data>");
retStringBuff.append(cdnrXML);
retStringBuff.append("</cdnr_data>");
}
else if("CDNUR".equalsIgnoreCase(action))
{
String cdnurXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<cdnur_data>");
retStringBuff.append(cdnurXML);
retStringBuff.append("</cdnur_data>");
}
else if("NIL".equalsIgnoreCase(action))
{
String nilData = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<nil_data>");
retStringBuff.append(nilData);
retStringBuff.append("</nil_data>");
}
else if("TXLI".equalsIgnoreCase(action))
{
String taxLiabXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<txli_data>");
retStringBuff.append(taxLiabXML);
retStringBuff.append("</txli_data>");
}
else if("TXP".equalsIgnoreCase(action))
{
String taxPaidXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<txp_data>");
retStringBuff.append(taxPaidXML);
retStringBuff.append("</txp_data>");
}
else if("HSNSUM".equalsIgnoreCase(action))
{
String hsnSumXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<hsnsum_data>");
retStringBuff.append(hsnSumXML);
retStringBuff.append("</hsnsum_data>");
}
else if("B2BUR".equalsIgnoreCase(action))
{
String b2burXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<b2bur_data>");
retStringBuff.append(b2burXML);
retStringBuff.append("</b2bur_data>");
}
else if("ITCRVSL".equalsIgnoreCase(action))
{
String itcRverslXML = XML.toString(new JSONObject(new String(getrespJsonInBytes)));
retStringBuff.append("<itcrvsl_data>");
retStringBuff.append(itcRverslXML);
retStringBuff.append("</itcrvsl_data>");
}
}
else
{
callStatus = "2";
JSONObject errorJSON = getDataResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
System.out.println("errorJSON["+errorJSON+"]");
}
}
else if(getDataResp.getStatus() == 500)
{
callStatus = "2";
String errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getDataResp.getStatus();
responseJsonStr = errMsg;
System.out.println("errMsg["+errMsg+"]");
}
else
{
callStatus = "2";
JSONObject errorJSON = getDataResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
System.out.println("errorJSON["+errorJSON+"]");
}
APICallData apiCallData = new APICallData();
apiCallData.setPeriodCode(periodCode);
apiCallData.setCallDate(new Date());
apiCallData.setSiteCode(siteCode);
apiCallData.setUserId(loginCode);
apiCallData.setCallType("GET_"+action);
apiCallData.setRecType("2");
apiCallData.setNoOfRecords(0);
apiCallData.setCallStatus(callStatus);
apiCallData.setResponseId(responseId);
apiCallData.setResponseJsonStr(responseJsonStr);
apiCallData.setChgUser(loginCode);
apiCallData.setChgDate(new Date());
apiCallData.setChgTerm(chgTerm);
gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
}
}
catch (Exception e)
{
System.out.println("GSTDataSubmitWizEJB.downloadGstr2Data()["+e.getMessage()+"]");
e.printStackTrace();
throw new ITMException(e);
}
System.out.println("final retStringBuff.toSting["+retStringBuff.toString()+"]");
return retStringBuff.toString();
}
private String getGstr1Summary(String authToken, String stateCode, String userName, String gstin, String periodCode, byte[] authSek, String appKeyEncryptedAndCoded, String xtraParams, Connection conn) throws ITMException private String getGstr1Summary(String authToken, String stateCode, String userName, String gstin, String periodCode, byte[] authSek, String appKeyEncryptedAndCoded, String xtraParams, Connection conn) throws ITMException
{ {
String retString = ""; String retString = "";
...@@ -1679,7 +1894,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1679,7 +1894,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes)); JSONObject gstr1SumryJsonObj = new JSONObject(new String(respJsonInBytes));
//retString = "<summary_data>" + XML.toString(gstr1SumryJsonObj) + "</summary_data>";
retString = gstr1SumryJsonObj.toString(); retString = gstr1SumryJsonObj.toString();
System.out.println("retString in getGstr1Summary["+retString+"]"); System.out.println("retString in getGstr1Summary["+retString+"]");
...@@ -1734,6 +1948,121 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1734,6 +1948,121 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
} }
return retString; return retString;
} }
private String getGstr2Summary(String authToken, String stateCode, String userName, String gstin, String periodCode, byte[] authSek, String appKeyEncryptedAndCoded, String xtraParams, Connection conn) throws ITMException
{
String retString = "";
String errMsg = "", gspAuthString = "", gspAuthSignature = "";
String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
String siteCode = "", loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "";
try
{
siteCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
long timeStamp = new Timestamp().getDateTime();
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getGstr2SumryReq = Unirest.get(String.format("%s%s", GSP_API_URL, GSTR2_URL_V3))
.queryString("action","RETSUM")
.queryString("gstin", gstin)
.queryString("ret_period", periodCode)
.header("Content-Type", APPLICATION_JSON)
.header("state-cd", stateCode)
.header("clientid", clientId)
.header("client-secret", clientSecret)
.header("ip-usr", ipAddress)
.header("username", userName)
.header("auth-token", authToken)
.header("txn", transactionId)
.header("ret_period", periodCode)
.header("gstin", gstin)
.header("X-Asp-Auth-Token", gspAuthString)
.header("X-Asp-Auth-Signature", gspAuthSignature)
.getHttpRequest();
System.out.println("get GSTR2 summary url["+getGstr2SumryReq.getUrl()+"]");
System.out.println("get GSTR2 summary method["+getGstr2SumryReq.getHttpMethod()+"]");
System.out.println("get GSTR2 summary invoices request header["+getGstr2SumryReq.getHeaders()+"]");
HttpResponse<JsonNode> getGstr2SumryResp = getGstr2SumryReq.asJson();
System.out.println(String.format("getGstr2SumryResp Request : Status[%s] Response[%s]", getGstr2SumryResp.getStatus(), getGstr2SumryResp.getBody()));
if (getGstr2SumryResp.getStatus() == 200)
{
JSONObject getGstr2SumryRespObj = getGstr2SumryResp.getBody().getObject();
if(getGstr2SumryRespObj.has("data") && getGstr2SumryRespObj.has("rek"))
{
callStatus = "1";
String gstr2Sumrydata = getGstr2SumryRespObj.getString("data");
String gstr2Sumryrek = getGstr2SumryRespObj.getString("rek");
byte[] apiEK = aesEncryption.decrypt(gstr2Sumryrek, authSek);
String respJsoninBase64 = new String(aesEncryption.decrypt(gstr2Sumrydata, apiEK));
byte[] respJsonInBytes = aesEncryption.decodeBase64StringTOByte(respJsoninBase64);
JSONObject gstr2SumryJsonObj = new JSONObject(new String(respJsonInBytes));
retString = gstr2SumryJsonObj.toString();
System.out.println("retString in getGstr2Summary["+retString+"]");
}
else
{
callStatus = "2";
JSONObject errorJSON = getGstr2SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
}
}
else if(getGstr2SumryResp.getStatus() == 500)
{
callStatus = "2";
errMsg = "Message : Error occurred at GSTN server \nResponse code : "+getGstr2SumryResp.getStatus();
responseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
}
else
{
callStatus = "2";
JSONObject errorJSON = getGstr2SumryResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn);
}
APICallData apiCallData = new APICallData();
apiCallData.setPeriodCode(periodCode);
apiCallData.setCallDate(new Date());
apiCallData.setSiteCode(siteCode);
apiCallData.setUserId(loginCode);
apiCallData.setCallType("RETSUM");
apiCallData.setRecType("2");
apiCallData.setNoOfRecords(0);
apiCallData.setCallStatus(callStatus);
apiCallData.setResponseId(responseId);
apiCallData.setResponseJsonStr(responseJsonStr);
apiCallData.setChgUser(loginCode);
apiCallData.setChgDate(new Date());
apiCallData.setChgTerm(chgTerm);
gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
}
catch(Exception e)
{
System.out.println("GSTDataSubmitWiz.getGstr2Summary()["+e.getMessage()+"]");
e.printStackTrace();
throw new ITMException(e);
}
return retString;
}
private String checkNull(String input) private String checkNull(String input)
{ {
if (input==null) if (input==null)
......
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java
View file @ 6ed94372
...@@ -752,7 +752,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -752,7 +752,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
while(lineRs.next()) while(lineRs.next())
{ {
if("05".equalsIgnoreCase(udfStr1)) if("B2CS".equalsIgnoreCase(udfStr1))
{ {
b2cs = new B2CS(); b2cs = new B2CS();
...@@ -1299,6 +1299,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1299,6 +1299,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = ""; String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = "";
APICallData apiRetStatsCallData = null; APICallData apiRetStatsCallData = null;
List<APICallData> retStatAPICallList = new ArrayList<APICallData>();
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
...@@ -1461,6 +1462,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1461,6 +1462,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
} }
retStatusResponseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true;
}
else
{
retStatusCallStatus = "2";
if(retStatsJsonData.has("status_cd"))
{
errMsg = "Message : "+retStatsJsonData.getString("status_cd")+" \nError code : "+retStatsJsonData.getString("status_cd");
}
retStatusResponseJsonStr = errMsg; retStatusResponseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true; isRetStatusError = true;
...@@ -1508,6 +1521,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1508,6 +1521,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
apiRetStatsCallData.setChgUser(loginCode); apiRetStatsCallData.setChgUser(loginCode);
apiRetStatsCallData.setChgDate(new Date()); apiRetStatsCallData.setChgDate(new Date());
apiRetStatsCallData.setChgTerm(chgTerm); apiRetStatsCallData.setChgTerm(chgTerm);
retStatAPICallList.add(apiRetStatsCallData);
if(isRetStatusError) if(isRetStatusError)
{ {
...@@ -1556,7 +1571,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1556,7 +1571,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
apiCallData.setChgTerm(chgTerm); apiCallData.setChgTerm(chgTerm);
gstCommonUtil.updateAPICallLogHistory(apiCallData, null); gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
gstCommonUtil.updateAPICallLogHistory(apiRetStatsCallData, null); if(retStatAPICallList.size()>0)
{
for(APICallData eachAPICallData : retStatAPICallList)
{
gstCommonUtil.updateAPICallLogHistory(eachAPICallData, null);
}
}
} }
} }
catch (Exception e) catch (Exception e)
...@@ -2281,7 +2302,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2281,7 +2302,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
//tran_type : 01 = B2B invoices //tran_type : 01 = B2B invoices
if("B2B".equalsIgnoreCase(udfStr1)) if("B2B".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2357,7 +2378,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2357,7 +2378,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
invoice = new Invoice(); invoice = new Invoice();
invLineItems = new ArrayList<InvLineItem>(); invLineItems = new ArrayList<InvLineItem>();
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2418,7 +2439,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2418,7 +2439,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
if("CDNR".equalsIgnoreCase(udfStr1)) if("CDNR".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2483,7 +2504,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2483,7 +2504,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
if("IMPG".equalsIgnoreCase(udfStr1)) if("IMPG".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2534,7 +2555,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2534,7 +2555,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
if("IMPS".equalsIgnoreCase(udfStr1)) if("IMPS".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2583,7 +2604,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2583,7 +2604,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
if("TXI".equalsIgnoreCase(udfStr1)) if("TXI".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2628,7 +2649,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2628,7 +2649,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
if("TXPD".equalsIgnoreCase(udfStr1)) if("TXPD".equalsIgnoreCase(udfStr1))
{ {
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2677,7 +2698,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2677,7 +2698,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
calendar.set(2017, 06, 01); calendar.set(2017, 06, 01);
Date gstStartDate = calendar.getTime(); Date gstStartDate = calendar.getTime();
lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT " lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT, "
+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS " + " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+ " FROM GST_DATA_DET " + " FROM GST_DATA_DET "
+ " WHERE TRAN_ID = ? " + " WHERE TRAN_ID = ? "
...@@ -2799,12 +2820,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2799,12 +2820,6 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
hsn.hsnDetails = hsnList; hsn.hsnDetails = hsnList;
} }
gstr2 = new GSTR2();
gstr2.gstin = gstin;
gstr2.financialPeriod = periodCode;
//Summary of Nil rated inward supplies
InterNilSupplies interNilSupplies = getInterNilRateSummary("13", "14", "15", "16", siteCode, periodCode, conn); InterNilSupplies interNilSupplies = getInterNilRateSummary("13", "14", "15", "16", siteCode, periodCode, conn);
IntraNilSupplies intraNilSupplies = getIntraNilRateSummary("17", "18", "19", "20", siteCode, periodCode, conn); IntraNilSupplies intraNilSupplies = getIntraNilRateSummary("17", "18", "19", "20", siteCode, periodCode, conn);
...@@ -2815,6 +2830,12 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2815,6 +2830,12 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
nilInwardSupplies.intraNilSupplies = intraNilSupplies; nilInwardSupplies.intraNilSupplies = intraNilSupplies;
} }
gstr2 = new GSTR2();
gstr2.gstin = gstin;
gstr2.financialPeriod = periodCode;
//Summary of Nil rated inward supplies
if(b2bInvoiceList.size() > 0) if(b2bInvoiceList.size() > 0)
{ {
gstr2.b2b = b2bInvoiceList; gstr2.b2b = b2bInvoiceList;
...@@ -2858,6 +2879,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2858,6 +2879,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = ""; String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = "";
APICallData apiRetStatsCallData = null; APICallData apiRetStatsCallData = null;
List<APICallData> retStatAPICallList = new ArrayList<APICallData>();
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
...@@ -3020,6 +3042,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3020,6 +3042,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
} }
} }
retStatusResponseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true;
}
else
{
retStatusCallStatus = "2";
if(retStatsJsonData.has("status_cd"))
{
errMsg = "Message : "+retStatsJsonData.getString("status_cd")+" \nError code : "+retStatsJsonData.getString("status_cd");
}
retStatusResponseJsonStr = errMsg; retStatusResponseJsonStr = errMsg;
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
isRetStatusError = true; isRetStatusError = true;
...@@ -3067,7 +3101,9 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3067,7 +3101,9 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
apiRetStatsCallData.setChgUser(loginCode); apiRetStatsCallData.setChgUser(loginCode);
apiRetStatsCallData.setChgDate(new Date()); apiRetStatsCallData.setChgDate(new Date());
apiRetStatsCallData.setChgTerm(chgTerm); apiRetStatsCallData.setChgTerm(chgTerm);
retStatAPICallList.add(apiRetStatsCallData);
if(isRetStatusError) if(isRetStatusError)
{ {
break; break;
...@@ -3115,7 +3151,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3115,7 +3151,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
apiCallData.setChgTerm(chgTerm); apiCallData.setChgTerm(chgTerm);
gstCommonUtil.updateAPICallLogHistory(apiCallData, null); gstCommonUtil.updateAPICallLogHistory(apiCallData, null);
gstCommonUtil.updateAPICallLogHistory(apiRetStatsCallData, null); if(retStatAPICallList.size()>0)
{
for(APICallData eachAPICallData : retStatAPICallList)
{
gstCommonUtil.updateAPICallLogHistory(eachAPICallData, null);
}
}
} }
} }
catch(Exception e) catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/GSTR2Serailizer.java
View file @ 6ed94372
...@@ -15,6 +15,7 @@ public class GSTR2Serailizer extends JsonSerializer<GSTR2> { ...@@ -15,6 +15,7 @@ public class GSTR2Serailizer extends JsonSerializer<GSTR2> {
{ {
jsonGenerator.writeStartObject(); jsonGenerator.writeStartObject();
jsonGenerator.writeStringField("gstin", gstr2.gstin); jsonGenerator.writeStringField("gstin", gstr2.gstin);
jsonGenerator.writeStringField("fp", gstr2.financialPeriod);
if(gstr2.b2b != null) if(gstr2.b2b != null)
{ {
jsonGenerator.writeObjectField("b2b", gstr2.b2b); jsonGenerator.writeObjectField("b2b", gstr2.b2b);
......
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