Skip to content

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

F17ABAS001 GST API integration wizard soucr code commit 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@139909 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 94fb4cdd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1451 additions and 449 deletions
webitm-gst/ibase/webitm/bean/gst/NilInwardSupplies.java
View file @ d8422bc9
......@@ -7,6 +7,8 @@ import ibase.webitm.util.gst.NilInwardSerializer;
@JsonSerialize(using = NilInwardSerializer.class)
public class NilInwardSupplies
{
public String taxPayerAction;
public InterNilSupplies interNilSupplies;
public IntraNilSupplies intraNilSupplies;
......
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ d8422bc9
......@@ -1062,16 +1062,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNOGSDATA";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
......@@ -1086,16 +1078,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTSUBALRDY";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
......@@ -1110,18 +1094,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTFILALRDY";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
}
if("SUBMIT".equalsIgnoreCase(dataAction))
else if("SUBMIT".equalsIgnoreCase(dataAction))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1137,16 +1112,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTSUBALRDY";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'T' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
......@@ -1161,16 +1128,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNORECSAV";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
......@@ -1185,18 +1144,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTFILALRDY";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
}
if("FILE".equalsIgnoreCase(dataAction))
else if("FILE".equalsIgnoreCase(dataAction))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1212,16 +1162,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTGSTSUBPN";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
......@@ -1236,18 +1178,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTGSTFILE";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
}
if("GETINV".equalsIgnoreCase(dataAction) && !"GSTR2A".equalsIgnoreCase(recordType))
else if("GETINV".equalsIgnoreCase(dataAction) && !"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);
......@@ -1263,16 +1196,88 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNORECSAV";
}
}
if(pstmt!=null)
closeResources(rs, pstmt);
}
else if("DELETE".equalsIgnoreCase(dataAction))
{
int saveRecCnt = 0;
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'T' 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())
{
pstmt.close();
pstmt = null;
saveRecCnt = rs.getInt("CNT");
if(saveRecCnt == 0)
{
isDataError = true;
errorCode = "VTNORECDEL";
}
}
if(rs!=null)
closeResources(rs, pstmt);
if(saveRecCnt == 0)
{
rs.close();
rs = null;
int pendRecDnt = 0;
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'P' 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())
{
pendRecDnt = rs.getInt("CNT");
if(pendRecDnt == 0)
{
isDataError = true;
errorCode = "VTNDGSDATA";
}
else
{
isDataError = true;
errorCode = "VTPENGSDAT";
}
}
closeResources(rs, pstmt);
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' 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 = "VTSUBALRDY";
}
}
closeResources(rs, pstmt);
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' 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 = "VTFILALRDY";
}
}
closeResources(rs, pstmt);
}
if(!isDataError)
......@@ -1366,16 +1371,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{
dataErrMsg = rs.getString("MSG_DESCR");
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
retResponseXML = "<root><message><![CDATA[Message : "+dataErrMsg+"]]></message></root>";
}
......@@ -1415,16 +1411,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
stateCode = checkNull(rs.getString("GST_CODE"));
stateDescr = checkNull(rs.getString("DESCR"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
retResponseXML = "<root><Detail1>"
+ "<site_descr><![CDATA["+siteDescr+"]]></site_descr>"
......@@ -1457,16 +1444,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNOGSDATA";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
closeResources(rs, pstmt);
if(!isDataError)
{
......@@ -1484,12 +1462,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{
dataErrMsg = rs.getString("MSG_DESCR");
}
if(pstmt!=null)
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
if(rs != null)
{
rs.close();
rs = null;
......@@ -1510,6 +1488,16 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{
try
{
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(!conn.isClosed() && conn != null)
{
conn.close();
......
webitm-gst/ibase/webitm/util/gst/ATSerializer.java
View file @ d8422bc9
......@@ -16,10 +16,19 @@ public class ATSerializer extends BaseSerializer<AT>
{
json.writeStartObject();
json.writeStringField("pos", at.pos);
json.writeStringField("sply_ty", at.supplyType);
writeLineItems(at, json);
if(at.taxPayerAction != null && "D".equalsIgnoreCase(at.taxPayerAction))
{
json.writeStringField("flag", at.taxPayerAction);
json.writeStringField("pos", at.pos);
json.writeStringField("sply_ty", at.supplyType);
}
else
{
json.writeStringField("pos", at.pos);
json.writeStringField("sply_ty", at.supplyType);
writeLineItems(at, json);
}
json.writeEndObject();
}
......
webitm-gst/ibase/webitm/util/gst/B2CSSerializer.java
View file @ d8422bc9
......@@ -15,35 +15,31 @@ public class B2CSSerializer extends BaseSerializer<B2CS>
{
json.writeStartObject();
if(b2cs.taxPayerAction!= null)
if(b2cs.taxPayerAction!= null && "D".equalsIgnoreCase(b2cs.taxPayerAction))
{
json.writeStringField("flag", b2cs.taxPayerAction);
json.writeStringField("sply_ty", b2cs.supplyType);
json.writeStringField("typ", b2cs.typ);
json.writeStringField("pos", b2cs.pos);
json.writeNumberField("rt", b2cs.rate);
}
json.writeStringField("sply_ty", b2cs.supplyType);
json.writeNumberField("txval", b2cs.txval);
json.writeStringField("typ", b2cs.typ);
if(b2cs.etin!=null)
{
json.writeStringField("etin", b2cs.etin);
}
json.writeStringField("pos", b2cs.pos);
json.writeNumberField("rt", b2cs.rate);
if(b2cs.iamt > 0)
else
{
json.writeStringField("sply_ty", b2cs.supplyType);
json.writeNumberField("txval", b2cs.txval);
json.writeStringField("typ", b2cs.typ);
if(b2cs.etin!=null)
{
json.writeStringField("etin", b2cs.etin);
}
json.writeStringField("pos", b2cs.pos);
json.writeNumberField("rt", b2cs.rate);
json.writeNumberField("iamt", b2cs.iamt);
}
if(b2cs.camt > 0)
{
json.writeNumberField("camt", b2cs.camt);
}
if(b2cs.samt > 0)
{
json.writeNumberField("samt", b2cs.samt);
}
if(b2cs.csamt > 0)
{
json.writeNumberField("csamt", b2cs.csamt);
}
json.writeEndObject();
}
}
webitm-gst/ibase/webitm/util/gst/BaseSerializer.java
View file @ d8422bc9
......@@ -34,13 +34,17 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
{
json.writeStartObject();
if( (inv.taxPayerAction != null) && ("A".equalsIgnoreCase(inv.taxPayerAction) || "M".equalsIgnoreCase(inv.taxPayerAction) || "D".equalsIgnoreCase(inv.taxPayerAction)) )
if( (inv.taxPayerAction != null) && ("A".equalsIgnoreCase(inv.taxPayerAction) || "M".equalsIgnoreCase(inv.taxPayerAction)) )
{
json.writeStringField("flag", inv.taxPayerAction);
}
if ( inv.taxPayerAction != null && "D".equalsIgnoreCase(inv.taxPayerAction))
{
json.writeStringField("flag", inv.taxPayerAction);
json.writeStringField("inum", inv.inum);
json.writeStringField("idt", gstFmt.format(inv.idt));
json.writeStringField("chksum", inv.checksum);
}
}
else
{
if(inv.shippingPortCode != null)
......
webitm-gst/ibase/webitm/util/gst/CDNRSerializer.java
View file @ d8422bc9
......@@ -41,28 +41,36 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
{
json.writeStartObject();
json.writeStringField("ntty", cdnDetails.cdnNoteType);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
json.writeStringField("inum", cdnDetails.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnDetails.invoiceDate));
json.writeNumberField("val", cdnDetails.val);
if(cdnDetails.reason != null && cdnDetails.reason.trim().length()>0)
{
json.writeStringField("rsn", cdnDetails.reason);
}
json.writeStringField("p_gst", cdnDetails.isPreGSTInvoice ? "Y" : "N");
if(cdnDetails.taxPayerAction != null && cdnDetails.taxPayerAction.length() > 0)
if(cdnDetails.taxPayerAction != null && "D".equalsIgnoreCase(cdnDetails.taxPayerAction))
{
json.writeStringField("flag", cdnDetails.taxPayerAction);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
}
if(cdnDetails.checksum != null && cdnDetails.checksum.trim().length() > 0)
else
{
json.writeStringField("chksum", cdnDetails.checksum);
json.writeStringField("ntty", cdnDetails.cdnNoteType);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
json.writeStringField("inum", cdnDetails.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnDetails.invoiceDate));
json.writeNumberField("val", cdnDetails.val);
if(cdnDetails.reason != null && cdnDetails.reason.trim().length()>0)
{
json.writeStringField("rsn", cdnDetails.reason);
}
json.writeStringField("p_gst", cdnDetails.isPreGSTInvoice ? "Y" : "N");
if(cdnDetails.taxPayerAction != null && cdnDetails.taxPayerAction.length() > 0)
{
json.writeStringField("flag", cdnDetails.taxPayerAction);
}
if(cdnDetails.checksum != null && cdnDetails.checksum.trim().length() > 0)
{
json.writeStringField("chksum", cdnDetails.checksum);
}
writeCDNLineItems(cdnDetails, json);
}
writeCDNLineItems(cdnDetails, json);
json.writeEndObject();
}
catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/CDNURSerializer.java
View file @ d8422bc9
......@@ -32,19 +32,29 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
json.writeStringField("rtin", cdnur.receiverGSTIN);
}
}
json.writeStringField("ntty", cdnur.cdnNoteType);
json.writeStringField("nt_num", cdnur.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
json.writeStringField("inum", cdnur.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnur.invoiceDate));
json.writeNumberField("val", cdnur.val);
if(cdnur.reason != null && cdnur.reason.trim().length() > 0)
if(cdnur.taxPayerAction != null && "D".equalsIgnoreCase(cdnur.taxPayerAction))
{
json.writeStringField("rsn", cdnur.reason);
json.writeStringField("flag", cdnur.taxPayerAction);
json.writeStringField("nt_num", cdnur.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
}
else
{
json.writeStringField("ntty", cdnur.cdnNoteType);
json.writeStringField("nt_num", cdnur.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
json.writeStringField("inum", cdnur.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnur.invoiceDate));
json.writeNumberField("val", cdnur.val);
if(cdnur.reason != null && cdnur.reason.trim().length() > 0)
{
json.writeStringField("rsn", cdnur.reason);
}
json.writeStringField("p_gst", cdnur.isPreGSTInvoice ? "Y" : "N");
writeLineItems(cdnur.items, json);
}
json.writeStringField("p_gst", cdnur.isPreGSTInvoice ? "Y" : "N");
writeLineItems(cdnur.items, json);
json.writeEndObject();
}
......
webitm-gst/ibase/webitm/util/gst/DocSerializer.java
View file @ d8422bc9
......@@ -20,34 +20,36 @@ public class DocSerializer extends BaseSerializer<DocIssued>
{
json.writeStringField("flag", docIssued.taxPayerAction);
}
json.writeFieldName("doc_det");
json.writeStartArray();
for(DocDetails docDetail : docIssued.docDetails)
else
{
json.writeStartObject();
json.writeNumberField("doc_num", docDetail.serialNumber);
json.writeFieldName("docs");
json.writeFieldName("doc_det");
json.writeStartArray();
for(Docs doc : docDetail.docs)
for(DocDetails docDetail : docIssued.docDetails)
{
json.writeStartObject();
json.writeNumberField("doc_num", docDetail.serialNumber);
json.writeNumberField("num", doc.docNum);
json.writeStringField("from", doc.fromSerialNo);
json.writeStringField("to", doc.toSerialNo);
json.writeNumberField("totnum", doc.totalNo);
json.writeNumberField("cancel", doc.cancelNo);
json.writeNumberField("net_issue", doc.toatlNetIssued);
json.writeFieldName("docs");
json.writeStartArray();
for(Docs doc : docDetail.docs)
{
json.writeStartObject();
json.writeNumberField("num", doc.docNum);
json.writeStringField("from", doc.fromSerialNo);
json.writeStringField("to", doc.toSerialNo);
json.writeNumberField("totnum", doc.totalNo);
json.writeNumberField("cancel", doc.cancelNo);
json.writeNumberField("net_issue", doc.toatlNetIssued);
json.writeEndObject();
}
json.writeEndArray();
json.writeEndObject();
}
json.writeEndArray();
json.writeEndObject();
}
json.writeEndArray();
json.writeEndObject();
}
}
webitm-gst/ibase/webitm/util/gst/HSNSerializer.java
View file @ d8422bc9
......@@ -16,22 +16,31 @@ public class HSNSerializer extends BaseSerializer<HSN>
{
json.writeStartObject();
if("1".equalsIgnoreCase(hsn.recType))
if(hsn.taxPayerAction != null && "D".equalsIgnoreCase(hsn.taxPayerAction))
{
json.writeFieldName("data");
json.writeStringField("flag", hsn.taxPayerAction);
}
else if("2".equalsIgnoreCase(hsn.recType))
else
{
json.writeFieldName("det");
}
json.writeStartArray();
if("1".equalsIgnoreCase(hsn.recType))
{
json.writeFieldName("data");
}
else if("2".equalsIgnoreCase(hsn.recType))
{
json.writeFieldName("det");
}
json.writeStartArray();
for(HSNDetails hsnDetails : hsn.hsnDetails)
{
writeEachHSN(hsnDetails, json);
}
json.writeEndArray();
for(HSNDetails hsnDetails : hsn.hsnDetails)
{
writeEachHSN(hsnDetails, json);
}
json.writeEndArray();
}
json.writeEndObject();
}
......
webitm-gst/ibase/webitm/util/gst/IMPGSerializer.java
View file @ d8422bc9
......@@ -23,62 +23,70 @@ public class IMPGSerializer extends JsonSerializer<IMPG>
{
json.writeStartObject();
json.writeStringField("is_sez", impg.isSezImport ? "Y" : "N");
if(impg.isSezImport)
if(impg.taxPayerAction != null && "D".equalsIgnoreCase(impg.taxPayerAction))
{
json.writeStringField("stin", impg.sezGSTIN);
json.writeStringField("flag", impg.taxPayerAction);
json.writeStringField("boe_num", impg.billOfEntryNo);
json.writeStringField("boe_dt", gstFmt.format(impg.billOfEntryDate));
}
json.writeStringField("boe_num", impg.billOfEntryNo);
json.writeStringField("boe_dt", gstFmt.format(impg.billOfEntryDate));
json.writeNumberField("boe_val", impg.amount);
json.writeStringField("port_code", impg.portCode);
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : impg.items)
else
{
json.writeStartObject();
json.writeNumberField("num", li.num);
json.writeNumberField("txval", li.taxval);
json.writeNumberField("rt", li.rate);
if(li.iamt > 0.0)
{
json.writeNumberField("iamt", li.iamt);
}
if(li.camt > 0.0)
{
json.writeNumberField("camt", li.camt);
}
if(li.samt > 0.0)
{
json.writeNumberField("samt", li.samt);
}
if(li.csamt > 0.0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeStringField("elg", li.itcType);
json.writeNumberField("tx_i", li.igstInputTax);
if(li.cgstInputTax > 0.0)
json.writeStringField("is_sez", impg.isSezImport ? "Y" : "N");
if(impg.isSezImport)
{
json.writeNumberField("tx_c", li.cgstInputTax);
json.writeStringField("stin", impg.sezGSTIN);
}
if(li.sgstInputTax > 0.0)
json.writeStringField("boe_num", impg.billOfEntryNo);
json.writeStringField("boe_dt", gstFmt.format(impg.billOfEntryDate));
json.writeNumberField("boe_val", impg.amount);
json.writeStringField("port_code", impg.portCode);
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : impg.items)
{
json.writeNumberField("tx_s", li.sgstInputTax);
json.writeStartObject();
json.writeNumberField("num", li.num);
json.writeNumberField("txval", li.taxval);
json.writeNumberField("rt", li.rate);
if(li.iamt > 0.0)
{
json.writeNumberField("iamt", li.iamt);
}
if(li.camt > 0.0)
{
json.writeNumberField("camt", li.camt);
}
if(li.samt > 0.0)
{
json.writeNumberField("samt", li.samt);
}
if(li.csamt > 0.0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeStringField("elg", li.itcType);
json.writeNumberField("tx_i", li.igstInputTax);
if(li.cgstInputTax > 0.0)
{
json.writeNumberField("tx_c", li.cgstInputTax);
}
if(li.sgstInputTax > 0.0)
{
json.writeNumberField("tx_s", li.sgstInputTax);
}
json.writeNumberField("tx_cs", li.cessInputTax);
json.writeEndObject();
}
json.writeNumberField("tx_cs", li.cessInputTax);
json.writeEndObject();
json.writeEndArray();
}
json.writeEndArray();
json.writeEndObject();
}
catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/IMPSSerializer.java
View file @ d8422bc9
......@@ -21,57 +21,65 @@ public class IMPSSerializer extends JsonSerializer<IMPS>
{
json.writeStartObject();
json.writeStringField("inum", imps.inum);
json.writeStringField("idt", gstFmt.format(imps.idt));
json.writeNumberField("ival", imps.val);
json.writeStringField("pos", imps.pos);
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : imps.items)
if(imps.taxPayerAction != null && "D".equalsIgnoreCase(imps.taxPayerAction))
{
json.writeStringField("flag", imps.taxPayerAction);
json.writeStringField("inum", imps.inum);
json.writeStringField("idt", gstFmt.format(imps.idt));
}
else
{
json.writeStartObject();
json.writeStringField("inum", imps.inum);
json.writeStringField("idt", gstFmt.format(imps.idt));
json.writeNumberField("ival", imps.val);
json.writeStringField("pos", imps.pos);
json.writeNumberField("num", li.num);
json.writeNumberField("txval", li.taxval);
json.writeNumberField("rt", li.rate);
if(li.iamt > 0.0)
{
json.writeNumberField("iamt", li.iamt);
}
if(li.camt > 0.0)
{
json.writeNumberField("camt", li.camt);
}
if(li.samt > 0.0)
{
json.writeNumberField("samt", li.samt);
}
if(li.csamt > 0.0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeStringField("elg", li.itcType);
json.writeNumberField("tx_i", li.igstInputTax);
if(li.cgstInputTax > 0.0)
{
json.writeNumberField("tx_c", li.cgstInputTax);
}
if(li.sgstInputTax > 0.0)
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : imps.items)
{
json.writeNumberField("tx_s", li.sgstInputTax);
json.writeStartObject();
json.writeNumberField("num", li.num);
json.writeNumberField("txval", li.taxval);
json.writeNumberField("rt", li.rate);
if(li.iamt > 0.0)
{
json.writeNumberField("iamt", li.iamt);
}
if(li.camt > 0.0)
{
json.writeNumberField("camt", li.camt);
}
if(li.samt > 0.0)
{
json.writeNumberField("samt", li.samt);
}
if(li.csamt > 0.0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeStringField("elg", li.itcType);
json.writeNumberField("tx_i", li.igstInputTax);
if(li.cgstInputTax > 0.0)
{
json.writeNumberField("tx_c", li.cgstInputTax);
}
if(li.sgstInputTax > 0.0)
{
json.writeNumberField("tx_s", li.sgstInputTax);
}
json.writeNumberField("tx_cs", li.cessInputTax);
json.writeEndObject();
}
json.writeNumberField("tx_cs", li.cessInputTax);
json.writeEndObject();
json.writeEndArray();
}
json.writeEndArray();
json.writeEndObject();
}
......
webitm-gst/ibase/webitm/util/gst/NilInwardSerializer.java
View file @ d8422bc9
......@@ -16,30 +16,36 @@ public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies>
{
json.writeStartObject();
if(nilInwardSupplies.interNilSupplies != null)
if(nilInwardSupplies.taxPayerAction != null && "D".equalsIgnoreCase(nilInwardSupplies.taxPayerAction))
{
json.writeFieldName("inter");
json.writeStartObject();
json.writeNumberField("cpddr", nilInwardSupplies.interNilSupplies.compoundSuppliesAmt);
json.writeNumberField("exptdsply", nilInwardSupplies.interNilSupplies.exempetedSuppliesAmt);
json.writeNumberField("ngsply", nilInwardSupplies.interNilSupplies.nonGSTSuppliesAmt);
json.writeNumberField("nilsply", nilInwardSupplies.interNilSupplies.nilSuppliesAmt);
json.writeEndObject();
json.writeStringField("flag", nilInwardSupplies.taxPayerAction);
}
if(nilInwardSupplies.intraNilSupplies != null)
else
{
json.writeFieldName("intra");
if(nilInwardSupplies.interNilSupplies != null)
{
json.writeFieldName("inter");
json.writeStartObject();
json.writeNumberField("cpddr", nilInwardSupplies.interNilSupplies.compoundSuppliesAmt);
json.writeNumberField("exptdsply", nilInwardSupplies.interNilSupplies.exempetedSuppliesAmt);
json.writeNumberField("ngsply", nilInwardSupplies.interNilSupplies.nonGSTSuppliesAmt);
json.writeNumberField("nilsply", nilInwardSupplies.interNilSupplies.nilSuppliesAmt);
json.writeEndObject();
}
json.writeStartObject();
json.writeNumberField("cpddr", nilInwardSupplies.intraNilSupplies.compoundSuppliesAmt);
json.writeNumberField("exptdsply", nilInwardSupplies.intraNilSupplies.exempetedSuppliesAmt);
json.writeNumberField("ngsply", nilInwardSupplies.intraNilSupplies.nonGSTSuppliesAmt);
json.writeNumberField("nilsply", nilInwardSupplies.intraNilSupplies.nilSuppliesAmt);
json.writeEndObject();
if(nilInwardSupplies.intraNilSupplies != null)
{
json.writeFieldName("intra");
json.writeStartObject();
json.writeNumberField("cpddr", nilInwardSupplies.intraNilSupplies.compoundSuppliesAmt);
json.writeNumberField("exptdsply", nilInwardSupplies.intraNilSupplies.exempetedSuppliesAmt);
json.writeNumberField("ngsply", nilInwardSupplies.intraNilSupplies.nonGSTSuppliesAmt);
json.writeNumberField("nilsply", nilInwardSupplies.intraNilSupplies.nilSuppliesAmt);
json.writeEndObject();
}
}
json.writeEndObject();
}
}
webitm-gst/ibase/webitm/util/gst/NilSerializer.java
View file @ d8422bc9
......@@ -16,16 +16,23 @@ public class NilSerializer extends BaseSerializer<Nil>
{
json.writeStartObject();
json.writeFieldName("inv");
json.writeStartArray();
if(nil.taxPayerAction != null && "D".equalsIgnoreCase(nil.taxPayerAction))
{
json.writeStringField("flag", nil.taxPayerAction);
}
else
{
json.writeFieldName("inv");
json.writeStartArray();
for(Invoice inv : nil.invoices)
{
writeInvoice(inv, json);
}
json.writeEndArray();
for(Invoice inv : nil.invoices)
{
writeInvoice(inv, json);
}
json.writeEndArray();
}
json.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