F17ABAS001 source code commit

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

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

@@ -17,6 +17,9 @@ public class GSTR1 {
 
     @JsonProperty("gt")
     public double grossTurnOver;
+    
+    @JsonProperty("cur_gt")
+    public double currentGrossTurnOver;
 
     @JsonProperty("b2b")
     public List<B2B> b2b;

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

@@ -5,27 +5,15 @@ public class InvLineItem {
     
 	public int num;
 	
-	public String ty;
-	
-	public String hsn_sc;
+	public double rate;
 	
 	public double taxval;
 	
-	public double irt;
-	
 	public double iamt;
 	
-	public double crt;
-	
 	public double camt;
 	
-	public double srt;
-	
 	public double samt;
 	
-	public double csrt;
-	
 	public double csamt;
-
-
 }

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

@@ -8,31 +8,21 @@ public class Invoice
 {
 	public String flag;
 	
-    public String inum;
-    
-    public String oinum;
+	public String checksum;
+
+	public String inum;
     
     public Date idt;
     
-    public Date oidt;
-    
-    public String cname;
-    
     public double val;
     
     public String pos;
     
     public boolean rchrg;
     
-    public boolean prs;
-    
-    public String od_num;
-    
-    public Date od_dt;
-    
     public String etin;
-    
-    public String checksum;
+
+    public String invoiceType;
     
     public String shippingPortCode;
     

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

@@ -8,7 +8,11 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.UUID;
 
@@ -34,7 +38,7 @@ import ibase.webitm.utility.ITMException;
 public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWizEJBLocal, GSTDataSubmitWizEJBRemote  
 {
 	private String GST_API_URL = "";
-	private String GST_AUTH_URL = "";
+	private String AUTH_TOKEN_URL_V2 = "";
 	private String appKey = "";
 	InetAddress ipAddress = null;
 	private byte[] appKeyInBytes = null;
@@ -63,29 +67,24 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 			ipAddress = Inet4Address.getLocalHost();
 			System.out.println("host ipAddress["+ipAddress.getHostAddress()+"]");
 			
-			sql = "SELECT SERVICE_URI FROM SYSTEM_EVENT_SERVICES WHERE SERVICE_CODE = 'gst_base_url' ";
+			sql = "SELECT SERVICE_CODE, SERVICE_URI FROM SYSTEM_EVENT_SERVICES WHERE METHOD_NAME = 'GST_API_URL'";
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
-			if(rs.next())
+			while(rs.next())
 			{
-				GST_API_URL = checkNull(rs.getString("SERVICE_URI"));
-			}
-			if(pstmt!=null)
-			{
-				pstmt.close();
-				pstmt = null;
-			}
-			if(rs!=null)
-			{
-				rs.close();
-				rs = null;
-			}
-			sql = "SELECT SERVICE_URI FROM SYSTEM_EVENT_SERVICES WHERE SERVICE_CODE = 'gstr_auth_url' ";
-			pstmt = conn.prepareStatement(sql);
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				GST_AUTH_URL = checkNull(rs.getString("SERVICE_URI"));
+				switch(rs.getString("SERVICE_CODE"))
+				{
+					case "gst_base_url" :
+					{
+						GST_API_URL = rs.getString("SERVICE_URI");
+					}
+					break;
+					case "gstr_auth_url_v2" :
+					{
+						AUTH_TOKEN_URL_V2 = rs.getString("SERVICE_URI");
+					}
+					break;
+				}
 			}
 			if(pstmt!=null)
 			{
@@ -163,7 +162,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		E12GenericUtility e12genericUtility = new E12GenericUtility();
 		StringBuffer valueXmlString = new StringBuffer();
 		int currentFormNo = 0;
-		String sql = "", siteCode = "", siteDescr = "", gstinNo = "", userName = "", stateCode = "", stateDescr = "", grossTurnover = "";
+		String sql = "", siteCode = "", siteDescr = "", gstinNo = "", userName = "", stateCode = "", stateDescr = "", grossTurnover = "", periodCode = "", currDateStr = "";
+		Calendar calendar = new GregorianCalendar(); 
 		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -230,8 +230,38 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 							pstmt.close();
 							pstmt = null;
 						}
+						
+						calendar.setTime(new Date());
+						calendar.add(Calendar.MONTH, -1);
+						
+						SimpleDateFormat sdf = new SimpleDateFormat(e12genericUtility.getApplDateFormat());
+						
+						currDateStr = sdf.format(calendar.getTime());
+						
+						System.out.println("currDateStr["+currDateStr+"]");
+						
+						sql = "SELECT TO_CHAR(TO_DATE(CODE,'yyyymm'),'mmyyyy') AS CODE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, currDateStr);
+						rs = pstmt.executeQuery();
+						
+						if(rs.next())
+						{
+							periodCode = rs.getString("CODE");
+						}
+						if(rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+						if(pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}
+						
 						valueXmlString.append("<Detail1 domID='1'>");
-						valueXmlString.append("<period_code><![CDATA[]]></period_code>");
+						valueXmlString.append("<period_code><![CDATA["+periodCode+"]]></period_code>");
 						valueXmlString.append("<site_code><![CDATA[").append(siteCode).append( "]]></site_code>");
 						valueXmlString.append("<site_descr><![CDATA[").append(siteDescr).append( "]]></site_descr>");
 						valueXmlString.append("<gstin><![CDATA[" ).append(gstinNo).append( "]]></gstin>");
@@ -486,7 +516,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 		        otpRequest.put("app_key", appKeyEncryptedAndCoded);
 		        otpRequest.put("username", userName);
 
-		        HttpResponse<JsonNode> otpResp = Unirest.post(String.format("%s%s", GST_API_URL,GST_AUTH_URL))
+		        HttpResponse<JsonNode> otpResp = Unirest.post(String.format("%s%s", GST_API_URL,AUTH_TOKEN_URL_V2))
 								        		.header("Content-Type", "application/json")
 								                .header("clientid", clientId)
 								                .header("client-secret", clientSecret)

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

@@ -7,6 +7,8 @@
 package ibase.webitm.servlet.gst;
 
 import ibase.utility.CommonConstants;
+import ibase.webitm.util.gst.GSTCommonUtil;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.zip.GZIPOutputStream;
@@ -34,6 +36,8 @@ public class GSTWizUtilServlet extends HttpServlet
 		request.setCharacterEncoding(CommonConstants.ENCODING);
 		String action = "", htmlData = "";
 		
+		GSTCommonUtil gstCommonUtil = new GSTCommonUtil();
+		
 		try 
 		{	
 			action = request.getParameter("action");
@@ -101,6 +105,30 @@ public class GSTWizUtilServlet extends HttpServlet
 					outStream.close();
 				}
 			}
+			else if("GET_ITM2MENU_DTLS".equalsIgnoreCase(action))
+			{
+				String retXML = "";
+				retXML = gstCommonUtil.getItm2MenuDtls(request.getParameter("objName"));
+				
+				response.setContentType("text/html");
+		         
+		        if(CommonConstants.CONTENT_ENCODING != null && CommonConstants.CONTENT_ENCODING.equalsIgnoreCase("gzip"))
+				{
+					response.setHeader("Content-Encoding", "gzip");
+					GZIPOutputStream gzOutStream = new GZIPOutputStream(response.getOutputStream());
+					gzOutStream.write(retXML.getBytes());
+					gzOutStream.flush();
+					gzOutStream.close();
+				}
+				else
+				{
+					response.setHeader("Content-Encoding", CommonConstants.CONTENT_ENCODING);
+					OutputStream outStream = response.getOutputStream();
+					outStream.write(retXML.getBytes());
+					outStream.flush();
+					outStream.close();
+				}
+			}
 		} 
 		catch (Exception e) 
 		{

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

@@ -55,20 +55,20 @@ public class ATASearializer extends BaseSerializer<ATA>
 	        {
 	            json.writeStartObject();
 	            
-	            json.writeStringField("ty", li.ty);
-	            json.writeStringField("hsn_sc", li.hsn_sc);
+	            //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("irt", li.irt);
 	            json.writeNumberField("iamt", li.iamt);
 	            
-	        	json.writeNumberField("crt", li.crt);
+	        	//json.writeNumberField("crt", li.crt);
 	        	json.writeNumberField("camt", li.camt);
 	        	
-	        	json.writeNumberField("srt", li.srt);
+	        	//json.writeNumberField("srt", li.srt);
 	        	json.writeNumberField("samt", li.samt);
 	            
-	            json.writeNumberField("csrt", li.csrt);
+	            //json.writeNumberField("csrt", li.csrt);
 	            json.writeNumberField("csamt", li.csamt);
 	            
 	            json.writeEndObject();

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

@@ -47,20 +47,20 @@ public class ATSearializer extends BaseSerializer<AT>
 	        {
 	            json.writeStartObject();
 	            
-	            json.writeStringField("ty", li.ty);
-	            json.writeStringField("hsn_sc", li.hsn_sc);
+	            //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("irt", li.irt);
 	            json.writeNumberField("iamt", li.iamt);
 	            
-	        	json.writeNumberField("crt", li.crt);
+	        	//json.writeNumberField("crt", li.crt);
 	        	json.writeNumberField("camt", li.camt);
 	        	
-	        	json.writeNumberField("srt", li.srt);
+	        	//json.writeNumberField("srt", li.srt);
 	        	json.writeNumberField("samt", li.samt);
 	            
-	            json.writeNumberField("csrt", li.csrt);
+	            //json.writeNumberField("csrt", li.csrt);
 	            json.writeNumberField("csamt", li.csamt);
 	            
 	            json.writeEndObject();

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

@@ -15,7 +15,7 @@ public class B2CLSerializer extends BaseSerializer<B2CL> {
 	{
 		json.writeStartObject();
 
-        json.writeStringField("state_cd", b2cl.stateCode);
+        json.writeStringField("pos", b2cl.stateCode);
         writeInvoices(b2cl, json);
 
         json.writeEndObject();

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

@@ -42,15 +42,6 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             }
             else
             {
-            	if (inv.oinum != null && inv.oidt != null) 
-                {
-                	json.writeStringField("oinum", inv.oinum);
-                    json.writeStringField("oidt", gstFmt.format(inv.oidt));
-                }
-                if(inv.cname != null)
-                {
-                	json.writeStringField("cname", inv.cname);
-                }
                 if(inv.shippingPortCode != null)
                 {
                 	json.writeStringField("sbpcode", inv.shippingPortCode);
@@ -74,17 +65,15 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
                 {
                 	json.writeStringField("rchrg", inv.rchrg ? "Y" : "N");
                 }
-                json.writeStringField("prs", inv.prs ? "Y" : "N");
-                if (inv.prs) 
-                {
-                    json.writeStringField("od_num", inv.od_num);
-                    json.writeStringField("od_dt", gstFmt.format(inv.od_dt));
-                }
                 if(inv.etin!=null)
                 {
                 	json.writeStringField("etin", inv.etin);
                 }
-
+                if(inv.invoiceType != null)
+                {
+                	json.writeStringField("inv_typ", inv.invoiceType);
+                }
+                
                 writeLineItems(genericInvoice, json, inv);
             }
 
@@ -126,21 +115,29 @@ abstract class BaseSerializer<T extends BaseData> extends JsonSerializer<T>
             	json.writeFieldName("itm_det");
             	json.writeStartObject();
             }
-            json.writeStringField("ty", li.ty);
-            json.writeStringField("hsn_sc", li.hsn_sc);
+            json.writeNumberField("rt", li.rate);
             json.writeNumberField("txval", li.taxval);
 
-            json.writeNumberField("irt", li.irt);
-            json.writeNumberField("iamt", li.iamt);
+            if(li.iamt > 0)
+            {
+            	json.writeNumberField("iamt", li.iamt);
+            }
             
-        	json.writeNumberField("crt", li.crt);
-        	json.writeNumberField("camt", li.camt);
+            if(li.camt > 0)
+            {
+            	json.writeNumberField("camt", li.camt);
+            }
         	
-        	json.writeNumberField("srt", li.srt);
-        	json.writeNumberField("samt", li.samt);
+            if(li.samt > 0)
+            {
+            	json.writeNumberField("samt", li.samt);
+            }
+            
+            if(li.csamt > 0)
+            {
+            	json.writeNumberField("csamt", li.csamt);
+            }
             
-            json.writeNumberField("csrt", li.csrt);
-            json.writeNumberField("csamt", li.csamt);
             if(!("EXP".equalsIgnoreCase(genericInvoice.getClass().getSimpleName()) || "EXPA".equalsIgnoreCase(genericInvoice.getClass().getSimpleName())))
             {
             	json.writeEndObject();

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

@@ -244,6 +244,76 @@ public class GSTCommonUtil extends ValidatorEJB
 		
 		return menuIconPath;
 	}
+	
+	public String getItm2MenuDtls(String objName)
+	{
+		String retXML = "", title = "", imgName = "";
+		
+		String sql = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		Connection conn = null;
+		try
+		{
+			conn = getConnection();
+			
+			sql = "SELECT DESCR,ICON_PATH FROM ITM2MENU WHERE WIN_NAME LIKE '%"+objName+"%' AND OBJ_TYPE = 'I'";
+			pstmt = conn.prepareStatement(sql);
+			rs= pstmt.executeQuery();
+			
+			if(rs.next())
+			{
+				title = rs.getString("DESCR");
+				imgName = rs.getString("ICON_PATH");
+			}
+			if(pstmt!=null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+			if(rs!=null)
+			{
+				rs.close();
+				rs = null;
+			}
+			
+			retXML = "<root><title><![CDATA["+title+"]]></title>"
+				   + "<img><![CDATA["+imgName+"]]></img></root>";
+		}
+		catch(Exception e)
+		{
+			System.out.println("GSTCommonUtil.getItm2MenuDtls()["+e.getMessage()+"]");
+			e.printStackTrace();
+		}
+		finally
+		{
+			try
+			{
+				if(pstmt!=null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				if(rs!=null)
+				{
+					rs.close();
+					rs = null;
+				}
+				if(conn != null && !conn.isClosed())
+				{
+					conn.close();
+					conn = null;
+				}
+			}
+			catch(Exception e)
+			{
+				System.out.println("GSTCommonUtil.getItm2MenuDtls()["+e.getMessage()+"]");
+				e.printStackTrace();
+			}
+		}
+		return retXML;
+	}
+	
 	private static String checkNull(String input)
 	{
 		if (input==null)

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

@@ -17,6 +17,7 @@ public class GSTR1Serailizer extends JsonSerializer<GSTR1> {
         jsonGenerator.writeStringField("gstin", gstr1.gstin);
         jsonGenerator.writeStringField("fp", gstr1.financialPeriod);
         jsonGenerator.writeNumberField("gt", gstr1.grossTurnOver);
+        jsonGenerator.writeNumberField("cur_gt", gstr1.currentGrossTurnOver);
         if(gstr1.b2b != null)
         {
         	jsonGenerator.writeObjectField("b2b", gstr1.b2b);