F17ABAS001 source code commit

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

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

@@ -27,4 +27,7 @@ public class GSTR2
     
     @JsonProperty("hsnsum")
     public HSN hsn;
+    
+    @JsonProperty("imp_g")
+    public List<IMPG> impg;
 }

webitm-gst/ibase/webitm/bean/gst/IMPG.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.IMPGSerializer;
+
+@JsonSerialize(using=IMPGSerializer.class)
+public class IMPG extends BaseData
+{
+	public boolean isSezImport;
+	
+    public String sezGSTIN;
+    
+    public String billOfEntryNo;
+    
+    public Date billOfEntryDate;
+    
+    public double amount;
+    
+    public String portCode;
+    
+    public List<InvLineItem> items;
+}

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

@@ -60,6 +60,7 @@ import ibase.webitm.bean.gst.GSTR1;
 import ibase.webitm.bean.gst.GSTR2;
 import ibase.webitm.bean.gst.HSN;
 import ibase.webitm.bean.gst.HSNDetails;
+import ibase.webitm.bean.gst.IMPG;
 import ibase.webitm.bean.gst.InvLineItem;
 import ibase.webitm.bean.gst.Invoice;
 import ibase.webitm.bean.gst.Nil;
@@ -2192,6 +2193,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		ArrayList<B2BUR> b2burInvoiceList = new ArrayList<B2BUR>();
 		ArrayList<CDNR> cdnrList = new ArrayList<CDNR>();
 		ArrayList<HSNDetails> hsnList = new ArrayList<HSNDetails>();
+		ArrayList<IMPG> impgList = new ArrayList<IMPG>();
 		
 		ArrayList<InvLineItem> invLineItems = null;
 		ArrayList<Invoice> invoices = null;
@@ -2206,6 +2208,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		CDNDetails cdnDetails = null;
 		HSNDetails hsnDetails = null;
 		HSN hsn = null;
+		IMPG impg = null;
 		
 		try
 		{
@@ -2463,6 +2466,57 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 						cdnrList.add(cdnr);
 					}
 				}
+				if("IMPG".equalsIgnoreCase(udfStr1))
+				{
+					lineSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT "
+							+ " ITC_TYPE, SUM(ITC_IGST) AS ITC_IGST, SUM(ITC_CGST) AS ITC_CGST, SUM(ITC_SGST) AS ITC_SGST, SUM(ITC_CESS) AS ITC_CESS "
+							+ " FROM GST_DATA_DET "
+							+ " WHERE TRAN_ID = ? "
+							+ " GROUP BY GST_RATE, ITC_TYPE ";
+					linePstmt = conn.prepareStatement(lineSql);
+					linePstmt.setString(1, tranId);
+					lineRs = linePstmt.executeQuery();
+					int lineNum = 0;
+					while(lineRs.next())
+					{
+						invLineItem = new InvLineItem();
+						invLineItem.num = ++lineNum;
+						invLineItem.rate = lineRs.getDouble("GST_RATE");
+						invLineItem.taxval = lineRs.getDouble("TAXABLE_AMT");
+						invLineItem.iamt = lineRs.getDouble("IGST_AMT");
+						invLineItem.camt = lineRs.getDouble("CGST_AMT");
+						invLineItem.samt = lineRs.getDouble("SGST_AMT");
+						invLineItem.csamt = lineRs.getDouble("CESS_AMT");
+						invLineItem.itcType = lineRs.getString("ITC_TYPE");
+						invLineItem.igstInputTax = lineRs.getDouble("ITC_IGST");
+						invLineItem.cgstInputTax = lineRs.getDouble("ITC_CGST");
+						invLineItem.sgstInputTax = lineRs.getDouble("ITC_SGST");
+						invLineItem.cessInputTax = lineRs.getDouble("ITC_CESS");
+						
+						invLineItems.add(invLineItem);
+					}
+					if(linePstmt != null)
+					{
+						linePstmt.close();
+						linePstmt = null;
+					}
+					if(lineRs != null)
+					{
+						lineRs.close();
+						lineRs = null;
+					}
+					
+					impg = new IMPG();
+					impg.isSezImport = true;//TODO need to confirm exact value
+					impg.sezGSTIN = checkNullandTrim(rs.getString("TAX_REG_NO"));
+					impg.billOfEntryNo = checkNullandTrim(rs.getString("LR_NO"));
+					impg.billOfEntryDate = rs.getDate("LR_DATE");
+					impg.amount = rs.getDouble("AMOUNT");
+					impg.portCode = checkNullandTrim(rs.getString("ORDER_NO"));
+					impg.items = invLineItems;
+					
+					impgList.add(impg);
+				}
 			}
 			if(pstmt != null)
 			{
@@ -2545,6 +2599,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 				{
 					gstr2.hsn = hsn;
 				}
+				if(impgList.size() > 0)
+				{
+					gstr2.impg = impgList;
+				}
 				
 				String gspAuthString = "", gspAuthSignature = "", gspAuthStringRet = "", gspAuthSignatureRet = "";
 				APICallData apiRetStatsCallData = null;

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

@@ -118,22 +118,22 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             json.writeNumberField("rt", li.rate);
             json.writeNumberField("txval", li.taxval);
 
-            if(li.iamt > 0)
+            if(li.iamt > 0.0)
             {
             	json.writeNumberField("iamt", li.iamt);
             }
             
-            if(li.camt > 0)
+            if(li.camt > 0.0)
             {
             	json.writeNumberField("camt", li.camt);
             }
         	
-            if(li.samt > 0)
+            if(li.samt > 0.0)
             {
             	json.writeNumberField("samt", li.samt);
             }
             
-            if(li.csamt > 0)
+            if(li.csamt > 0.0)
             {
             	json.writeNumberField("csamt", li.csamt);
             }
@@ -150,8 +150,8 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             	
             	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_c", li.cgstInputTax);
+            	json.writeNumberField("tx_s", li.sgstInputTax);
             	json.writeNumberField("tx_cs", li.cessInputTax);
             	
             	json.writeEndObject();

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

@@ -31,6 +31,10 @@ public class GSTR2Serailizer extends JsonSerializer<GSTR2> {
         {
         	jsonGenerator.writeObjectField("hsnsum", gstr2.hsn);
         }
+        if(gstr2.impg != null)
+        {
+        	jsonGenerator.writeObjectField("imp_g", gstr2.impg);
+        }
         jsonGenerator.writeEndObject();
     }
 }

webitm-gst/ibase/webitm/util/gst/IMPGSerializer.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.IMPG;
+import ibase.webitm.bean.gst.InvLineItem;
+
+public class IMPGSerializer extends JsonSerializer<IMPG>
+{
+	final SimpleDateFormat gstFmt = new SimpleDateFormat("dd-MM-yyyy");
+	
+	@Override
+	public void serialize(IMPG impg, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+	{
+		json.writeStartObject();
+		
+		json.writeStringField("is_sez", impg.isSezImport ? "Y" : "N");
+		if(impg.isSezImport)
+		{
+			json.writeStringField("stin", impg.sezGSTIN);
+		}
+		json.writeStringField("boe_num", impg.billOfEntryNo);
+		json.writeStringField("boe_dt", gstFmt.format(impg.billOfEntryDate));
+		json.writeNumberField("boe_val", impg.amount);
+		json.writeStringField("port_code", impg.portCode);
+		
+		json.writeFieldName("itms");
+	
+		json.writeStartArray();
+		for(InvLineItem li : impg.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();
+	}
+
+}