Skip to content

B
business-java
Commit 43a3d853 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 source code commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106457 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1726b0cd
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 116 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 43a3d853
...@@ -565,6 +565,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -565,6 +565,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
valueXmlString.append(signDataXML); valueXmlString.append(signDataXML);
valueXmlString.append("</Detail2>" ); valueXmlString.append("</Detail2>" );
valueXmlString.append("<Detail2 domID='2'>"); valueXmlString.append("<Detail2 domID='2'>");
valueXmlString.append("<period_code><![CDATA["+periodCode+"]]></period_code>");
valueXmlString.append(retXML); valueXmlString.append(retXML);
valueXmlString.append("</Detail2>" ); valueXmlString.append("</Detail2>" );
if(errorXML.trim().length() > 0) if(errorXML.trim().length() > 0)
...@@ -671,7 +672,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -671,7 +672,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
case 1: case 1:
{ {
String returnType = "", action = "", periodCode = ""; String returnType = "", action = "", periodCode = "", recType = "";
NodeList parentList = null, childList = null; NodeList parentList = null, childList = null;
Node childNode = null; Node childNode = null;
String childNodeName = "", columnValue = ""; String childNodeName = "", columnValue = "";
...@@ -748,130 +749,171 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -748,130 +749,171 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if("GSTR1".equalsIgnoreCase(returnType)) if("GSTR1".equalsIgnoreCase(returnType))
{ {
if("SAVE".equalsIgnoreCase(action)) recType = "1";
}
else if("GSTR2".equalsIgnoreCase(returnType))
{
recType = "2";
}
else if("GSTR3".equalsIgnoreCase(returnType) || "GSTR3B".equalsIgnoreCase(returnType))
{
recType = "3";
}
if("SAVE".equalsIgnoreCase(action) && !"GSTR3B".equalsIgnoreCase(returnType))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
pstmt.setString(2, periodCode);
pstmt.setString(3, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?"; if(rs.getInt("CNT") == 0)
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, periodCode);
pstmt.setString(2, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") == 0)
{
errList.add( "VTNOGSDATA" );
errFields.add("returns_type");
}
}
if(pstmt!=null)
{ {
pstmt.close(); errList.add( "VTNOGSDATA" );
pstmt = null; errFields.add("returns_type");
}
if(rs!=null)
{
rs.close();
rs = null;
} }
} }
if("SUBMIT".equalsIgnoreCase(action)) if(pstmt!=null)
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?"; pstmt.close();
pstmt = conn.prepareStatement(sql); pstmt = null;
pstmt.setString(1, periodCode);
pstmt.setString(2, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") > 0)
{
errList.add( "VTSUBALRDY" );
errFields.add("returns_type");
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'T' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, periodCode);
pstmt.setString(2, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") == 0)
{
errList.add( "VTNORECSAV" );
errFields.add("returns_type");
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
} }
if("FILE".equalsIgnoreCase(action)) if(rs!=null)
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?"; rs.close();
pstmt = conn.prepareStatement(sql); rs = null;
pstmt.setString(1, periodCode); }
pstmt.setString(2, loginSiteCode); }
rs = pstmt.executeQuery(); if("SUBMIT".equalsIgnoreCase(action) && !"GSTR3B".equalsIgnoreCase(returnType))
if(rs.next()) {
{ sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
if(rs.getInt("CNT") == 0) pstmt = conn.prepareStatement(sql);
{ pstmt.setString(1, recType);
errList.add( "VTNORECSAV" ); pstmt.setString(2, periodCode);
errFields.add("returns_type"); pstmt.setString(3, loginSiteCode);
} rs = pstmt.executeQuery();
} if(rs.next())
if(pstmt!=null) {
if(rs.getInt("CNT") > 0)
{ {
pstmt.close(); errList.add( "VTSUBALRDY" );
pstmt = null; errFields.add("returns_type");
} }
if(rs!=null) }
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
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);
pstmt.setString(1, recType);
pstmt.setString(2, periodCode);
pstmt.setString(3, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") == 0)
{ {
rs.close(); errList.add( "VTNORECSAV" );
rs = null; errFields.add("returns_type");
} }
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = '1' AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?"; }
pstmt = conn.prepareStatement(sql); if(pstmt!=null)
pstmt.setString(1, periodCode); {
pstmt.setString(2, loginSiteCode); pstmt.close();
rs = pstmt.executeQuery(); pstmt = null;
if(rs.next()) }
if(rs!=null)
{
rs.close();
rs = null;
}
}
if("FILE".equalsIgnoreCase(action) && !"GSTR3B".equalsIgnoreCase(returnType))
{
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
pstmt.setString(2, periodCode);
pstmt.setString(3, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") == 0)
{ {
if(rs.getInt("CNT") > 0) errList.add( "VTNORECSAV" );
{ errFields.add("returns_type");
errList.add( "VTGSTFILE" );
errFields.add("returns_type");
}
} }
if(pstmt!=null) }
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'R' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, recType);
pstmt.setString(2, periodCode);
pstmt.setString(3, loginSiteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") > 0)
{ {
pstmt.close(); errList.add( "VTGSTFILE" );
pstmt = null; errFields.add("returns_type");
} }
if(rs!=null) }
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
}
if("FILE".equalsIgnoreCase(action))
{
sql = "SELECT COUNT(1) AS CNT FROM USER_SIGN_ACC WHERE USER_ID = ? AND DOC_TYPE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, userId);
pstmt.setString(2, returnType);
rs = pstmt.executeQuery();
if(rs.next())
{
if(rs.getInt("CNT") == 0)
{ {
rs.close(); errList.add( "VTNOSIGCON" );
rs = null; errFields.add("returns_type");
} }
} }
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(rs!=null)
{
rs.close();
rs = null;
}
} }
break; break;
} }
...@@ -970,12 +1012,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -970,12 +1012,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
recType = "2"; recType = "2";
} }
else if("GSTR3".equalsIgnoreCase(recordType)) else if("GSTR3".equalsIgnoreCase(recordType) || "GSTR3B".equalsIgnoreCase(recordType))
{ {
recType = "3"; recType = "3";
} }
if("SAVE".equalsIgnoreCase(dataAction)) if("SAVE".equalsIgnoreCase(dataAction) && !"GSTR3B".equalsIgnoreCase(recordType))
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?"; sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'P' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1050,7 +1092,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1050,7 +1092,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
rs = null; rs = null;
} }
} }
if("SUBMIT".equalsIgnoreCase(dataAction)) if("SUBMIT".equalsIgnoreCase(dataAction) && !"GSTR3B".equalsIgnoreCase(recordType))
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?"; sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1125,7 +1167,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1125,7 +1167,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
rs = null; rs = null;
} }
} }
if("FILE".equalsIgnoreCase(dataAction)) if("FILE".equalsIgnoreCase(dataAction) && !"GSTR3B".equalsIgnoreCase(recordType))
{ {
sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?"; sql = "SELECT COUNT(1) AS CNT FROM GST_DATA_HDR WHERE REC_TYPE = ? AND SUBMIT_STATUS = 'S' AND PRD_CODE = ? AND SITE_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
......
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizPos.java
View file @ 43a3d853
...@@ -1506,7 +1506,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1506,7 +1506,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd"))) if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
{ {
retStatusCallStatus = "0"; retStatusCallStatus = "0";
continue; retStatusResponseJsonStr = "IP";
} }
else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd"))) else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
{ {
...@@ -1603,6 +1603,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1603,6 +1603,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
{ {
break; break;
} }
else
{
continue;
}
} }
} }
else else
...@@ -2628,8 +2632,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2628,8 +2632,8 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
impg = new IMPG(); impg = new IMPG();
impg.isSezImport = true;//TODO need to confirm exact value impg.isSezImport = true;//TODO need to confirm exact value
impg.sezGSTIN = checkNullandTrim(rs.getString("TAX_REG_NO")); impg.sezGSTIN = checkNullandTrim(rs.getString("TAX_REG_NO"));
impg.billOfEntryNo = checkNullandTrim(rs.getString("LR_NO")); impg.billOfEntryNo = checkNullandTrim(rs.getString("DOC_NO"));
impg.billOfEntryDate = rs.getDate("LR_DATE"); impg.billOfEntryDate = rs.getDate("DOC_DATE");
impg.amount = rs.getDouble("AMOUNT"); impg.amount = rs.getDouble("AMOUNT");
impg.portCode = checkNullandTrim(rs.getString("ORDER_NO")); impg.portCode = checkNullandTrim(rs.getString("ORDER_NO"));
impg.items = invLineItems; impg.items = invLineItems;
...@@ -3094,7 +3098,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3094,7 +3098,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd"))) if("IP".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
{ {
retStatusCallStatus = "0"; retStatusCallStatus = "0";
continue; retStatusResponseJsonStr = "IP";
} }
else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd"))) else if("P".equalsIgnoreCase((String)retStatsJsonData.get("status_cd")))
{ {
...@@ -3191,6 +3195,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3191,6 +3195,10 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
{ {
break; break;
} }
else
{
continue;
}
} }
} }
else else
...@@ -5039,7 +5047,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi ...@@ -5039,7 +5047,7 @@ public class GSTDataSubmitWizPos extends ValidatorEJB implements GSTDataSubmitWi
int[] updateCount = pstmtUpd.executeBatch(); int[] updateCount = pstmtUpd.executeBatch();
System.out.print("GST_DATA_HSR Update count"); System.out.print("GST_DATA_HDR Update count");
for(int eachRowCnt : updateCount) for(int eachRowCnt : updateCount)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment