Skip to content

B
business-java
Commit 6046066f authored by steurwadkar's avatar steurwadkar
Browse files
Options

*** empty log message *** 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105878 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f9b11b6f
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 0 deletions
webitm-gst/ibase/webitm/bean/gst/ATA.java 0 → 100755
View file @ 6046066f
package ibase.webitm.bean.gst;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ibase.webitm.util.gst.ATASearializer;
@JsonSerialize(using = ATASearializer.class)
public class ATA extends AT
{
public String orgCpty;
public String orgDocNum;
public Date orgDocDt;
}
webitm-gst/ibase/webitm/bean/gst/GSTR1.java
View file @ 6046066f
...@@ -41,4 +41,10 @@ public class GSTR1 { ...@@ -41,4 +41,10 @@ public class GSTR1 {
@JsonProperty("cdnra") @JsonProperty("cdnra")
public List<CDNRA> cdnra; public List<CDNRA> cdnra;
@JsonProperty("at")
public List<AT> at;
@JsonProperty("ata")
public List<ATA> ata;
} }
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java
View file @ 6046066f
...@@ -33,6 +33,8 @@ import com.mashape.unirest.http.JsonNode; ...@@ -33,6 +33,8 @@ import com.mashape.unirest.http.JsonNode;
import com.mashape.unirest.http.Unirest; import com.mashape.unirest.http.Unirest;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.bean.gst.AT;
import ibase.webitm.bean.gst.ATA;
import ibase.webitm.bean.gst.B2B; import ibase.webitm.bean.gst.B2B;
import ibase.webitm.bean.gst.B2BA; import ibase.webitm.bean.gst.B2BA;
import ibase.webitm.bean.gst.B2CL; import ibase.webitm.bean.gst.B2CL;
...@@ -353,6 +355,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -353,6 +355,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
ArrayList<B2CSA> b2csaInvoiceList = new ArrayList<B2CSA>(); ArrayList<B2CSA> b2csaInvoiceList = new ArrayList<B2CSA>();
ArrayList<CDNR> cdnrList = new ArrayList<CDNR>(); ArrayList<CDNR> cdnrList = new ArrayList<CDNR>();
ArrayList<CDNRA> cdnraList = new ArrayList<CDNRA>(); ArrayList<CDNRA> cdnraList = new ArrayList<CDNRA>();
ArrayList<AT> atList = new ArrayList<AT>();
ArrayList<ATA> ataList = new ArrayList<ATA>();
ArrayList<InvLineItem> invLineItems = null; ArrayList<InvLineItem> invLineItems = null;
ArrayList<Invoice> invoices = null; ArrayList<Invoice> invoices = null;
...@@ -370,6 +374,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -370,6 +374,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
CDNR cdnr = null; CDNR cdnr = null;
CDNRA cdnra = null; CDNRA cdnra = null;
CDNDetails cdnDetails = null; CDNDetails cdnDetails = null;
AT at = null;
ATA ata = null;
try try
{ {
...@@ -955,6 +961,153 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -955,6 +961,153 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
cdnraList.add(cdnra); cdnraList.add(cdnra);
} }
} }
//tran_type : 09 = Nil Supplies
if("09".equalsIgnoreCase(tranType))
{
}
//tran_type : 10 = Exports and tran_type : 11 = Exports amendments
if("10".equalsIgnoreCase(tranType) || "11".equalsIgnoreCase(tranType))
{
}
//tran_type : 12 = Advance Tax and tran_type : 13 = Adv. Tax amendments
if("12".equalsIgnoreCase(tranType) || "13".equalsIgnoreCase(tranType))
{
invLineItems = new ArrayList<InvLineItem>();
if("12".equalsIgnoreCase(tranType))
{
at = new AT();
at.isReverseCharge = false;
at.typ = checkNullandTrim(rs.getString("DOC_TYPE"));
at.cpty = ctin;
at.stateCode = posStateCode;
at.docNum = checkNullandTrim(rs.getString("DOC_NO"));
at.docDt = rs.getDate("DOC_DATE");
lineSql = "SELECT * FROM GST_DATA_DET WHERE TRAN_ID = ? ORDER BY LINE_NO";
linePstmt = conn.prepareStatement(lineSql);
linePstmt.setString(1, tranId);
lineRs = linePstmt.executeQuery();
while(lineRs.next())
{
invLineItem = new InvLineItem();
invLineItem.ty = lineRs.getString("LINE_TYPE");
invLineItem.hsn_sc = lineRs.getString("GS_CODE");
invLineItem.taxval = rs.getDouble("AMOUNT");
invLineItem.irt = lineRs.getDouble("IGST_PERC");
invLineItem.iamt = lineRs.getDouble("IGST_AMT");
invLineItem.crt = lineRs.getDouble("CGST_PERC");
invLineItem.camt = lineRs.getDouble("CGST_AMT");
invLineItem.srt = lineRs.getDouble("SGST_PERC");
invLineItem.samt = lineRs.getDouble("SGST_AMT");
invLineItem.csrt = lineRs.getDouble("CESS_PERC");
invLineItem.csamt = lineRs.getDouble("CESS_AMT");
invLineItems.add(invLineItem);
}
if(linePstmt != null)
{
linePstmt.close();
linePstmt = null;
}
if(lineRs != null)
{
lineRs.close();
lineRs = null;
}
at.itms = invLineItems;
atList.add(at);
}
if("13".equalsIgnoreCase(tranType))
{
String orgDocNum = "", orgCpty = "";
Date orgDocDt = null;
if(tranIdRef.length() > 0)
{
refDataSql = "SELECT TAX_REG_NO, DOC_NO, DOC_DATE FROM GST_DATA_HDR WHERE TRAN_ID = ?";
refDataPstmt = conn.prepareStatement(refDataSql);
refDataPstmt.setString(1, tranIdRef);
refDataRs = refDataPstmt.executeQuery();
if(refDataRs.next())
{
orgCpty = checkNullandTrim(refDataRs.getString("TAX_REG_NO"));
orgDocNum = checkNullandTrim(refDataRs.getString("DOC_NO")) ;
orgDocDt = refDataRs.getDate("DOC_DATE");
}
if(refDataPstmt != null)
{
refDataPstmt.close();
refDataPstmt = null;
}
if(refDataRs != null)
{
refDataRs.close();
refDataRs = null;
}
}
ata = new ATA();
ata.isReverseCharge = false;
ata.orgCpty = orgCpty;
ata.orgDocNum = orgDocNum;
ata.orgDocDt = orgDocDt;
ata.typ = checkNullandTrim(rs.getString("DOC_TYPE"));
ata.cpty = ctin;
ata.stateCode = posStateCode;
ata.docNum = checkNullandTrim(rs.getString("DOC_NO"));
ata.docDt = rs.getDate("DOC_DATE");
lineSql = "SELECT * FROM GST_DATA_DET WHERE TRAN_ID = ? ORDER BY LINE_NO";
linePstmt = conn.prepareStatement(lineSql);
linePstmt.setString(1, tranId);
lineRs = linePstmt.executeQuery();
while(lineRs.next())
{
invLineItem = new InvLineItem();
invLineItem.ty = lineRs.getString("LINE_TYPE");
invLineItem.hsn_sc = lineRs.getString("GS_CODE");
invLineItem.taxval = rs.getDouble("AMOUNT");
invLineItem.irt = lineRs.getDouble("IGST_PERC");
invLineItem.iamt = lineRs.getDouble("IGST_AMT");
invLineItem.crt = lineRs.getDouble("CGST_PERC");
invLineItem.camt = lineRs.getDouble("CGST_AMT");
invLineItem.srt = lineRs.getDouble("SGST_PERC");
invLineItem.samt = lineRs.getDouble("SGST_AMT");
invLineItem.csrt = lineRs.getDouble("CESS_PERC");
invLineItem.csamt = lineRs.getDouble("CESS_AMT");
invLineItems.add(invLineItem);
}
if(linePstmt != null)
{
linePstmt.close();
linePstmt = null;
}
if(lineRs != null)
{
lineRs.close();
lineRs = null;
}
ata.itms = invLineItems;
ataList.add(ata);
}
}
tranIdList.add(tranId); tranIdList.add(tranId);
} }
...@@ -1001,6 +1154,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1001,6 +1154,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
{ {
gstr1.cdnra = cdnraList; gstr1.cdnra = cdnraList;
} }
if(atList.size() > 0)
{
gstr1.at = atList;
}
if(ataList.size() > 0)
{
gstr1.ata = ataList;
}
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
...@@ -1112,12 +1273,19 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1112,12 +1273,19 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
break; break;
} }
else if("ER".equalsIgnoreCase(retStatsJsonData.getString("status_cd")))
{
errMsg = "Message : "+retStatsJsonData.getString("error_msg")+" \nError code : "+retStatsJsonData.getString("errorCd");
retString = getError(errMsg, "GSTAPIERR", conn);
break;
}
} }
else else
{ {
JSONObject errorJSON = retStatusResp.getBody().getObject().getJSONObject("error"); JSONObject errorJSON = retStatusResp.getBody().getObject().getJSONObject("error");
errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd"); errMsg = "Message : "+errorJSON.getString("message")+" \nError code : "+errorJSON.getString("error_cd");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
break;
} }
} }
else else
...@@ -1125,6 +1293,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1125,6 +1293,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
JSONObject errorJSON = retStatusResp.getBody().getObject().getJSONObject("error"); JSONObject errorJSON = retStatusResp.getBody().getObject().getJSONObject("error");
errMsg = "Message : "+errorJSON.getString("desc")+" \nError code : "+errorJSON.getString("code"); errMsg = "Message : "+errorJSON.getString("desc")+" \nError code : "+errorJSON.getString("code");
retString = getError(errMsg, "GSTAPIERR", conn); retString = getError(errMsg, "GSTAPIERR", conn);
break;
} }
} }
} }
...@@ -1500,6 +1669,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1500,6 +1669,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
{ {
eachInvErrorJsonArry = errorJsonObj.getJSONArray("cdnra"); eachInvErrorJsonArry = errorJsonObj.getJSONArray("cdnra");
} }
else if(errorJsonObj.has("at"))
{
eachInvErrorJsonArry = errorJsonObj.getJSONArray("at");
}
else if(errorJsonObj.has("ata"))
{
eachInvErrorJsonArry = errorJsonObj.getJSONArray("ata");
}
for(int i=0; i<eachInvErrorJsonArry.length(); i++) for(int i=0; i<eachInvErrorJsonArry.length(); i++)
...@@ -1514,6 +1691,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1514,6 +1691,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
{ {
retString += " Credit/Debit No. : "+tempJsonObj.optString("nt_num")+ " Credit/Debit Dt. : "+tempJsonObj.optString("nt_dt")+"\n"; retString += " Credit/Debit No. : "+tempJsonObj.optString("nt_num")+ " Credit/Debit Dt. : "+tempJsonObj.optString("nt_dt")+"\n";
} }
else if(tempJsonObj.has("doc_num") && tempJsonObj.has("doc_dt") && tempJsonObj.has("typ"))
{
retString += " Doc No. : "+tempJsonObj.optString("doc_num")+ " Doc Dt. : "+tempJsonObj.optString("doc_dt")+ " Inv Type : "+tempJsonObj.optString("typ")+"\n";
}
} }
} }
catch(Exception e) catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/ATASearializer.java 0 → 100755
View file @ 6046066f
package ibase.webitm.util.gst;
import java.io.IOException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.SerializerProvider;
import ibase.webitm.bean.gst.ATA;
import ibase.webitm.bean.gst.InvLineItem;
public class ATASearializer extends BaseSerializer<ATA>
{
@Override
public void serialize(ATA ata, JsonGenerator json, SerializerProvider serializeProvider) throws IOException, JsonProcessingException
{
json.writeStartObject();
json.writeStringField("typ", ata.typ);
if(ata.orgCpty != null && ata.orgDocNum != null && ata.orgDocDt != null)
{
json.writeStringField("ocpty", ata.orgCpty);
json.writeStringField("odoc_num", ata.orgDocNum);
json.writeStringField("odoc_dt", gstFmt.format(ata.orgDocDt));
}
json.writeStringField("cpty", ata.cpty);
json.writeStringField("state_cd", ata.stateCode);
json.writeStringField("doc_num", ata.docNum);
json.writeStringField("doc_dt", gstFmt.format(ata.docDt));
writeLineItems(ata, json);
json.writeEndObject();
}
private void writeLineItems(ATA ata, JsonGenerator json) throws IOException
{
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : ata.itms)
{
writeLineItem(json, li);
}
json.writeEndArray();
}
private void writeLineItem(JsonGenerator json, InvLineItem li)
{
try
{
json.writeStartObject();
json.writeStringField("ty", li.ty);
json.writeStringField("hsn_sc", li.hsn_sc);
json.writeNumberField("ad_amt", li.taxval);
json.writeNumberField("irt", li.irt);
json.writeNumberField("iamt", li.iamt);
json.writeNumberField("crt", li.crt);
json.writeNumberField("camt", li.camt);
json.writeNumberField("srt", li.srt);
json.writeNumberField("samt", li.samt);
json.writeNumberField("csrt", li.csrt);
json.writeNumberField("csamt", li.csamt);
json.writeEndObject();
}
catch (Exception e)
{
System.out.println("ATSearializer.writeLineItem()["+e.getMessage()+"]");
e.printStackTrace();
}
}
}
webitm-gst/ibase/webitm/util/gst/GSTR1Serailizer.java
View file @ 6046066f
...@@ -49,6 +49,14 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> { ...@@ -49,6 +49,14 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
{ {
jsonGenerator.writeObjectField("cdnra", gstr1.cdnra); jsonGenerator.writeObjectField("cdnra", gstr1.cdnra);
} }
if(gstr1.at != null)
{
jsonGenerator.writeObjectField("at", gstr1.at);
}
if(gstr1.ata != null)
{
jsonGenerator.writeObjectField("ata", gstr1.ata);
}
jsonGenerator.writeEndObject(); jsonGenerator.writeEndObject();
} }
} }
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