F17ABAS001 source code commit

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105899 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst/ibase/webitm/bean/gst/EXP.java

+package ibase.webitm.bean.gst;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.EXPSerializer;
+
+@JsonSerialize(using = EXPSerializer.class)
+public class EXP extends BaseData
+{
+	public String exportType;
+}

webitm-gst/ibase/webitm/bean/gst/EXPA.java

+package ibase.webitm.bean.gst;
+
+public class EXPA 
+{
+
+}

webitm-gst/ibase/webitm/bean/gst/GSTR1.java

@@ -47,4 +47,10 @@ public class GSTR1 {
     
     @JsonProperty("ata")
     public List<ATA> ata;
+    
+    @JsonProperty("exp")
+    public List<EXP> exp;
+    
+    @JsonProperty("expa")
+    public List<EXPA> expa;
 }

webitm-gst/ibase/webitm/bean/gst/Invoice.java

@@ -33,6 +33,12 @@ public class Invoice
     public String etin;
     
     public String checksum;
+    
+    public String shippingPortCode;
+    
+    public String shippingBillNum;
+    
+    public Date shippingBillDt;
 
     public List<InvLineItem> items;
 }

webitm-gst/ibase/webitm/util/gst/BaseSerializer.java

@@ -51,6 +51,18 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
                 {
                 	json.writeStringField("cname", inv.cname);
                 }
+                if(inv.shippingPortCode != null)
+                {
+                	json.writeStringField("sbpcode", inv.shippingPortCode);
+                }
+                if(inv.shippingBillNum != null)
+                {
+                	json.writeStringField("sbnum", inv.shippingBillNum);
+                }
+                if(inv.shippingBillDt != null)
+                {
+                	json.writeStringField("sbdt", gstFmt.format(inv.shippingBillDt));
+                }
                 
                 json.writeStringField("inum", inv.inum);
                 json.writeStringField("idt", gstFmt.format(inv.idt));

webitm-gst/ibase/webitm/util/gst/EXPSerializer.java

+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.EXP;
+
+public class EXPSerializer extends BaseSerializer<EXP>
+{
+	@Override
+    public void serialize(EXP exp, final JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+    {
+        json.writeStartObject();
+
+        json.writeStringField("ex_tp", exp.exportType);
+        writeInvoices(exp, json);
+
+        json.writeEndObject();
+    }
+}

webitm-gst/ibase/webitm/util/gst/GSTR1Serailizer.java

@@ -57,6 +57,14 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
         {
         	jsonGenerator.writeObjectField("ata", gstr1.ata);
         }
+        if(gstr1.exp != null)
+        {
+        	jsonGenerator.writeObjectField("exp", gstr1.exp);
+        }
+        if(gstr1.expa != null)
+        {
+        	jsonGenerator.writeObjectField("expa", gstr1.expa);
+        }
         jsonGenerator.writeEndObject();
     }
 }