Skip to content

B
business-java
Commit 166b8d28 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@106003 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8903a3c0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 672 deletions
webitm-gst/ibase/webitm/bean/gst/AT.java
View file @ 166b8d28
package ibase.webitm.bean.gst;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......@@ -10,15 +9,9 @@ import ibase.webitm.util.gst.ATSearializer;
@JsonSerialize(using = ATSearializer.class)
public class AT extends BaseData
{
public String typ;
public String pos;
public String cpty;
public String stateCode;
public String docNum;
public Date docDt;
public String supplyType;
public List<InvLineItem> itms;
}
webitm-gst/ibase/webitm/bean/gst/B2CS.java
View file @ 166b8d28
package ibase.webitm.bean.gst;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ibase.webitm.util.gst.B2CSSerializer;
......@@ -9,37 +7,26 @@ import ibase.webitm.util.gst.B2CSSerializer;
@JsonSerialize(using = B2CSSerializer.class)
public class B2CS extends BaseData
{
public String stateCode;
public String ty;
public String taxPayerAction;
public String itemOrServiceCode;
public String supplyType;
public double txval;
public double irt;
public String typ;
public double iamt;
public String etin;
public double crt;
public String pos;
public double camt;
public double rate;
public double srt;
public double iamt;
public double samt;
public double camt;
public double csrt;
public double samt;
public double csamt;
public boolean prs;
public String od_num;
public Date od_dt;
public String etin;
public String typ;
}
webitm-gst/ibase/webitm/bean/gst/CDNDetails.java
View file @ 166b8d28
package ibase.webitm.bean.gst;
import java.util.Date;
import java.util.List;
public class CDNDetails
{
......@@ -10,36 +11,11 @@ public class CDNDetails
public Date cdNoteDate;
public String orgCDNoteNumber;
public Date orgCDNoteDate;
public String reason;
public String invoiceNumber;
public Date invoiceDate;
public boolean rchrg;
public double val;
public double irt;
public double iamt;
public double crt;
public double camt;
public double srt;
public double samt;
public double csrt;
public double csamt;
public String etin;
public List<InvLineItem> items;
}
webitm-gst/ibase/webitm/bean/gst/CDNR.java
View file @ 166b8d28
......@@ -11,5 +11,7 @@ public class CDNR extends BaseData
{
public String ctin;
public boolean customerFilingStatus;
public List<CDNDetails> cdnDetails;
}
webitm-gst/ibase/webitm/bean/gst/GSTR1.java
View file @ 166b8d28
......@@ -56,4 +56,7 @@ public class GSTR1 {
@JsonProperty("expa")
public List<EXPA> expa;
@JsonProperty("txpd")
public List<AT> txpd;
}
webitm-gst/ibase/webitm/bean/gst/Invoice.java
View file @ 166b8d28
......@@ -24,8 +24,6 @@ public class Invoice
public String invoiceType;
public String shippingPortCode;
public String shippingBillNum;
public Date shippingBillDt;
......
webitm-gst/ibase/webitm/util/gst/ATASearializer.java
View file @ 166b8d28
......@@ -16,7 +16,7 @@ public class ATASearializer extends BaseSerializer<ATA>
{
json.writeStartObject();
json.writeStringField("typ", ata.typ);
json.writeStringField("sply_ty", ata.supplyType);
if(ata.orgCpty != null && ata.orgDocNum != null && ata.orgDocDt != null)
{
......@@ -24,12 +24,6 @@ public class ATASearializer extends BaseSerializer<ATA>
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();
......
webitm-gst/ibase/webitm/util/gst/ATSearializer.java
View file @ 166b8d28
......@@ -16,11 +16,8 @@ public class ATSearializer extends BaseSerializer<AT>
{
json.writeStartObject();
json.writeStringField("typ", at.typ);
json.writeStringField("cpty", at.cpty);
json.writeStringField("state_cd", at.stateCode);
json.writeStringField("doc_num", at.docNum);
json.writeStringField("doc_dt", gstFmt.format(at.docDt));
json.writeStringField("pos", at.pos);
json.writeStringField("sply_ty", at.supplyType);
writeLineItems(at, json);
......@@ -47,21 +44,28 @@ public class ATSearializer extends BaseSerializer<AT>
{
json.writeStartObject();
//json.writeStringField("ty", li.ty);
//json.writeStringField("hsn_sc", li.hsn_sc);
json.writeNumberField("rt", li.rate);
json.writeNumberField("ad_amt", li.taxval);
//json.writeNumberField("irt", li.irt);
if(li.iamt > 0)
{
json.writeNumberField("iamt", li.iamt);
}
//json.writeNumberField("crt", li.crt);
if(li.camt > 0)
{
json.writeNumberField("camt", li.camt);
}
//json.writeNumberField("srt", li.srt);
if(li.samt > 0)
{
json.writeNumberField("samt", li.samt);
}
//json.writeNumberField("csrt", li.csrt);
if(li.csamt > 0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeEndObject();
}
......
webitm-gst/ibase/webitm/util/gst/B2CSASerializer.java
View file @ 166b8d28
......@@ -19,25 +19,13 @@ public class B2CSASerializer extends BaseSerializer<B2CSA>
json.writeStringField("oty", b2csa.orgType);
json.writeStringField("ohsn_sc", b2csa.orgItemOrServiceCode);
json.writeStringField("osupst_cd", b2csa.orgStateCode);
json.writeStringField("state_cd", b2csa.stateCode);
json.writeStringField("ty", b2csa.ty);
json.writeStringField("hsn_sc", b2csa.itemOrServiceCode);
json.writeStringField("pos", b2csa.pos);
json.writeNumberField("txval", b2csa.txval);
json.writeNumberField("irt", b2csa.irt);
json.writeNumberField("iamt", b2csa.iamt);
json.writeNumberField("crt", b2csa.crt);
json.writeNumberField("camt", b2csa.camt);
json.writeNumberField("srt", b2csa.srt);
json.writeNumberField("samt", b2csa.samt);
json.writeNumberField("csrt", b2csa.csrt);
json.writeNumberField("csamt", b2csa.csamt);
json.writeStringField("prs", b2csa.prs ? "Y" : "N");
if(b2csa.prs)
{
json.writeStringField("od_num", b2csa.od_num);
json.writeStringField("od_dt", gstFmt.format(b2csa.od_dt));
}
if(b2csa.etin!=null)
{
json.writeStringField("etin", b2csa.etin);
......
webitm-gst/ibase/webitm/util/gst/B2CSSerializer.java
View file @ 166b8d28
......@@ -15,31 +15,35 @@ public class B2CSSerializer extends BaseSerializer<B2CS>
{
json.writeStartObject();
json.writeStringField("state_cd", b2cs.stateCode);
json.writeStringField("ty", b2cs.ty);
json.writeStringField("hsn_sc", b2cs.itemOrServiceCode);
if(b2cs.taxPayerAction!= null)
{
json.writeStringField("flag", b2cs.taxPayerAction);
}
json.writeStringField("sply_ty", b2cs.supplyType);
json.writeNumberField("txval", b2cs.txval);
json.writeNumberField("irt", b2cs.irt);
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)
{
json.writeNumberField("iamt", b2cs.iamt);
json.writeNumberField("crt", b2cs.crt);
}
if(b2cs.camt > 0)
{
json.writeNumberField("camt", b2cs.camt);
json.writeNumberField("srt", b2cs.srt);
json.writeNumberField("samt", b2cs.samt);
json.writeNumberField("csrt", b2cs.csrt);
json.writeNumberField("csamt", b2cs.csamt);
json.writeStringField("prs", b2cs.prs ? "Y" : "N");
if(b2cs.prs)
}
if(b2cs.samt > 0)
{
json.writeStringField("od_num", b2cs.od_num);
json.writeStringField("od_dt", gstFmt.format(b2cs.od_dt));
json.writeNumberField("samt", b2cs.samt);
}
if(b2cs.etin!=null)
if(b2cs.csamt > 0)
{
json.writeStringField("etin", b2cs.etin);
json.writeNumberField("csamt", b2cs.csamt);
}
json.writeStringField("typ", b2cs.typ);
json.writeEndObject();
}
}
webitm-gst/ibase/webitm/util/gst/BaseSerializer.java
View file @ 166b8d28
......@@ -42,10 +42,6 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
}
else
{
if(inv.shippingPortCode != null)
{
json.writeStringField("sbpcode", inv.shippingPortCode);
}
if(inv.shippingBillNum != null)
{
json.writeStringField("sbnum", inv.shippingBillNum);
......
webitm-gst/ibase/webitm/util/gst/CDNRASerializer.java
View file @ 166b8d28
......@@ -42,40 +42,12 @@ public class CDNRASerializer extends JsonSerializer<CDNRA>
json.writeStringField("ntty", cdnDetails.cdnNoteType);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
json.writeStringField("rsn", cdnDetails.reason);
if(cdnDetails.orgCDNoteNumber != null && cdnDetails.orgCDNoteDate != null)
{
json.writeStringField("ont_num", cdnDetails.orgCDNoteNumber);
json.writeStringField("ont_dt", gstFmt.format(cdnDetails.orgCDNoteDate));
}
json.writeStringField("inum", cdnDetails.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnDetails.invoiceDate));
if(cdnra.isReverseCharge)
{
json.writeStringField("rchrg", cdnDetails.rchrg ? "Y" : "N");
}
json.writeNumberField("val", cdnDetails.val);
json.writeNumberField("irt", cdnDetails.irt);
json.writeNumberField("iamt", cdnDetails.iamt);
json.writeNumberField("crt", cdnDetails.crt);
json.writeNumberField("camt", cdnDetails.camt);
json.writeNumberField("srt", cdnDetails.srt);
json.writeNumberField("samt", cdnDetails.samt);
json.writeNumberField("csrt", cdnDetails.csrt);
json.writeNumberField("csamt", cdnDetails.csamt);
if(cdnDetails.etin!=null)
{
json.writeStringField("etin", cdnDetails.etin);
}
json.writeEndObject();
}
catch(Exception e)
......
webitm-gst/ibase/webitm/util/gst/CDNRSerializer.java
View file @ 166b8d28
......@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import ibase.webitm.bean.gst.CDNDetails;
import ibase.webitm.bean.gst.CDNR;
import ibase.webitm.bean.gst.InvLineItem;
public class CDNRSerializer extends JsonSerializer<CDNR>
{
......@@ -19,6 +20,7 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
{
json.writeStartObject();
json.writeStringField("ctin", cdnr.ctin);
//json.writeStringField("cfs", cdnr.customerFilingStaus?"Y":"N");
json.writeFieldName("nt");
json.writeStartArray();
......@@ -42,39 +44,84 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
json.writeStringField("ntty", cdnDetails.cdnNoteType);
json.writeStringField("nt_num", cdnDetails.cdNoteNumber);
json.writeStringField("nt_dt", gstFmt.format(cdnDetails.cdNoteDate));
json.writeStringField("rsn", cdnDetails.reason);
json.writeStringField("inum", cdnDetails.invoiceNumber);
json.writeStringField("idt", gstFmt.format(cdnDetails.invoiceDate));
json.writeNumberField("val", cdnDetails.val);
writeCDNLineItems(cdnDetails, json);
if(cdnr.isReverseCharge)
json.writeEndObject();
}
catch(Exception e)
{
json.writeStringField("rchrg", cdnDetails.rchrg ? "Y" : "N");
System.out.println("CDNRSerializer.writecdnDetails()["+e.getMessage()+"]");
e.printStackTrace();
}
}
json.writeNumberField("val", cdnDetails.val);
private void writeCDNLineItems(CDNDetails cdnDetails, JsonGenerator json)
{
try
{
json.writeFieldName("itms");
json.writeStartArray();
for(InvLineItem li : cdnDetails.items)
{
writeLineItem(li, json);
}
json.writeEndArray();
}
catch (IOException e)
{
System.out.println("CDNRSerializer.writeCDNLineItems()["+e.getMessage()+"]");
e.printStackTrace();
}
json.writeNumberField("irt", cdnDetails.irt);
json.writeNumberField("iamt", cdnDetails.iamt);
json.writeNumberField("crt", cdnDetails.crt);
json.writeNumberField("camt", cdnDetails.camt);
}
json.writeNumberField("srt", cdnDetails.srt);
json.writeNumberField("samt", cdnDetails.samt);
private void writeLineItem(InvLineItem li, JsonGenerator json)
{
try
{
json.writeStartObject();
json.writeNumberField("csrt", cdnDetails.csrt);
json.writeNumberField("csamt", cdnDetails.csamt);
json.writeNumberField("num", li.num);
if(cdnDetails.etin!=null)
json.writeFieldName("itm_det");
json.writeStartObject();
json.writeNumberField("rt", li.rate);
json.writeNumberField("txval", li.taxval);
if(li.iamt > 0)
{
json.writeStringField("etin", cdnDetails.etin);
json.writeNumberField("iamt", li.iamt);
}
if(li.camt > 0)
{
json.writeNumberField("camt", li.camt);
}
if(li.samt > 0)
{
json.writeNumberField("samt", li.samt);
}
if(li.csamt > 0)
{
json.writeNumberField("csamt", li.csamt);
}
json.writeEndObject();
json.writeEndObject();
}
catch(Exception e)
catch (Exception e)
{
System.out.println("CDNRSerializer.writecdnDetails()["+e.getMessage()+"]");
System.out.println("CDNRSerializer.writeLineItem()["+e.getMessage()+"]");
e.printStackTrace();
}
}
......
webitm-gst/ibase/webitm/util/gst/GSTR1Serailizer.java
View file @ 166b8d28
......@@ -66,6 +66,10 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
{
jsonGenerator.writeObjectField("expa", gstr1.expa);
}
if(gstr1.txpd != null)
{
jsonGenerator.writeObjectField("txpd", gstr1.txpd);
}
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