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 Show 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; ...@@ -7,6 +7,8 @@ import ibase.webitm.util.gst.NilInwardSerializer;
@JsonSerialize(using = NilInwardSerializer.class) @JsonSerialize(using = NilInwardSerializer.class)
public class NilInwardSupplies public class NilInwardSupplies
{ {
public String taxPayerAction;
public InterNilSupplies interNilSupplies; public InterNilSupplies interNilSupplies;
public IntraNilSupplies intraNilSupplies; 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 ...@@ -1062,16 +1062,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNOGSDATA"; errorCode = "VTNOGSDATA";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
...@@ -1086,16 +1078,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1086,16 +1078,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTSUBALRDY"; errorCode = "VTSUBALRDY";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
...@@ -1110,18 +1094,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1110,18 +1094,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTFILALRDY"; errorCode = "VTFILALRDY";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
} }
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 = ?"; 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 = conn.prepareStatement(sql);
...@@ -1137,16 +1112,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1137,16 +1112,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTSUBALRDY"; errorCode = "VTSUBALRDY";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'T' AND PRD_CODE = ? AND SITE_CODE = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
...@@ -1161,16 +1128,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1161,16 +1128,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNORECSAV"; errorCode = "VTNORECSAV";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
...@@ -1185,18 +1144,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1185,18 +1144,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTFILALRDY"; errorCode = "VTFILALRDY";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
} }
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 = ?"; 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 = conn.prepareStatement(sql);
...@@ -1212,16 +1162,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1212,16 +1162,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTGSTSUBPN"; errorCode = "VTGSTSUBPN";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
...@@ -1236,20 +1178,52 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1236,20 +1178,52 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTGSTFILE"; errorCode = "VTGSTFILE";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
}
else if("GETINV".equalsIgnoreCase(dataAction) && !"GSTR2A".equalsIgnoreCase(recordType))
{ {
pstmt.close(); 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 = null; 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 = "VTNORECSAV";
} }
if(rs!=null) }
closeResources(rs, pstmt);
}
else if("DELETE".equalsIgnoreCase(dataAction))
{ {
rs.close(); int saveRecCnt = 0;
rs = null;
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())
{
saveRecCnt = rs.getInt("CNT");
if(saveRecCnt == 0)
{
isDataError = true;
errorCode = "VTNORECDEL";
} }
} }
if("GETINV".equalsIgnoreCase(dataAction) && !"GSTR2A".equalsIgnoreCase(recordType)) closeResources(rs, pstmt);
if(saveRecCnt == 0)
{ {
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 = ?"; 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 = conn.prepareStatement(sql);
pstmt.setString(1, recType); pstmt.setString(1, recType);
pstmt.setString(2, periodCode); pstmt.setString(2, periodCode);
...@@ -1257,23 +1231,54 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1257,23 +1231,54 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
if(rs.getInt("CNT") == 0) pendRecDnt = rs.getInt("CNT");
if(pendRecDnt == 0)
{ {
isDataError = true; isDataError = true;
errorCode = "VTNORECSAV"; errorCode = "VTNDGSDATA";
} }
else
{
isDataError = true;
errorCode = "VTPENGSDAT";
} }
if(pstmt!=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);
pstmt.setString(2, periodCode);
pstmt.setString(3, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{ {
pstmt.close(); if(rs.getInt("CNT") > 0)
pstmt = null; {
isDataError = true;
errorCode = "VTSUBALRDY";
} }
if(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);
pstmt.setString(2, periodCode);
pstmt.setString(3, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{ {
rs.close(); if(rs.getInt("CNT") > 0)
rs = null; {
isDataError = true;
errorCode = "VTFILALRDY";
} }
} }
closeResources(rs, pstmt);
}
if(!isDataError) if(!isDataError)
{ {
...@@ -1366,16 +1371,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1366,16 +1371,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
dataErrMsg = rs.getString("MSG_DESCR"); dataErrMsg = rs.getString("MSG_DESCR");
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
retResponseXML = "<root><message><![CDATA[Message : "+dataErrMsg+"]]></message></root>"; retResponseXML = "<root><message><![CDATA[Message : "+dataErrMsg+"]]></message></root>";
} }
...@@ -1415,16 +1411,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1415,16 +1411,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
stateCode = checkNull(rs.getString("GST_CODE")); stateCode = checkNull(rs.getString("GST_CODE"));
stateDescr = checkNull(rs.getString("DESCR")); stateDescr = checkNull(rs.getString("DESCR"));
} }
if(pstmt != null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
retResponseXML = "<root><Detail1>" retResponseXML = "<root><Detail1>"
+ "<site_descr><![CDATA["+siteDescr+"]]></site_descr>" + "<site_descr><![CDATA["+siteDescr+"]]></site_descr>"
...@@ -1457,16 +1444,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1457,16 +1444,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
errorCode = "VTNOGSDATA"; errorCode = "VTNOGSDATA";
} }
} }
if(pstmt!=null) closeResources(rs, pstmt);
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
if(!isDataError) if(!isDataError)
{ {
...@@ -1484,12 +1462,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1484,12 +1462,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
dataErrMsg = rs.getString("MSG_DESCR"); dataErrMsg = rs.getString("MSG_DESCR");
} }
if(pstmt!=null) if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(rs!=null) if(rs != null)
{ {
rs.close(); rs.close();
rs = null; rs = null;
...@@ -1510,6 +1488,16 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1510,6 +1488,16 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
try try
{ {
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(!conn.isClosed() && conn != null) if(!conn.isClosed() && conn != null)
{ {
conn.close(); conn.close();
......
webitm-gst/ibase/webitm/util/gst/ATSerializer.java
View file @ d8422bc9
...@@ -16,10 +16,19 @@ public class ATSerializer extends BaseSerializer<AT> ...@@ -16,10 +16,19 @@ public class ATSerializer extends BaseSerializer<AT>
{ {
json.writeStartObject(); json.writeStartObject();
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("pos", at.pos);
json.writeStringField("sply_ty", at.supplyType); json.writeStringField("sply_ty", at.supplyType);
writeLineItems(at, json); writeLineItems(at, json);
}
json.writeEndObject(); json.writeEndObject();
} }
......
webitm-gst/ibase/webitm/util/gst/B2CSSerializer.java
View file @ d8422bc9
...@@ -15,10 +15,16 @@ public class B2CSSerializer extends BaseSerializer<B2CS> ...@@ -15,10 +15,16 @@ public class B2CSSerializer extends BaseSerializer<B2CS>
{ {
json.writeStartObject(); json.writeStartObject();
if(b2cs.taxPayerAction!= null) if(b2cs.taxPayerAction!= null && "D".equalsIgnoreCase(b2cs.taxPayerAction))
{ {
json.writeStringField("flag", 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);
} }
else
{
json.writeStringField("sply_ty", b2cs.supplyType); json.writeStringField("sply_ty", b2cs.supplyType);
json.writeNumberField("txval", b2cs.txval); json.writeNumberField("txval", b2cs.txval);
json.writeStringField("typ", b2cs.typ); json.writeStringField("typ", b2cs.typ);
...@@ -28,22 +34,12 @@ public class B2CSSerializer extends BaseSerializer<B2CS> ...@@ -28,22 +34,12 @@ public class B2CSSerializer extends BaseSerializer<B2CS>
} }
json.writeStringField("pos", b2cs.pos); json.writeStringField("pos", b2cs.pos);
json.writeNumberField("rt", b2cs.rate); json.writeNumberField("rt", b2cs.rate);
if(b2cs.iamt > 0)
{
json.writeNumberField("iamt", b2cs.iamt); json.writeNumberField("iamt", b2cs.iamt);
}
if(b2cs.camt > 0)
{
json.writeNumberField("camt", b2cs.camt); json.writeNumberField("camt", b2cs.camt);
}
if(b2cs.samt > 0)
{
json.writeNumberField("samt", b2cs.samt); json.writeNumberField("samt", b2cs.samt);
}
if(b2cs.csamt > 0)
{
json.writeNumberField("csamt", b2cs.csamt); json.writeNumberField("csamt", b2cs.csamt);
} }
json.writeEndObject(); json.writeEndObject();
} }
} }
webitm-gst/ibase/webitm/util/gst/BaseSerializer.java
View file @ d8422bc9
...@@ -34,12 +34,16 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T> ...@@ -34,12 +34,16 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
{ {
json.writeStartObject(); 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("flag", inv.taxPayerAction);
json.writeStringField("inum", inv.inum); json.writeStringField("inum", inv.inum);
json.writeStringField("idt", gstFmt.format(inv.idt)); json.writeStringField("idt", gstFmt.format(inv.idt));
json.writeStringField("chksum", inv.checksum);
} }
else else
{ {
......
webitm-gst/ibase/webitm/util/gst/CDNRSerializer.java
View file @ d8422bc9
...@@ -41,6 +41,14 @@ public class CDNRSerializer extends JsonSerializer<CDNR> ...@@ -41,6 +41,14 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
{ {
json.writeStartObject(); json.writeStartObject();
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));
}
else
{
json.writeStringField("ntty", cdnDetails.cdnNoteType); json.writeStringField("ntty", cdnDetails.cdnNoteType);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber); json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate)); json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
...@@ -62,7 +70,7 @@ public class CDNRSerializer extends JsonSerializer<CDNR> ...@@ -62,7 +70,7 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
} }
writeCDNLineItems(cdnDetails, json); writeCDNLineItems(cdnDetails, json);
}
json.writeEndObject(); json.writeEndObject();
} }
catch(Exception e) catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/CDNURSerializer.java
View file @ d8422bc9
...@@ -32,6 +32,15 @@ public class CDNURSerializer extends JsonSerializer<CDNUR> ...@@ -32,6 +32,15 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
json.writeStringField("rtin", cdnur.receiverGSTIN); json.writeStringField("rtin", cdnur.receiverGSTIN);
} }
} }
if(cdnur.taxPayerAction != null && "D".equalsIgnoreCase(cdnur.taxPayerAction))
{
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("ntty", cdnur.cdnNoteType);
json.writeStringField("nt_num", cdnur.cdNoteNumber); json.writeStringField("nt_num", cdnur.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate)); json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
...@@ -45,6 +54,7 @@ public class CDNURSerializer extends JsonSerializer<CDNUR> ...@@ -45,6 +54,7 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
json.writeStringField("p_gst", cdnur.isPreGSTInvoice ? "Y" : "N"); json.writeStringField("p_gst", cdnur.isPreGSTInvoice ? "Y" : "N");
writeLineItems(cdnur.items, json); writeLineItems(cdnur.items, json);
}
json.writeEndObject(); json.writeEndObject();
} }
......
webitm-gst/ibase/webitm/util/gst/DocSerializer.java
View file @ d8422bc9
...@@ -20,7 +20,8 @@ public class DocSerializer extends BaseSerializer<DocIssued> ...@@ -20,7 +20,8 @@ public class DocSerializer extends BaseSerializer<DocIssued>
{ {
json.writeStringField("flag", docIssued.taxPayerAction); json.writeStringField("flag", docIssued.taxPayerAction);
} }
else
{
json.writeFieldName("doc_det"); json.writeFieldName("doc_det");
json.writeStartArray(); json.writeStartArray();
for(DocDetails docDetail : docIssued.docDetails) for(DocDetails docDetail : docIssued.docDetails)
...@@ -48,6 +49,7 @@ public class DocSerializer extends BaseSerializer<DocIssued> ...@@ -48,6 +49,7 @@ public class DocSerializer extends BaseSerializer<DocIssued>
json.writeEndObject(); json.writeEndObject();
} }
json.writeEndArray(); json.writeEndArray();
}
json.writeEndObject(); json.writeEndObject();
} }
} }
webitm-gst/ibase/webitm/util/gst/HSNSerializer.java
View file @ d8422bc9
...@@ -16,6 +16,12 @@ public class HSNSerializer extends BaseSerializer<HSN> ...@@ -16,6 +16,12 @@ public class HSNSerializer extends BaseSerializer<HSN>
{ {
json.writeStartObject(); json.writeStartObject();
if(hsn.taxPayerAction != null && "D".equalsIgnoreCase(hsn.taxPayerAction))
{
json.writeStringField("flag", hsn.taxPayerAction);
}
else
{
if("1".equalsIgnoreCase(hsn.recType)) if("1".equalsIgnoreCase(hsn.recType))
{ {
json.writeFieldName("data"); json.writeFieldName("data");
...@@ -32,6 +38,9 @@ public class HSNSerializer extends BaseSerializer<HSN> ...@@ -32,6 +38,9 @@ public class HSNSerializer extends BaseSerializer<HSN>
} }
json.writeEndArray(); json.writeEndArray();
}
json.writeEndObject(); json.writeEndObject();
} }
......
webitm-gst/ibase/webitm/util/gst/IMPGSerializer.java
View file @ d8422bc9
...@@ -23,6 +23,14 @@ public class IMPGSerializer extends JsonSerializer<IMPG> ...@@ -23,6 +23,14 @@ public class IMPGSerializer extends JsonSerializer<IMPG>
{ {
json.writeStartObject(); json.writeStartObject();
if(impg.taxPayerAction != null && "D".equalsIgnoreCase(impg.taxPayerAction))
{
json.writeStringField("flag", impg.taxPayerAction);
json.writeStringField("boe_num", impg.billOfEntryNo);
json.writeStringField("boe_dt", gstFmt.format(impg.billOfEntryDate));
}
else
{
json.writeStringField("is_sez", impg.isSezImport ? "Y" : "N"); json.writeStringField("is_sez", impg.isSezImport ? "Y" : "N");
if(impg.isSezImport) if(impg.isSezImport)
{ {
...@@ -78,7 +86,7 @@ public class IMPGSerializer extends JsonSerializer<IMPG> ...@@ -78,7 +86,7 @@ public class IMPGSerializer extends JsonSerializer<IMPG>
json.writeEndObject(); json.writeEndObject();
} }
json.writeEndArray(); json.writeEndArray();
}
json.writeEndObject(); json.writeEndObject();
} }
catch(Exception e) catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/IMPSSerializer.java
View file @ d8422bc9
...@@ -21,6 +21,14 @@ public class IMPSSerializer extends JsonSerializer<IMPS> ...@@ -21,6 +21,14 @@ public class IMPSSerializer extends JsonSerializer<IMPS>
{ {
json.writeStartObject(); json.writeStartObject();
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.writeStringField("inum", imps.inum); json.writeStringField("inum", imps.inum);
json.writeStringField("idt", gstFmt.format(imps.idt)); json.writeStringField("idt", gstFmt.format(imps.idt));
json.writeNumberField("ival", imps.val); json.writeNumberField("ival", imps.val);
...@@ -71,7 +79,7 @@ public class IMPSSerializer extends JsonSerializer<IMPS> ...@@ -71,7 +79,7 @@ public class IMPSSerializer extends JsonSerializer<IMPS>
json.writeEndObject(); json.writeEndObject();
} }
json.writeEndArray(); json.writeEndArray();
}
json.writeEndObject(); json.writeEndObject();
} }
......
webitm-gst/ibase/webitm/util/gst/NilInwardSerializer.java
View file @ d8422bc9
...@@ -16,6 +16,12 @@ public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies> ...@@ -16,6 +16,12 @@ public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies>
{ {
json.writeStartObject(); json.writeStartObject();
if(nilInwardSupplies.taxPayerAction != null && "D".equalsIgnoreCase(nilInwardSupplies.taxPayerAction))
{
json.writeStringField("flag", nilInwardSupplies.taxPayerAction);
}
else
{
if(nilInwardSupplies.interNilSupplies != null) if(nilInwardSupplies.interNilSupplies != null)
{ {
json.writeFieldName("inter"); json.writeFieldName("inter");
...@@ -39,7 +45,7 @@ public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies> ...@@ -39,7 +45,7 @@ public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies>
json.writeNumberField("nilsply", nilInwardSupplies.intraNilSupplies.nilSuppliesAmt); json.writeNumberField("nilsply", nilInwardSupplies.intraNilSupplies.nilSuppliesAmt);
json.writeEndObject(); json.writeEndObject();
} }
}
json.writeEndObject(); json.writeEndObject();
} }
} }
webitm-gst/ibase/webitm/util/gst/NilSerializer.java
View file @ d8422bc9
...@@ -16,6 +16,12 @@ public class NilSerializer extends BaseSerializer<Nil> ...@@ -16,6 +16,12 @@ public class NilSerializer extends BaseSerializer<Nil>
{ {
json.writeStartObject(); json.writeStartObject();
if(nil.taxPayerAction != null && "D".equalsIgnoreCase(nil.taxPayerAction))
{
json.writeStringField("flag", nil.taxPayerAction);
}
else
{
json.writeFieldName("inv"); json.writeFieldName("inv");
json.writeStartArray(); json.writeStartArray();
...@@ -25,6 +31,7 @@ public class NilSerializer extends BaseSerializer<Nil> ...@@ -25,6 +31,7 @@ public class NilSerializer extends BaseSerializer<Nil>
} }
json.writeEndArray(); json.writeEndArray();
}
json.writeEndObject(); 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