F17ABAS001 source code commit

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

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

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import ibase.webitm.util.gst.ATSearializer;
+import ibase.webitm.util.gst.ATSerializer;
 
-@JsonSerialize(using = ATSearializer.class)
+@JsonSerialize(using = ATSerializer.class)
 public class AT extends BaseData
 {
 	public String pos;

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

@@ -4,9 +4,9 @@ import java.util.Date;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import ibase.webitm.util.gst.ATASearializer;
+import ibase.webitm.util.gst.ATASerializer;
 
-@JsonSerialize(using = ATASearializer.class)
+@JsonSerialize(using = ATASerializer.class)
 public class ATA extends AT
 {
 	public String orgCpty;

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

@@ -6,5 +6,7 @@ public abstract class BaseData
 {
     public boolean isReverseCharge;
     
+    public String taxPayerAction;
+    
     public List<Invoice> invoices;
 }

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

@@ -62,4 +62,10 @@ public class GSTR1 {
     
     @JsonProperty("cdnur")
     public List<CDNUR> cdnur;
+    
+    @JsonProperty("nil")
+    public Nil nil;
+    
+    @JsonProperty("hsn")
+    public HSN hsn;
 }

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

+package ibase.webitm.bean.gst;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.HSNSerializer;
+
+@JsonSerialize(using = HSNSerializer.class)
+public class HSN extends BaseData
+{
+	public List<HSNDetails> hsnDetails;
+}

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

+package ibase.webitm.bean.gst;
+
+public class HSNDetails 
+{
+	public int num;
+	
+	public String itemOrServiceCode;
+	
+	public String description;
+	
+	public String unitOfMeasure;
+	
+	public double quantity;
+	
+	public double totalAmount;
+	
+	public double totalTaxableAmount;
+	
+	public double totalIGSTAmount;
+	
+	public double totalCGSTAmount;
+	
+	public double totalSGSTAmount;
+	
+	public double totalCESSAmount;
+}

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 public class Invoice 
 {
-	public String flag;
+	public String taxPayerAction;
 	
 	public String checksum;
 
@@ -27,6 +27,14 @@ public class Invoice
     public String shippingBillNum;
     
     public Date shippingBillDt;
+    
+    public String supplyType;
+    
+    public double totalNilAmount;
+    
+    public double totalExemptedAmount;
+    
+    public double totalNonGSTAmout;
 
     public List<InvLineItem> items;
 }

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

+package ibase.webitm.bean.gst;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.NilSerializer;
+
+@JsonSerialize(using = NilSerializer.class)
+public class Nil extends BaseData
+{
+	public String taxPayerAction;
+	
+	public List<Invoice> invoices;
+}

webitm-gst/ibase/webitm/util/gst/ATASerializer.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.ATA;
+import ibase.webitm.bean.gst.InvLineItem;
+
+public class ATASerializer extends BaseSerializer<ATA>
+{
+	@Override
+	public void serialize(ATA ata, JsonGenerator json, SerializerProvider serializeProvider) throws IOException, JsonProcessingException
+	{
+		json.writeStartObject();
+		
+		json.writeStringField("sply_ty", ata.supplyType);
+		
+		if(ata.orgCpty != null && ata.orgDocNum != null && ata.orgDocDt != null)
+		{
+			json.writeStringField("ocpty", ata.orgCpty);
+			json.writeStringField("odoc_num", ata.orgDocNum);
+			json.writeStringField("odoc_dt", gstFmt.format(ata.orgDocDt));
+		}
+		writeLineItems(ata, json);
+		
+		json.writeEndObject();
+	}
+	
+	 private void writeLineItems(ATA ata, JsonGenerator json) throws IOException 
+	    {
+	        json.writeFieldName("itms");
+	        
+	        json.writeStartArray();
+	        
+	        for(InvLineItem li : ata.itms)
+	        {
+	        	writeLineItem(json, li);
+	        }
+
+	        json.writeEndArray();
+	    }
+
+	    private void writeLineItem(JsonGenerator json, InvLineItem li) 
+	    {
+	        try 
+	        {
+	            json.writeStartObject();
+	            
+	            //json.writeStringField("ty", li.ty);
+	            //json.writeStringField("hsn_sc", li.hsn_sc);
+	            json.writeNumberField("ad_amt", li.taxval);
+
+	            //json.writeNumberField("irt", li.irt);
+	            json.writeNumberField("iamt", li.iamt);
+	            
+	        	//json.writeNumberField("crt", li.crt);
+	        	json.writeNumberField("camt", li.camt);
+	        	
+	        	//json.writeNumberField("srt", li.srt);
+	        	json.writeNumberField("samt", li.samt);
+	            
+	            //json.writeNumberField("csrt", li.csrt);
+	            json.writeNumberField("csamt", li.csamt);
+	            
+	            json.writeEndObject();
+	        }
+	        catch (Exception e) 
+	        {
+	        	System.out.println("ATSearializer.writeLineItem()["+e.getMessage()+"]");
+	            e.printStackTrace();
+	        }
+	    }
+}

webitm-gst/ibase/webitm/util/gst/ATSerializer.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.AT;
+import ibase.webitm.bean.gst.InvLineItem;
+
+public class ATSerializer extends BaseSerializer<AT>
+{
+	@Override
+	public void serialize(AT at, JsonGenerator json, SerializerProvider serializeProvider) throws IOException, JsonProcessingException
+	{
+		json.writeStartObject();
+		
+		json.writeStringField("pos", at.pos);
+		json.writeStringField("sply_ty", at.supplyType);
+		
+		writeLineItems(at, json);
+		
+		json.writeEndObject();
+	}
+	
+	 private void writeLineItems(AT at, JsonGenerator json) throws IOException 
+	    {
+	        json.writeFieldName("itms");
+	        
+	        json.writeStartArray();
+	        
+	        for(InvLineItem li : at.itms)
+	        {
+	        	writeLineItem(json, li);
+	        }
+
+	        json.writeEndArray();
+	    }
+
+	    private void writeLineItem(JsonGenerator json, InvLineItem li) 
+	    {
+	        try 
+	        {
+	            json.writeStartObject();
+	            
+	            json.writeNumberField("rt", li.rate);
+	            json.writeNumberField("ad_amt", li.taxval);
+
+	            if(li.iamt > 0)
+	            {
+	            	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();
+	        }
+	        catch (Exception e) 
+	        {
+	        	System.out.println("ATSearializer.writeLineItem()["+e.getMessage()+"]");
+	            e.printStackTrace();
+	        }
+	    }
+}

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

@@ -33,9 +33,9 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
         {
             json.writeStartObject();
             
-            if( (inv.flag != null) && ("A".equalsIgnoreCase(inv.flag) || "M".equalsIgnoreCase(inv.flag) || "D".equalsIgnoreCase(inv.flag)) )
+            if( (inv.taxPayerAction != null) && ("A".equalsIgnoreCase(inv.taxPayerAction) || "M".equalsIgnoreCase(inv.taxPayerAction) || "D".equalsIgnoreCase(inv.taxPayerAction)) )
             {
-            	json.writeStringField("flag", inv.flag);
+            	json.writeStringField("flag", inv.taxPayerAction);
             	json.writeStringField("inum", inv.inum);
                 json.writeStringField("idt", gstFmt.format(inv.idt));
                 json.writeStringField("chksum", inv.checksum);

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

@@ -74,6 +74,14 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
         {
         	jsonGenerator.writeObjectField("cdnur", gstr1.cdnur);
         }
+        if(gstr1.nil != null)
+        {
+        	jsonGenerator.writeObjectField("nil", gstr1.nil);
+        }
+        if(gstr1.hsn != null)
+        {
+        	jsonGenerator.writeObjectField("hsn", gstr1.hsn);
+        }
         jsonGenerator.writeEndObject();
     }
 }

webitm-gst/ibase/webitm/util/gst/HSNSerializer.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.HSN;
+import ibase.webitm.bean.gst.HSNDetails;
+
+public class HSNSerializer extends BaseSerializer<HSN>
+{
+	@Override
+	public void serialize(HSN hsn, JsonGenerator json, SerializerProvider serializeProvider) throws IOException, JsonProcessingException
+	{
+		json.writeStartObject();
+		
+		json.writeFieldName("data");
+        json.writeStartArray();
+
+        for(HSNDetails hsnDetails : hsn.hsnDetails)
+        {
+        	writeEachHSN(hsnDetails, json);
+        }
+        
+        json.writeEndArray();
+        json.writeEndObject();
+	}
+	
+	private void writeEachHSN(HSNDetails hsnDetails, JsonGenerator json)
+	{
+		try
+		{
+			json.writeStartObject();
+			
+			json.writeNumberField("num", hsnDetails.num);
+			json.writeStringField("hsn_sc", hsnDetails.itemOrServiceCode);
+			json.writeStringField("desc", hsnDetails.description);
+			json.writeStringField("uqc", hsnDetails.unitOfMeasure);
+			json.writeNumberField("qty", hsnDetails.quantity);
+			json.writeNumberField("val", hsnDetails.totalAmount);
+			json.writeNumberField("txval", hsnDetails.totalTaxableAmount);
+			if(hsnDetails.totalIGSTAmount > 0)
+			{
+				json.writeNumberField("iamt", hsnDetails.totalIGSTAmount);
+			}
+			if(hsnDetails.totalCGSTAmount > 0)
+			{
+				json.writeNumberField("camt", hsnDetails.totalCGSTAmount);
+			}
+			if(hsnDetails.totalSGSTAmount > 0)
+			{
+				json.writeNumberField("samt", hsnDetails.totalSGSTAmount);
+			}
+			if(hsnDetails.totalCESSAmount > 0)
+			{
+				json.writeNumberField("csamt", hsnDetails.totalCESSAmount);
+			}
+			
+			json.writeEndObject();
+		}
+		catch(Exception e)
+		{
+			System.out.println("HSNSerializer.writeEachHSN()["+e.getMessage()+"]");
+			e.printStackTrace();
+		}
+	}
+}

webitm-gst/ibase/webitm/util/gst/NilSerializer.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.Invoice;
+import ibase.webitm.bean.gst.Nil;
+
+public class NilSerializer extends BaseSerializer<Nil>
+{
+	@Override
+	public void serialize(Nil nil, JsonGenerator json, SerializerProvider serializerProvider)throws IOException, JsonProcessingException 
+	{
+		json.writeStartObject();
+		
+		json.writeFieldName("inv");
+        json.writeStartArray();
+
+        for(Invoice inv : nil.invoices)
+        {
+        	writeInvoice(inv, json);
+        }
+        
+        json.writeEndArray();
+        
+        json.writeEndObject();
+	}
+	
+	private void writeInvoice(Invoice inv, JsonGenerator json)
+	{
+		try
+		{
+			json.writeStartObject();
+			
+			json.writeStringField("sply_ty", inv.supplyType);
+			json.writeNumberField("nil_amt", inv.totalNilAmount);
+			json.writeNumberField("expt_amt", inv.totalExemptedAmount);
+			json.writeNumberField("ngsup_amt", inv.totalNonGSTAmout);
+			
+			json.writeEndObject();
+		}
+		catch(Exception e)
+		{
+			System.out.println("NilSerializer.writeInvoice()["+e.getMessage()+"]");
+			e.printStackTrace();
+		}
+	}
+}