F17ABAS001 source code commit

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

webitm-gst/ibase/webitm/bean/gst/CDNUR.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.CDNURSerializer;
+
+@JsonSerialize(using = CDNURSerializer.class)
+public class CDNUR extends BaseData
+{
+	public String customerType;
+	
+	public String cdnNoteType;
+	
+	public String cdNoteNumber;
+	
+	public Date cdNoteDate;
+	
+	public String invoiceNumber;
+	
+	public Date invoiceDate;
+	
+	public double val;
+	
+	public List<InvLineItem> items;
+}

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

@@ -59,4 +59,7 @@ public class GSTR1 {
     
     @JsonProperty("txpd")
     public List<AT> txpd;
+    
+    @JsonProperty("cdnur")
+    public List<CDNUR> cdnur;
 }

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

@@ -45,6 +45,7 @@ import ibase.webitm.bean.gst.B2CSA;
 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.EXP;
 import ibase.webitm.bean.gst.GSTR1;
 import ibase.webitm.bean.gst.InvLineItem;
@@ -369,6 +370,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		ArrayList<ATA> ataList = new ArrayList<ATA>();
 		ArrayList<EXP> expInvoiceList = new ArrayList<EXP>();
 		ArrayList<AT> atPaidList = new ArrayList<AT>();
+		ArrayList<CDNUR> cdnurList = new ArrayList<CDNUR>();
 
 		ArrayList<InvLineItem> invLineItems = null;
 		ArrayList<Invoice> invoices = null;
@@ -384,6 +386,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 		CDNDetails cdnDetails = null;
 		AT at = null;
 		EXP exp = null;
+		CDNUR cdnur = null;
 		
 		try
 		{
@@ -827,6 +830,51 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 					
 					atPaidList.add(at);
 				}
+				//tran_type : 14 = CDNURA
+				if("16".equalsIgnoreCase(tranType))
+				{
+					lineSql = "SELECT * FROM GST_DATA_DET WHERE TRAN_ID = ? ORDER BY LINE_NO";
+					linePstmt = conn.prepareStatement(lineSql);
+					linePstmt.setString(1, tranId);
+					lineRs = linePstmt.executeQuery();
+					
+					while(lineRs.next())
+					{
+						invLineItem = new InvLineItem();
+						invLineItem.num = lineRs.getInt("LINE_NO");
+						invLineItem.rate = lineRs.getDouble("IGST_PERC")+lineRs.getDouble("CGST_PERC")+lineRs.getDouble("SGST_PERC")+lineRs.getDouble("CESS_PERC");
+						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");
+						
+						invLineItems.add(invLineItem);
+					}
+					if(linePstmt != null)
+					{
+						linePstmt.close();
+						linePstmt = null;
+					}
+					if(lineRs != null)
+					{
+						lineRs.close();
+						lineRs = null;
+					}
+					
+					cdnur = new CDNUR();
+					cdnur.isReverseCharge = false;
+					cdnur.customerType = "B2CL";//TODO need to change typ value
+					cdnur.cdnNoteType = checkNullandTrim(rs.getString("DOC_TYPE"));
+					cdnur.cdNoteNumber = checkNullandTrim(rs.getString("DOC_NO"));
+					cdnur.cdNoteDate = rs.getDate("DOC_DATE");
+					cdnur.invoiceNumber = checkNullandTrim(rs.getString("REF_ID__INV"));
+					cdnur.invoiceDate = rs.getDate("REF_DATE__INV");
+					cdnur.val = rs.getDouble("AMOUNT");
+					cdnur.items = invLineItems;
+					
+					cdnurList.add(cdnur);
+				}
 				
 				tranIdList.add(tranId);
 			}
@@ -885,7 +933,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
 			{
 				gstr1.txpd = atPaidList;
 			}
-			
+			if(cdnurList.size() > 0)
+			{
+				gstr1.cdnur = cdnurList;
+			}
 			ObjectMapper objectMapper = new ObjectMapper();
 			
 			String json = objectMapper.writeValueAsString(gstr1); 

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

+package ibase.webitm.util.gst;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+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.CDNUR;
+import ibase.webitm.bean.gst.InvLineItem;
+
+public class CDNURSerializer extends JsonSerializer<CDNUR>
+{
+	final SimpleDateFormat gstFmt = new SimpleDateFormat("dd-MM-yyyy");
+	@Override
+	public void serialize(CDNUR cdnur, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException 
+	{
+		json.writeStartObject();
+		
+		json.writeStringField("typ", cdnur.customerType);
+		json.writeStringField("ntty", cdnur.cdnNoteType);
+		json.writeStringField("nt_num", cdnur.cdNoteNumber);
+		json.writeStringField("nt_dt", gstFmt.format(cdnur.cdNoteDate));
+		json.writeStringField("inum", cdnur.invoiceNumber);
+		json.writeStringField("idt", gstFmt.format(cdnur.invoiceDate));
+		json.writeNumberField("val", cdnur.val);
+		
+		writeLineItems(cdnur.items, json);
+
+		json.writeEndObject();
+	}
+	
+	private void writeLineItems(List<InvLineItem> items, JsonGenerator json)
+	{
+		try 
+		{
+			json.writeFieldName("itms");
+			json.writeStartArray();
+	        
+	        for(InvLineItem li : items)
+	        {
+	        	writeLineItem(li, json);
+	        }
+
+	        json.writeEndArray();
+		} 
+		catch (IOException e) 
+		{
+			System.out.println("CDNRSerializer.writeCDNLineItems()["+e.getMessage()+"]");
+			e.printStackTrace();
+		}
+	}
+	
+	private void writeLineItem(InvLineItem li, JsonGenerator json) 
+    {
+        try 
+        {
+            json.writeStartObject();
+            
+        	json.writeNumberField("num", li.num);
+        	
+        	json.writeFieldName("itm_det");
+        	json.writeStartObject();
+        	
+            json.writeNumberField("rt", li.rate);
+            json.writeNumberField("txval", 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();
+            
+            json.writeEndObject();
+        }
+        catch (Exception e) 
+        {
+        	System.out.println("CDNRSerializer.writeLineItem()["+e.getMessage()+"]");
+            e.printStackTrace();
+        }
+    }
+
+}

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

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