F17ABAS001 source code commit

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

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

 package ibase.webitm.bean.gst;
 
+import java.util.List;
+
 public class DocDetails 
 {
-	public int docNum;
-	
-	public String fromSerialNo;
-	
-	public String toSerialNo;
-	
-	public int totalNo;
-	
-	public int cancelNo;
+	public int serialNumber;
 	
-	public int toatlNetIssued;
+	public List<Docs> docs;
 }

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

@@ -9,9 +9,5 @@ import ibase.webitm.util.gst.DocSerializer;
 @JsonSerialize(using = DocSerializer.class)
 public class DocIssued extends BaseData
 {
-	public int serialNumber;
-	
-	public String docDescr;
-	
 	public List<DocDetails> docDetails;
 }

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

+package ibase.webitm.bean.gst;
+
+public class Docs 
+{
+	public int docNum;
+	
+	public String fromSerialNo;
+	
+	public String toSerialNo;
+	
+	public int totalNo;
+	
+	public int cancelNo;
+	
+	public int toatlNetIssued;
+}

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

@@ -70,5 +70,5 @@ public class GSTR1 {
     public HSN hsn;
     
     @JsonProperty("doc_issue")
-    public List<DocIssued> docIssued;
+    public DocIssued docIssued;
 }

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

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 
 import ibase.webitm.bean.gst.DocDetails;
 import ibase.webitm.bean.gst.DocIssued;
+import ibase.webitm.bean.gst.Docs;
 
 public class DocSerializer extends BaseSerializer<DocIssued>
 {
@@ -15,35 +16,38 @@ public class DocSerializer extends BaseSerializer<DocIssued>
 	public void serialize(DocIssued docIssued, JsonGenerator json, SerializerProvider serializeProvider) throws IOException, JsonProcessingException
 	{
 		json.writeStartObject();
-		
 		if(docIssued.taxPayerAction != null)
 		{
 			json.writeStringField("flag", docIssued.taxPayerAction);
 		}
 
-		json.writeNumberField("doc_num", docIssued.serialNumber);
-		json.writeStringField("doc_typ", docIssued.docDescr);
+		json.writeFieldName("doc_det");
+		json.writeStartArray();
+		for(DocDetails docDetail : docIssued.docDetails)
+		{
+			json.writeStartObject();
+			json.writeNumberField("doc_num", docDetail.serialNumber);
 			
 			json.writeFieldName("docs");
 			
 			json.writeStartArray();
-		
-		for(DocDetails docDetail : docIssued.docDetails)
+			for(Docs doc : docDetail.docs)
 			{
 				json.writeStartObject();
 				
-			json.writeNumberField("num", docDetail.docNum);
-			json.writeStringField("from", docDetail.fromSerialNo);
-			json.writeStringField("to", docDetail.toSerialNo);
-			json.writeNumberField("totnum", docDetail.totalNo);
-			json.writeNumberField("cancel", docDetail.cancelNo);
-			json.writeNumberField("net_issue", docDetail.toatlNetIssued);
+				json.writeNumberField("num", doc.docNum);
+				json.writeStringField("from", doc.fromSerialNo);
+				json.writeStringField("to", doc.toSerialNo);
+				json.writeNumberField("totnum", doc.totalNo);
+				json.writeNumberField("cancel", doc.cancelNo);
+				json.writeNumberField("net_issue", doc.toatlNetIssued);
 				
 				json.writeEndObject();
 			}
-		
 			json.writeEndArray();
-		
+			json.writeEndObject();
+		}
+		json.writeEndArray();
 		json.writeEndObject();
 	}
 }