F17ABAS001 source code commit

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

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

@@ -5,6 +5,10 @@ import java.util.List;
 
 public class CDNDetails 
 {
+	public String taxPayerAction;
+	
+	public String checksum;
+	
 	public String cdnNoteType;
 	
 	public String cdNoteNumber;

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

@@ -26,7 +26,7 @@ public class Invoice
     
     public String shippingPortCode;
     
-    public String shippingBillNum;
+    public double shippingBillNum;
     
     public Date shippingBillDt;
     

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

@@ -47,9 +47,9 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             	{
             		json.writeStringField("sbpcode",inv.shippingPortCode);
             	}
-                if(inv.shippingBillNum != null)
+                if(inv.shippingBillNum >= 0)
                 {
-                	json.writeStringField("sbnum", inv.shippingBillNum);
+                	json.writeNumberField("sbnum", inv.shippingBillNum);
                 }
                 if(inv.shippingBillDt != null)
                 {

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

@@ -52,6 +52,14 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
 				json.writeStringField("rsn", cdnDetails.reason);
 			}
 			json.writeStringField("p_gst", cdnDetails.isPreGSTInvoice ? "Y" : "N");
+			if(cdnDetails.taxPayerAction != null)
+			{
+				json.writeStringField("flag", cdnDetails.taxPayerAction);
+			}
+			if(cdnDetails.checksum != null && cdnDetails.checksum.trim().length() > 0)
+			{
+				json.writeStringField("chksum", cdnDetails.checksum);
+			}
 			
 			writeCDNLineItems(cdnDetails, json);
 

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

@@ -15,7 +15,7 @@ public class EXPSerializer extends BaseSerializer<EXP>
     {
         json.writeStartObject();
 
-        json.writeStringField("ex_tp", exp.exportType);
+        json.writeStringField("exp_typ", exp.exportType);
         writeInvoices(exp, json);
 
         json.writeEndObject();