F17ABAS001 source code commit

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

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

@@ -8,9 +8,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.UUID;
@@ -244,9 +242,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
 					{
-						
 						appKey = aesEncryption.generateSecureKey();
-						//appKey = "POpmbksVORVw+lYamRvxlq8zG7yushjFE3+RcZrx7b0=";
 						appKeyInBytes = aesEncryption.decodeBase64StringTOByte(appKey);
 						appKeyEncryptedAndCoded = pubKeyEncryption.encrypt(appKeyInBytes);
 						
@@ -290,40 +286,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 							pstmt = null;
 						}
 						
-						/*sql ="SELECT RESPONSE_INFO FROM API_CALL_LOG WHERE CALL_TYPE='AUTHTOKEN' AND CALL_STATUS = '1' AND SITE_CODE = ? ORDER BY CALL_DATE DESC";
-						pstmt = conn.prepareStatement(sql);
-						pstmt.setString(1, siteCode);
-						rs = pstmt.executeQuery();
-						
-						if(rs.next())
-						{
-							tokenStr = checkNull(rs.getString("RESPONSE_INFO"));
-							System.out.println("560101.inside if auth token found in table["+tokenStr+"]");
-						}
-						if(rs != null)
-						{
-							rs.close();
-							rs = null;
-						}
-						if(pstmt != null)
-						{
-							pstmt.close();
-							pstmt = null;
-						}
-						
-						if(tokenStr.split(":").length > 0)
-						{
-							authTokenDB = tokenStr.split(":")[0];
-							sekDB = tokenStr.split(":")[1];
-						}
-						
-						if(authTokenDB!=null && authTokenDB.trim().length()>0 && sekDB!=null && sekDB.trim().length()>0)
-						{
-							System.out.println("560101.authtoken and sek found database");
-							System.out.println("560101.authTokenDB["+authTokenDB+"]");
-							System.out.println("560101.sekDB["+sekDB+"]");
-						}*/
-						
 						valueXmlString.append("<Detail1 domID='1'>");
 						valueXmlString.append("<period_code><![CDATA[]]></period_code>");
 						valueXmlString.append("<site_code><![CDATA[").append(siteCode).append( "]]></site_code>");
@@ -336,8 +298,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						valueXmlString.append("<cur_gross_turnover><![CDATA[").append(currentYearGrossTurnover).append( "]]></cur_gross_turnover>");
 						valueXmlString.append("<otp><![CDATA[]]></otp>");
 						valueXmlString.append("<app_key><![CDATA["+appKey+"]]></app_key>");
-						/*valueXmlString.append("<auth_token><![CDATA["+authTokenDB+"]]></auth_token>");
-						valueXmlString.append("<sek><![CDATA["+sekDB+"]]></sek>");*/
 						valueXmlString.append("</Detail1>" );
 					}
 					break;
@@ -364,8 +324,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						returnType = checkNull(e12GenericUtility.getColumnValue("returns_type", dom1));
 						action = checkNull(e12GenericUtility.getColumnValue("action", dom1));
 						siteCode = checkNull(e12GenericUtility.getColumnValue("site_code", dom1));
-						/*authToken = checkNull(e12GenericUtility.getColumnValue("auth_token", dom1));
-						sek = checkNull(e12GenericUtility.getColumnValue("sek", dom1));*/
 						
 						if("GSTR1".equalsIgnoreCase(returnType.trim()))
 						{
@@ -456,10 +414,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						
 						transactionId = UUID.randomUUID().toString().replaceAll("-", "");
 
-						//appKey = checkNull(e12GenericUtility.getColumnValue("app_key", dom1));
-						//appKeyInBytes = aesEncryption.decodeBase64StringTOByte(appKey);
-						//appKeyEncryptedAndCoded = pubKeyEncryption.encrypt(appKeyInBytes);
-						
 						gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
 						gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
 						
@@ -1220,7 +1174,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						rs = null;
 					}
 				}
-				if("GETINV".equalsIgnoreCase(dataAction))
+				if("GETINV".equalsIgnoreCase(dataAction) && !"GSTR2A".equalsIgnoreCase(recordType))
 				{
 					sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'T' AND PRD_CODE = ? AND SITE_CODE = ?";
 					pstmt = conn.prepareStatement(sql);