Skip to content

B
business-java
Commit 91d978e2 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 GST API integration wizard source code commit 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171783 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e826f6af
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 27 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 91d978e2
......@@ -1220,6 +1220,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{
recType = "6";
}
else if("GSTR2A".equalsIgnoreCase(recordType))
{
recType = "4";
}
if("SAVE".equalsIgnoreCase(dataAction))
{
......@@ -1435,7 +1439,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
closeResources(rs, pstmt);
}
}
else if("GETINV".equalsIgnoreCase(dataAction) && !"GSTR2A".equalsIgnoreCase(recordType))
else if("GETINV".equalsIgnoreCase(dataAction))
{
if(!"GSTR2A".equalsIgnoreCase(recordType))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS IN ('T','S','R') AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1453,6 +1459,26 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
}
closeResources(rs, pstmt);
}
if("GSTR2A".equalsIgnoreCase(recordType))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS IN ('A') AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
pstmt.setString(2, periodCode);
pstmt.setString(3, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") > 0)
{
isDataError = true;
errorCode = "VTDWNALRDY";
}
}
closeResources(rs, pstmt);
}
}
else if("DELETE".equalsIgnoreCase(dataAction))
{
int saveRecCnt = 0;
......
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java
View file @ 91d978e2
......@@ -3468,7 +3468,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
}*/
private String downloadGstr2AData(String siteCode, String xtraParams, ArrayList<String> byPassSectionList, Connection conn) throws ITMException
{
String retString = "";
String retString = "", userMsgStr = "";
String errMsg = "", gspAuthString = "", gspAuthSignature = "";
String[] gstr2Section = {"B2B","CDN"};
String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
......@@ -3546,11 +3546,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
callStatus = "1";
if("B2B".equalsIgnoreCase(action))
{
insertB2BInvoiceData(stateCode, periodCode, siteCode, gstr2InvoiceJsonObj, xtraParams, conn);
insertB2BInvoiceData(stateCode, periodCode, siteCode, gstr2InvoiceJsonObj, xtraParams);
userMsgStr += "Data downloaded successfully for B2B.\n";
}
else if("CDN".equalsIgnoreCase(action))
{
insertCDNData(stateCode, periodCode, siteCode, gstr2InvoiceJsonObj, xtraParams, conn);
insertCDNData(stateCode, periodCode, siteCode, gstr2InvoiceJsonObj, xtraParams);
userMsgStr += " Data downloaded successfully for Credit/Debit note.\n";
}
}
}
......@@ -3559,10 +3561,18 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
callStatus = "2";
JSONObject errorJSON = getGstr2InvoicesResp.getBody().getObject().getJSONObject("error");
responseJsonStr = errorJSON.toString();
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
String errCode = errorJSON.getString("error_cd");
if("RET13509".equalsIgnoreCase(errCode))
{
userMsgStr += "Message : "+errorJSON.getString("message") +" for " + action;
}
else
{
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errCode;
retString = getError(errMsg, "GSTAPIERR", conn);
}
}
}
else if(getGstr2InvoicesResp.getStatus() == 500)
{
callStatus = "2";
......@@ -3597,6 +3607,11 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
apiCallDataList.add(apiCallData);
}
}
if(retString.trim().length() == 0)
{
retString = getError(userMsgStr, "GSTAPIERR", conn);
}
}
catch(Exception e)
{
......@@ -4686,11 +4701,11 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
if("B2B".equalsIgnoreCase(sectionName))
{
insertB2BInvoiceData(stateCode, periodCode, siteCode, insertDataJson, xtraParams, conn);
insertB2BInvoiceData(stateCode, periodCode, siteCode, insertDataJson, xtraParams);
}
else if("CDN".equalsIgnoreCase(sectionName))
{
insertCDNData(stateCode, periodCode, siteCode, insertDataJson, xtraParams, conn);
insertCDNData(stateCode, periodCode, siteCode, insertDataJson, xtraParams);
}
}
currentEntry = tarInput.getNextTarEntry();
......@@ -5871,7 +5886,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
return retString;
}
private void insertB2BInvoiceData(String stateCode, String periodCode, String siteCode, JSONObject gstr2InvoiceJsonObj, String xtraParams, Connection conn) throws ITMException
private void insertB2BInvoiceData(String stateCode, String periodCode, String siteCode, JSONObject gstr2InvoiceJsonObj, String xtraParams) throws ITMException
{
JSONArray b2bInvArry = new JSONArray();
JSONObject b2bJsonObj = new JSONObject();
......@@ -5889,10 +5904,12 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String hdrInsSql = "", detInsSql = "";
PreparedStatement hdrInsPstmt = null, detInsPstmt = null;
Connection localConn = null;
boolean isError = false;
try
{
localConn = getConnection();
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
......@@ -5914,7 +5931,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
+ " CHG_DATE, CHG_TERM, TAX_REG_NO, RECO_STATUS, ECOM_REG_NO, REF_SER, GST_CODE, GST_TYPE, REF_ID)"
+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
hdrInsPstmt = conn.prepareStatement(hdrInsSql);
hdrInsPstmt = localConn.prepareStatement(hdrInsSql);
b2bInvJsonObj = b2bInvJsonArry.getJSONObject(j);
......@@ -5958,7 +5975,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
tranType = "09";
}
tranId = generateTranId("w_gstr_purc","","",conn);
tranId = gstCommonUtil.generateTranId("w_gstr_purc", siteCode, localConn);
hdrInsPstmt.setString(1, tranId);
hdrInsPstmt.setTimestamp(2, java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(new Date(), e12GenericUtility.getDBDateTimeFormat())));
......@@ -6016,7 +6033,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
+ " REMARKS, ITC_TYPE, ITC_IGST, ITC_CGST, ITC_SGST, ITC_CESS, GST_RATE)"
+ " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
detInsPstmt = conn.prepareStatement(detInsSql);
detInsPstmt = localConn.prepareStatement(detInsSql);
b2bInvLineItmsArry = b2bInvJsonObj.getJSONArray("itms");
......@@ -6129,6 +6146,22 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
detInsPstmt.close();
detInsPstmt = null;
}
if(localConn != null && !localConn.isClosed())
{
localConn.rollback();
localConn.close();
localConn = null;
}
}
else
{
if(localConn!=null && !localConn.isClosed())
{
localConn.commit();
localConn.close();
localConn = null;
}
}
}
catch(SQLException se)
......@@ -6437,7 +6470,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
throw new ITMException(e);
}
}*/
private void insertCDNData(String stateCode, String periodCode, String siteCode, JSONObject gstr2InvoiceJsonObj, String xtraParams, Connection conn) throws ITMException
private void insertCDNData(String stateCode, String periodCode, String siteCode, JSONObject gstr2InvoiceJsonObj, String xtraParams) throws ITMException
{
JSONArray cdnArry = new JSONArray();
JSONObject cdnJsonObj = new JSONObject();
......@@ -6454,11 +6487,13 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
String hdrInsSql = "", detInsSql = "";
PreparedStatement hdrInsPstmt = null, detInsPstmt = null;
Connection localConn = null;
boolean isError = false;
try
{
localConn = getConnection();
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
......@@ -6479,7 +6514,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
+ " REF_DATE__INV, PROV_ASSMNT, ORDER_NO, ORDER_DATE, REMARKS, SUBMIT_STATUS, SUBMIT_DATE, ADD_USER, ADD_DATE, ADD_TERM, CHG_USER,"
+ " CHG_DATE, CHG_TERM, TAX_REG_NO, RECO_STATUS, ECOM_REG_NO, REF_SER, GST_CODE, GST_TYPE, REF_ID)"
+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
hdrInsPstmt = conn.prepareStatement(hdrInsSql);
hdrInsPstmt = localConn.prepareStatement(hdrInsSql);
cdnDataJsonObj = cdnJsonArry.getJSONObject(j);
......@@ -6501,7 +6536,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
tranType = "30";
}
tranId = generateTranId("w_gstr_purc","","",conn);
tranId = gstCommonUtil.generateTranId("w_gstr_purc", siteCode, localConn);
hdrInsPstmt.setString(1, tranId);
hdrInsPstmt.setTimestamp(2, java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(new Date(), e12GenericUtility.getDBDateTimeFormat())));
......@@ -6559,7 +6594,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
+ " REMARKS, ITC_TYPE, ITC_IGST, ITC_CGST, ITC_SGST, ITC_CESS, GST_RATE)"
+ " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
detInsPstmt = conn.prepareStatement(detInsSql);
detInsPstmt = localConn.prepareStatement(detInsSql);
cdnInvLineItmsArry = cdnDataJsonObj.getJSONArray("itms");
......@@ -6672,6 +6707,21 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
detInsPstmt.close();
detInsPstmt = null;
}
if(localConn!= null && !localConn.isClosed())
{
localConn.rollback();
localConn.close();
localConn = null;
}
}
else
{
if(localConn!= null && !localConn.isClosed())
{
localConn.commit();
localConn.close();
localConn = null;
}
}
}
catch(SQLException se)
......
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