F17ABAS001 source code commit

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

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

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

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

+package ibase.webitm.bean.gst;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import ibase.webitm.util.gst.GSTR2Serailizer;
+
+@JsonSerialize(using = GSTR2Serailizer.class)
+public class GSTR2
+{
+    @JsonProperty("gstin")
+    public String gstin;
+
+    @JsonProperty("fp")
+    public String financialPeriod;
+
+    @JsonProperty("b2b")
+    public List<B2B> b2b;
+
+    @JsonProperty("b2bur")
+    public List<B2BUR> b2bur;
+    
+    @JsonProperty("cdn")
+    public List<CDNR> cdnr;
+    
+    @JsonProperty("hsnsum")
+    public HSN hsn;
+}

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

@@ -9,5 +9,7 @@ import ibase.webitm.util.gst.HSNSerializer;
 @JsonSerialize(using = HSNSerializer.class)
 public class HSN extends BaseData
 {
+	public String recType;
+	
 	public List<HSNDetails> hsnDetails;
 }

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

@@ -16,4 +16,14 @@ public class InvLineItem {
 	public double samt;
 	
 	public double csamt;
+	
+	public String itcType;
+	
+	public double igstInputTax;
+	
+	public double cgstInputTax;
+	
+	public double sgstInputTax;
+	
+	public double cessInputTax;
 }

webitm-gst/ibase/webitm/servlet/gst/GSTDataSubmitWizServlet.java

@@ -97,7 +97,7 @@ public class GSTDataSubmitWizServlet extends HttpServlet
 				
 				response.setContentType("text/xml");
 		         
-		         if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip"))
+		        if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip"))
 				{
 					response.setHeader("Content-Encoding", "gzip");
 					GZIPOutputStream gzOutStream = new GZIPOutputStream(response.getOutputStream());

webitm-gst/ibase/webitm/util/gst/B2BURSerializer.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.B2BUR;
+
+public class B2BURSerializer extends BaseSerializer<B2BUR>
+{
+    @Override
+    public void serialize(B2BUR b2bur, final JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+    {
+        json.writeStartObject();
+
+        writeInvoices(b2bur, json);
+
+        json.writeEndObject();
+    }
+}

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

@@ -143,6 +143,20 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             	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_s", li.cgstInputTax);
+            	json.writeNumberField("tx_c", li.sgstInputTax);
+            	json.writeNumberField("tx_cs", li.cessInputTax);
+            	
+            	json.writeEndObject();
+            }
+            
             json.writeEndObject();
         }
         catch (Exception e) 

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

@@ -115,6 +115,20 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
             }
             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_s", li.cgstInputTax);
+            	json.writeNumberField("tx_c", li.sgstInputTax);
+            	json.writeNumberField("tx_cs", li.cessInputTax);
+            	
+            	json.writeEndObject();
+            }
+            
             json.writeEndObject();
         }
         catch (Exception e) 

webitm-gst/ibase/webitm/util/gst/GSTR2Serailizer.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.GSTR2;
+
+public class GSTR2Serailizer extends JsonSerializer<GSTR2> {
+    @Override
+    public void serialize(GSTR2 gstr2, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+    {
+        jsonGenerator.writeStartObject();
+        jsonGenerator.writeStringField("gstin", gstr2.gstin);
+        if(gstr2.b2b != null)
+        {
+        	jsonGenerator.writeObjectField("b2b", gstr2.b2b);
+        } 
+        if(gstr2.b2bur != null)
+        {
+        	jsonGenerator.writeObjectField("b2bur", gstr2.b2bur);
+        }
+        if(gstr2.cdnr != null)
+        {
+        	jsonGenerator.writeObjectField("cdn", gstr2.cdnr);
+        }
+        if(gstr2.hsn != null)
+        {
+        	jsonGenerator.writeObjectField("hsnsum", gstr2.hsn);
+        }
+        jsonGenerator.writeEndObject();
+    }
+}

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

@@ -16,7 +16,14 @@ public class HSNSerializer extends BaseSerializer<HSN>
 	{
 		json.writeStartObject();
 		
-		json.writeFieldName("data");
+		if("1".equalsIgnoreCase(hsn.recType))
+		{
+			json.writeFieldName("data");
+		}
+		else if("2".equalsIgnoreCase(hsn.recType))
+		{
+			json.writeFieldName("det");
+		}
         json.writeStartArray();
 
         for(HSNDetails hsnDetails : hsn.hsnDetails)
@@ -40,26 +47,17 @@ public class HSNSerializer extends BaseSerializer<HSN>
 			{
 				json.writeStringField("desc", hsnDetails.description);
 			}
-			json.writeStringField("uqc", hsnDetails.unitOfMeasure);
+			if(hsnDetails.unitOfMeasure != null && hsnDetails.unitOfMeasure.trim().length()>0)
+			{
+				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.writeNumberField("iamt", hsnDetails.totalIGSTAmount);
+			json.writeNumberField("camt", hsnDetails.totalCGSTAmount);
+			json.writeNumberField("samt", hsnDetails.totalSGSTAmount);
+			json.writeNumberField("csamt", hsnDetails.totalCESSAmount);
 			
 			json.writeEndObject();
 		}