F17ABAS001 source code commit

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

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

@@ -9,6 +9,8 @@ import ibase.webitm.util.gst.ATSerializer;
 @JsonSerialize(using = ATSerializer.class)
 public class AT extends BaseData
 {
+	public String recType;
+	
 	public String pos;
 
 	public String supplyType;

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

@@ -10,8 +10,12 @@ import ibase.webitm.util.gst.CDNURSerializer;
 @JsonSerialize(using = CDNURSerializer.class)
 public class CDNUR extends BaseData
 {
+	public String recType;
+	
 	public String customerType;
 	
+	public String receiverGSTIN;
+	
 	public String cdnNoteType;
 	
 	public String cdNoteNumber;

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

@@ -30,4 +30,22 @@ public class GSTR2
     
     @JsonProperty("imp_g")
     public List<IMPG> impg;
+    
+    @JsonProperty("imp_s")
+    public List<IMPS> imps;
+    
+    @JsonProperty("nil_supplies")
+    public NilInwardSupplies nil;
+    
+    @JsonProperty("txi")
+    public List<AT> txi;
+    
+    @JsonProperty("txpd")
+    public List<AT> txpd;
+    
+    @JsonProperty("itc_rvsl")
+    public ITCReversal itcReversal;
+    
+    @JsonProperty("cdnur")
+    public List<CDNUR> cdnur;
 }

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

+package ibase.webitm.bean.gst;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.IMPSSerializer;
+
+@JsonSerialize(using = IMPSSerializer.class)
+public class IMPS extends BaseData 
+{
+	public String inum;
+    
+    public Date idt;
+    
+    public double val;
+    
+    public String pos;
+    
+    public List<InvLineItem> items;
+}

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

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

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

+package ibase.webitm.bean.gst;
+
+public class InterNilSupplies
+{
+	public double compoundSuppliesAmt;
+	
+	public double exempetedSuppliesAmt;
+	
+	public double nonGSTSuppliesAmt;
+	
+	public double nilSuppliesAmt;
+}
\ No newline at end of file

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

+package ibase.webitm.bean.gst;
+
+public class IntraNilSupplies
+{
+	public double compoundSuppliesAmt;
+	
+	public double exempetedSuppliesAmt;
+	
+	public double nonGSTSuppliesAmt;
+	
+	public double nilSuppliesAmt;
+}
\ No newline at end of file

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

+package ibase.webitm.bean.gst;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.NilInwardSerializer;
+
+@JsonSerialize(using = NilInwardSerializer.class)
+public class NilInwardSupplies 
+{
+	public InterNilSupplies interNilSupplies;
+	
+	public IntraNilSupplies intraNilSupplies;
+}
\ No newline at end of file

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

@@ -32,20 +32,31 @@ public class ATSerializer extends BaseSerializer<AT>
 	        
 	        for(InvLineItem li : at.itms)
 	        {
-	        	writeLineItem(json, li);
+	        	writeLineItem(json, at, li);
 	        }
 
 	        json.writeEndArray();
 	    }
 
-	    private void writeLineItem(JsonGenerator json, InvLineItem li) 
+	    private void writeLineItem(JsonGenerator json, AT at, InvLineItem li) 
 	    {
 	        try 
 	        {
 	            json.writeStartObject();
 	            
+	            if("2".equalsIgnoreCase(at.recType))
+	            {
+	            	json.writeNumberField("num", li.num);
+	            }
 	            json.writeNumberField("rt", li.rate);
+	            if("1".equalsIgnoreCase(at.recType))
+	            {
 	            	json.writeNumberField("ad_amt", li.taxval);
+	            }
+	            if("2".equalsIgnoreCase(at.recType))
+	            {
+	            	json.writeNumberField("adamt", li.taxval);
+	            }
 
 	            if(li.iamt > 0)
 	            {

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

@@ -20,7 +20,14 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
 	{
 		json.writeStartObject();
 		
+		if("1".equalsIgnoreCase(cdnur.recType))
+		{
 			json.writeStringField("typ", cdnur.customerType);
+		}
+		else if("2".equalsIgnoreCase(cdnur.recType))
+		{
+			json.writeStringField("rtin", cdnur.receiverGSTIN);
+		}
 		json.writeStringField("ntty", cdnur.cdnNoteType);
 		json.writeStringField("nt_num", cdnur.cdNoteNumber);
 		json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
@@ -88,6 +95,20 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
             }
             json.writeEndObject();
             
+            if(li.itcType != null && (li.igstInputTax > 0.0 || li.cgstInputTax > 0.0 || li.sgstInputTax > 0.0) || li.cessInputTax > 0.0)
+            {
+            	json.writeFieldName("itc");
+            	json.writeStartObject();
+            	
+            	json.writeStringField("elg", li.itcType);
+            	json.writeNumberField("tx_i", li.igstInputTax);
+            	json.writeNumberField("tx_c", li.cgstInputTax);
+            	json.writeNumberField("tx_s", li.sgstInputTax);
+            	json.writeNumberField("tx_cs", li.cessInputTax);
+            	
+            	json.writeEndObject();
+            }
+            
             json.writeEndObject();
         }
         catch (Exception e) 

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

@@ -35,6 +35,30 @@ public class GSTR2Serailizer extends JsonSerializer<GSTR2> {
         {
         	jsonGenerator.writeObjectField("imp_g", gstr2.impg);
         }
+        if(gstr2.imps != null)
+        {
+        	jsonGenerator.writeObjectField("imp_s", gstr2.imps);
+        }
+        if(gstr2.nil != null)
+        {
+        	jsonGenerator.writeObjectField("nil_supplies", gstr2.nil);
+        }
+        if(gstr2.txi != null)
+        {
+        	jsonGenerator.writeObjectField("txi", gstr2.txi);
+        }
+        if(gstr2.txpd != null)
+        {
+        	jsonGenerator.writeObjectField("txpd", gstr2.txpd);
+        }
+        if(gstr2.itcReversal != null)
+        {
+        	jsonGenerator.writeObjectField("itc_rvsl", gstr2.itcReversal);
+        }
+        if(gstr2.cdnur != null)
+        {
+        	jsonGenerator.writeObjectField("cdnur", gstr2.cdnur);
+        }
         jsonGenerator.writeEndObject();
     }
 }

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

+package ibase.webitm.util.gst;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import ibase.webitm.bean.gst.IMPS;
+import ibase.webitm.bean.gst.InvLineItem;
+
+public class IMPSSerializer extends JsonSerializer<IMPS>
+{
+	final SimpleDateFormat gstFmt = new SimpleDateFormat("dd-MM-yyyy");
+	
+	@Override
+	public void serialize(IMPS imps, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+	{
+		json.writeStartObject();
+		
+		json.writeStringField("inum", imps.inum);
+		json.writeStringField("idt", gstFmt.format(imps.idt));
+		json.writeNumberField("ival", imps.val);
+		json.writeStringField("pos", imps.pos);
+		
+		json.writeFieldName("itms");
+	
+		json.writeStartArray();
+		for(InvLineItem li : imps.items)
+		{
+			json.writeStartObject();
+			
+			json.writeNumberField("num", li.num);
+			json.writeNumberField("txval", li.taxval);
+			json.writeNumberField("rt", li.rate);
+			if(li.iamt > 0.0)
+            {
+            	json.writeNumberField("iamt", li.iamt);
+            }
+            
+            if(li.camt > 0.0)
+            {
+            	json.writeNumberField("camt", li.camt);
+            }
+        	
+            if(li.samt > 0.0)
+            {
+            	json.writeNumberField("samt", li.samt);
+            }
+            
+            if(li.csamt > 0.0)
+            {
+            	json.writeNumberField("csamt", li.csamt);
+            }
+            
+			json.writeStringField("elg", li.itcType);
+			json.writeNumberField("tx_i", li.igstInputTax);
+			if(li.cgstInputTax > 0.0)
+			{
+				json.writeNumberField("tx_c", li.cgstInputTax);
+			}
+			if(li.sgstInputTax > 0.0)
+			{
+				json.writeNumberField("tx_s", li.sgstInputTax);
+			}
+        	json.writeNumberField("tx_cs", li.cessInputTax);
+        	
+        	json.writeEndObject();
+		}
+		json.writeEndArray();
+		 
+		json.writeEndObject();
+	}
+
+}

webitm-gst/ibase/webitm/util/gst/NilInwardSerializer.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.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import ibase.webitm.bean.gst.NilInwardSupplies;
+
+public class NilInwardSerializer extends JsonSerializer<NilInwardSupplies> 
+{
+	@Override
+	public void serialize(NilInwardSupplies nilInwardSupplies, JsonGenerator json, SerializerProvider serializerProvider)throws IOException, JsonProcessingException 
+	{
+		json.writeStartObject();
+		
+		if(nilInwardSupplies.interNilSupplies != null)
+		{
+			json.writeFieldName("inter");
+			
+			json.writeStartObject();
+			json.writeNumberField("cpddr", nilInwardSupplies.interNilSupplies.compoundSuppliesAmt);
+			json.writeNumberField("exptdsply", nilInwardSupplies.interNilSupplies.exempetedSuppliesAmt);
+			json.writeNumberField("ngsply", nilInwardSupplies.interNilSupplies.nonGSTSuppliesAmt);
+			json.writeNumberField("nilsply", nilInwardSupplies.interNilSupplies.nilSuppliesAmt);
+			json.writeEndObject();
+		}
+		
+		if(nilInwardSupplies.intraNilSupplies != null)
+		{
+			json.writeFieldName("intra");
+			
+			json.writeStartObject();
+			json.writeNumberField("cpddr", nilInwardSupplies.intraNilSupplies.compoundSuppliesAmt);
+			json.writeNumberField("exptdsply", nilInwardSupplies.intraNilSupplies.exempetedSuppliesAmt);
+			json.writeNumberField("ngsply", nilInwardSupplies.intraNilSupplies.nonGSTSuppliesAmt);
+			json.writeNumberField("nilsply", nilInwardSupplies.intraNilSupplies.nilSuppliesAmt);
+			json.writeEndObject();
+		}
+        
+        json.writeEndObject();
+	}
+}