F17ABAS001 source code commit

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

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

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

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

+package ibase.webitm.bean.gst;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+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/GSTR1.java

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

webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java

@@ -46,6 +46,8 @@ import ibase.webitm.bean.gst.CDNDetails;
 import ibase.webitm.bean.gst.CDNR;
 import ibase.webitm.bean.gst.CDNRA;
 import ibase.webitm.bean.gst.CDNUR;
+import ibase.webitm.bean.gst.DocDetails;
+import ibase.webitm.bean.gst.DocIssued;
 import ibase.webitm.bean.gst.EXP;
 import ibase.webitm.bean.gst.GSTR1;
 import ibase.webitm.bean.gst.HSN;
@@ -377,11 +379,14 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		ArrayList<EXP> expInvoiceList = new ArrayList<EXP>();
 		ArrayList<AT> atPaidList = new ArrayList<AT>();
 		ArrayList<CDNUR> cdnurList = new ArrayList<CDNUR>();
-		ArrayList<HSNDetails> hsnList = new ArrayList<HSNDetails>();
+		ArrayList<DocIssued> docIssuedList = new ArrayList<DocIssued>();
+		
 
 		ArrayList<InvLineItem> invLineItems = null;
 		ArrayList<Invoice> invoices = null;
 		ArrayList<CDNDetails> cdnDetailsList = null;
+		ArrayList<HSNDetails> hsnList = new ArrayList<HSNDetails>();
+		ArrayList<DocDetails> docDetailsList = new ArrayList<DocDetails>();
 		
 		GSTR1 gstr1 = null;
 		Invoice invoice = null;
@@ -397,6 +402,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		Nil nil = null;
 		HSN hsn = null;	
 		HSNDetails hsnDetails = null;
+		DocIssued docIssued = null;
+		DocDetails docDetails = null;
 		
 		try
 		{
@@ -695,7 +702,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				{
 					
 					invoice.supplyType = "INTRB2B"; //TODO need to change
-					invoice.totalNilAmount = 1470.85; //TODO need to change
+					invoice.totalNilAmount = rs.getDouble("AMOUNT");
 					invoice.totalExemptedAmount = 123.45; //TODO need to change
 					invoice.totalNonGSTAmout = 1258.5; //TODO need to change
 					
@@ -953,6 +960,27 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				hsn.hsnDetails = hsnList;
 			}
 			
+			//TODO need to change START
+			docDetails = new DocDetails();
+			
+			docDetails.docNum = 1;
+			docDetails.fromSerialNo = "1";
+			docDetails.toSerialNo = "20";
+			docDetails.totalNo = 20;
+			docDetails.cancelNo = 3;
+			docDetails.toatlNetIssued = 17;
+			
+			docDetailsList.add(docDetails);
+			
+			docIssued = new DocIssued();
+			
+			docIssued.serialNumber = 1;
+			docIssued.docDescr = "Invoices for outward supply";
+			docIssued.docDetails = docDetailsList;
+			
+			docIssuedList.add(docIssued);
+			//TODO need to change END
+			
 			if(b2bInvoiceList.size() > 0)
 			{
 				gstr1.b2b = b2bInvoiceList;
@@ -1009,6 +1037,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 			{
 				gstr1.hsn = hsn;
 			}
+			if(docIssuedList.size() > 0)
+			{
+				gstr1.docIssued = docIssuedList;
+			}
 			
 			if(isDataFound)
 			{
@@ -1114,6 +1146,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 									}
 									else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
 									{
+										if(tranIdList.size() > 0)
+										{
+											updateSubmissionStatus(tranIdList, conn);
+										}
 										break;
 									}
 									else if("PE".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
@@ -1607,6 +1643,43 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		}
 	}
 	
+	private void updateSubmissionStatus(ArrayList<String> tranIdList, Connection conn) throws ITMException
+	{
+		String updateSql = "";
+		PreparedStatement pstmtUpd = null;
+		
+		try
+		{
+			updateSql = "UPDATE GST_DATA_HDR SET SUBMISSION_STATUS = ?, SUBMISSION_DATE = ? WHERE TRAN_ID = ?";
+			pstmtUpd = conn.prepareStatement(updateSql);
+			
+			for(String tranId : tranIdList)
+			{
+				pstmtUpd.setString(1, "S");
+				pstmtUpd.setString(2, new SimpleDateFormat(new E12GenericUtility().getApplDateFormat()).format(new Date()));
+				pstmtUpd.setString(3, tranId);
+				
+				pstmtUpd.addBatch();
+				pstmtUpd.clearParameters();
+			}
+			
+			int[] updateCount = pstmtUpd.executeBatch();
+			
+			System.out.print("GST_DATA_HSR Update count");
+			
+			for(int eachRowCnt : updateCount)
+			{
+				System.out.print(eachRowCnt + ",");
+			}
+		}
+		catch (Exception e) 
+		{
+			System.out.println("GSTDataSubmitWizPos.updateSubmissionStatus()["+e.getMessage()+"]");
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+	}
+	
 	private String getError(String errMsg, String Code, Connection conn)  throws ITMException, Exception
 	{
 		String mainStr ="";

webitm-gst/ibase/webitm/util/gst/ATASearializer.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 ATASearializer 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/ATASerializer.java

@@ -49,20 +49,14 @@ public class ATASerializer extends BaseSerializer<ATA>
 	        {
 	            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();

webitm-gst/ibase/webitm/util/gst/ATSearializer.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 ATSearializer 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/ATSerializer.java

@@ -51,17 +51,14 @@ public class ATSerializer extends BaseSerializer<AT>
 	            {
 	            	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);

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

@@ -100,17 +100,14 @@ public class CDNRSerializer extends JsonSerializer<CDNR>
             {
             	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);

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

@@ -72,17 +72,14 @@ public class CDNURSerializer extends JsonSerializer<CDNUR>
             {
             	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);

webitm-gst/ibase/webitm/util/gst/DocSerializer.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.DocDetails;
+import ibase.webitm.bean.gst.DocIssued;
+
+public class DocSerializer extends BaseSerializer<DocIssued>
+{
+	@Override
+	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("docs");
+		
+		json.writeStartArray();
+		
+		for(DocDetails docDetail : docIssued.docDetails)
+		{
+			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.writeEndObject();
+		}
+		
+		json.writeEndArray();
+		
+		json.writeEndObject();
+	}
+}

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

@@ -82,6 +82,10 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
         {
         	jsonGenerator.writeObjectField("hsn", gstr1.hsn);
         }
+        if(gstr1.docIssued != null)
+        {
+        	jsonGenerator.writeObjectField("doc_issue", gstr1.docIssued);
+        }
         jsonGenerator.writeEndObject();
     }
 }