Skip to content

B
business-java
Commit 1e76ff6b authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

CVS changes merged in svn for GST dashboard(getDefaultGSTNumber method added) 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178514 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8073f966
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 704 deletions
webitm-dashboard/ibase/dashboard/gst/ejb/TransactionInOutEJB.java
View file @ 1e76ff6b
...@@ -54,29 +54,17 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -54,29 +54,17 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
month = checkNull(month); month = checkNull(month);
year = checkNull(year); year = checkNull(year);
System.out.println("Selected month: "+month+" year: "+year+" status: "+status+" gstCode: "+gstCode); System.out.println("Selected month: "+month+" year: "+year+" status: "+status+" gstnumber : "+gstCode);
/*sql = "Select Acct_Prd From Period Where To_Date(Sysdate) Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
currentFinancialYear = checkNull(rs.getString("Acct_Prd"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
System.out.println("================currentFinancialYear: "+currentFinancialYear);
if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year))) if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year)))
{ {
sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date"; sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
periodCode = checkNull(rs.getString("Code")); periodCode = checkNull(rs.getString("Code"));
prvFinancialYear = checkNull(rs.getString("Acct_Prd"));
String monthLocal = periodCode.substring(0, 2); String monthLocal = periodCode.substring(0, 2);
if(Integer.parseInt(monthLocal)>12) if(Integer.parseInt(monthLocal)>12)
{ {
...@@ -101,53 +89,11 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -101,53 +89,11 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
SimpleDateFormat outputFormat = new SimpleDateFormat("MM"); SimpleDateFormat outputFormat = new SimpleDateFormat("MM");
month = outputFormat.format(cal.getTime()); month = outputFormat.format(cal.getTime());
} }
String date = month+"/"+month+"/"+year;
Timestamp timeStampFormat = getTimeStamp(date);
sql = "Select Acct_Prd From Period Where to_char(?,'dd-mon-yy') Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, timeStampFormat);
rs = pstmt.executeQuery();
if (rs.next())
{
periodCode = month+""+year; periodCode = month+""+year;
prvFinancialYear = checkNull(rs.getString("Acct_Prd"));
System.out.println("periodCode: "+periodCode);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
System.out.println("============periodCode: "+periodCode+" acctCode: "+prvFinancialYear+" month: "+month);
/*if(Integer.parseInt(prvFinancialYear)<Integer.parseInt(currentFinancialYear))
{
String site_code = "", fin_entity = "";
sql = "select site_code, fin_entity, facility_code from site where site_code='"+sessionSiteCode+"' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
site_code = checkNull(rs.getString("site_code"));
fin_entity = checkNull(rs.getString("fin_entity"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select reg_no from siteregno where ref_code='GST_GT' and site_code='"+site_code+"' and fin_entity = '"+fin_entity+"' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
turnover = checkNull(rs.getString("reg_no"));
} }
rs.close(); System.out.println("Decode as periodCode: "+periodCode);
rs = null; System.out.println("status from filter: "+checkNull(status));
pstmt.close();
pstmt = null;
}*/
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -163,34 +109,15 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -163,34 +109,15 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}*/
else else
{ {
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") "; gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
} }
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator; String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
/*sql = "select 'Invoice' as Transaction,count(1) as cnt , sum(amount) as amount from gst_data_hdr " +
"where rec_type='1' and tran_type in('01','02','03','04','05','08','09','10','11','12','13','14') and prd_code='"+periodCode+"' " +
"and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Debit Note' as Transaction,count(1) " +
"as cnt, sum(amount) as amount from gst_data_hdr where rec_type='1' and tran_type in ('30','32','34','36') and " +
"prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all " +
"select 'Credit Note' as Transaction,count(1) as cnt, sum(amount)as amount from " +
"gst_data_hdr where rec_type='1' and tran_type in ('29','31','33','35') and " +
"prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Nil Rate' " +
"as Transaction,count(1)as cnt, sum(amount) as amount from gst_data_hdr where rec_type='1' and " +
"tran_type in ('15','16','17','18','19','20','21','22','23','24','25','26') and prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all " +
"select 'Export' as Transaction,count(1)as cnt, sum(amount)as amount from gst_data_hdr " +
"where rec_type='1' and tran_type in ('05','06','27','28') and prd_code='"+periodCode+"' and " +
"site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Advance Tax Paid' as Transaction,count(1)as" +
" cnt, sum(amount)as amount from gst_data_hdr where rec_type='1' and tran_type in ('14') " +
"and prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString;
*/
sql = "select transaction, sum(cnt) as cnt, sum(amount) as amount from (" + sql = "select transaction, sum(cnt) as cnt, sum(amount) as amount from (" +
"select (case when tran_type in('01','03','04','05','08','09','10','11','12','13','14') " + "select (case when tran_type in('01','03','04','05','08','09','10','11','12','13','14') " +
"then 'Invoice' when tran_type in('02') then 'Outward RCM' when " + "then 'Invoice' when tran_type in('02') then 'Outward RCM' when " +
...@@ -202,6 +129,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -202,6 +129,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
"else 'GST type is not available in database' end) as Transaction,1 as cnt,amount " + "else 'GST type is not available in database' end) as Transaction,1 as cnt,amount " +
"from gst_data_hdr where rec_type='1' and prd_code='"+periodCode+"' and " + "from gst_data_hdr where rec_type='1' and prd_code='"+periodCode+"' and " +
"site_code='"+sessionSiteCode+"' "+ statusSQLString + gstCodeSQLString+") group by transaction"; "site_code='"+sessionSiteCode+"' "+ statusSQLString + gstCodeSQLString+") group by transaction";
pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY); pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
rowCount = 0; rowCount = 0;
...@@ -333,8 +261,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -333,8 +261,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
int count = 0, rowCount = 0; int count = 0, rowCount = 0;
String sql = ""; String sql = "";
String periodCode = "", prvFinancialYear = "", currentFinancialYear = ""; String periodCode = "";
String transactionType = "", turnover = null, tranCount = "", tranAmount = "", tran_image = ""; String transactionType = "",tranCount = "", tranAmount = "", tran_image = "";
StringBuffer rowBuffer = null; StringBuffer rowBuffer = null;
String statusSQLString = "", gstCodeSQLString = ""; String statusSQLString = "", gstCodeSQLString = "";
DashboardUtility dashboardUtility = null; DashboardUtility dashboardUtility = null;
...@@ -342,32 +270,18 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -342,32 +270,18 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
month = checkNull(month); month = checkNull(month);
year = checkNull(year); year = checkNull(year);
System.out.println("Selected month: "+month+" year: "+year+" status: "+status+" gstCode: "+gstCode); System.out.println("Selected month: "+month+" year: "+year+" status: "+status+" gstNumber: "+gstCode);
/*sql = "Select Acct_Prd From Period Where To_Date(Sysdate) Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
currentFinancialYear = checkNull(rs.getString("Acct_Prd"));
}
System.out.println("================currentFinancialYear: "+currentFinancialYear);
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year))) if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year)))
{ {
sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date"; sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
periodCode = checkNull(rs.getString("Code")); periodCode = checkNull(rs.getString("Code"));
prvFinancialYear = checkNull(rs.getString("Acct_Prd"));
String monthLocal = periodCode.substring(0, 2); String monthLocal = periodCode.substring(0, 2);
if(Integer.parseInt(monthLocal)>12) if(Integer.parseInt(monthLocal)>12)
{ {
...@@ -392,57 +306,14 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -392,57 +306,14 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
SimpleDateFormat outputFormat = new SimpleDateFormat("MM"); SimpleDateFormat outputFormat = new SimpleDateFormat("MM");
month = outputFormat.format(cal.getTime()); month = outputFormat.format(cal.getTime());
} }
String date = month+"/"+month+"/"+year;
Timestamp timeStampFormat = getTimeStamp(date);
sql = "Select Acct_Prd From Period Where to_char(?,'dd-mon-yy') Between Fr_Date and To_Date";
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, timeStampFormat);
rs = pstmt.executeQuery();
if (rs.next())
{
periodCode = month+""+year; periodCode = month+""+year;
prvFinancialYear = checkNull(rs.getString("Acct_Prd"));
System.out.println("periodCode: "+periodCode);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
System.out.println("============periodCode: "+periodCode+" acctCode: "+prvFinancialYear+" month: "+month);
/*if(Integer.parseInt(prvFinancialYear)<Integer.parseInt(currentFinancialYear))
{
String site_code = "", fin_entity = "";
sql = "select site_code, fin_entity, facility_code from site where site_code='"+sessionSiteCode+"' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
site_code = checkNull(rs.getString("site_code"));
fin_entity = checkNull(rs.getString("fin_entity"));
} }
rs.close(); System.out.println("Decode as periodCode: "+periodCode);
rs = null;
pstmt.close();
pstmt = null;
sql = "select reg_no from siteregno where ref_code='GST_GT' and site_code='"+site_code+"' and fin_entity = '"+fin_entity+"' ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next())
{
turnover = checkNull(rs.getString("reg_no"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}*/
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
if(("All".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status))) if(("Submitted,Saved,Pending".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status)))
{ {
statusSQLString = " and SUBMIT_STATUS in('P','T','S') "; statusSQLString = " and SUBMIT_STATUS in('P','T','S') ";
} }
...@@ -454,34 +325,15 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -454,34 +325,15 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}*/
else else
{ {
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") "; gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
} }
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
/*sql = "select 'Invoice' as Transaction,count(1) as cnt , sum(amount) as amount from gst_data_hdr " +
"where rec_type='2' and tran_type in('01','02','03','04','05','08','09','10','11','12','13','14') and prd_code='"+periodCode+"' " +
"and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Debit Note' as Transaction,count(1) " +
"as cnt, sum(amount) as amount from gst_data_hdr where rec_type='2' and tran_type in ('30','32','34','36') and " +
"prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all " +
"select 'Credit Note' as Transaction,count(1) as cnt, sum(amount)as amount from " +
"gst_data_hdr where rec_type='2' and tran_type in ('29','31','33','35') and " +
"prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Nil Rate' " +
"as Transaction,count(1)as cnt, sum(amount) as amount from gst_data_hdr where rec_type='2' and " +
"tran_type in ('15','16','17','18','19','20','21','22','23','24','25','26') and prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all " +
"select 'Export' as Transaction,count(1)as cnt, sum(amount)as amount from gst_data_hdr " +
"where rec_type='2' and tran_type in ('05','06','27','28') and prd_code='"+periodCode+"' and " +
"site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+" union all select 'Advance Tax Paid' as Transaction,count(1)as" +
" cnt, sum(amount)as amount from gst_data_hdr where rec_type='2' and tran_type in ('14') " +
"and prd_code='"+periodCode+"' and site_code='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString;*/
String userImagePath = CommonConstants.JBOSSHOME + File.separator +"server"+File.separator +"default"+File.separator +"deploy"+File.separator +"ibase.ear"+File.separator + "ibase.war" +File.separator + "resource" + File.separator + "images"+ File.separator + "users"+File.separator;
sql = "select transaction, sum(cnt) as cnt, sum(amount) as amount from (" + sql = "select transaction, sum(cnt) as cnt, sum(amount) as amount from (" +
"select (case when tran_type in('01','03','04','05','08','09','10','11','12','13','14') " + "select (case when tran_type in('01','03','04','05','08','09','10','11','12','13','14') " +
"then 'Invoice' when tran_type in('02') then 'Inward RCM' when " + "then 'Invoice' when tran_type in('02') then 'Inward RCM' when " +
...@@ -659,12 +511,9 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -659,12 +511,9 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and gsthdr.TAX_REG_NO is null ";
}*/
else else
{ {
gstCodeSQLString = " and gsthdr.TAX_REG_NO in ("+gstCodeUtility+") "; gstCodeSQLString = " and gsthdr.TAX_REG_NO in ("+gstCodeUtility+") ";
...@@ -708,294 +557,24 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -708,294 +557,24 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
"sum(gstdet.sgst_amt) as sgst_amt,sum(gstdet.cess_amt) as cess_amt from gst_data_hdr gsthdr inner join " + "sum(gstdet.sgst_amt) as sgst_amt,sum(gstdet.cess_amt) as cess_amt from gst_data_hdr gsthdr inner join " +
"gst_data_det gstdet on gsthdr.tran_id=gstdet.tran_id where gsthdr.rec_type='"+rec_type+"' " +tran_type+ "gst_data_det gstdet on gsthdr.tran_id=gstdet.tran_id where gsthdr.rec_type='"+rec_type+"' " +tran_type+
" and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+ " and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' "+statusSQLString+gstCodeSQLString+
" group by gsthdr.tran_id, gsthdr.doc_no,gsthdr.tran_date order by gsthdr.tran_id"; " group by gsthdr.tran_id, gsthdr.doc_no,gsthdr.tran_date order by gsthdr.tran_id";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
while (rs.next())
{
rowData = new JSONObject();
rowData.put("doc_no",checkNull(rs.getString("doc_no")));
rowData.put("tran_date",checkNumberNull(rs.getString("tran_date")));
rowData.put("taxable_amt",checkNumberNull(rs.getString("taxable_amt")));
rowData.put("igst_amt",checkNumberNull(rs.getString("igst_amt")));
rowData.put("cgst_amt",checkNumberNull(rs.getString("cgst_amt")));
rowData.put("sgst_amt",checkNumberNull(rs.getString("sgst_amt")));
rowData.put("cess_amt",checkNumberNull(rs.getString("cess_amt")));
rawDataTranTypeSummJson.put(count, rowData);
count++;
}
/*pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
rs = pstmt.executeQuery();
rowCount = 0;
rs.last();
rowCount = rs.getRow();
rs.beforeFirst();
rowBuffer = new StringBuffer();
if(rowCount != 0)
{
rowBuffer = new StringBuffer("<table class = 'mtBorderWhite' border='1' id='htmlTable' cellpadding='2' style='line-height:35px;'>"+
"<thead class='mtBackgroundWhitethead'><tr style='border-bottom: 1px solid #e8e8e8; border-top: 1px solid #e8e8e8;'><td class = 'tblHeaderLeft' style='width: 10%;'>Tran date</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>Document number</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>Taxable amount</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>IGST amount</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>CGST amount</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>SGST amount</td>"+
"<td class = 'tblHeaderRight' style='width: 10%;'>CESS amount</td></tr></thead><tbody class='mtBackgroundWhitetbody'>");
}
else
{
rowBuffer = new StringBuffer("<table id='htmlTable' cellpadding='2' align='center'><tbody><tr><td align = 'center' class='gwt-ScrollTable'>No Data to Display</td></tr>");
}
while (rs.next())
{
rowBuffer.append("<tr class='mtBackgroundWhitetbodytr' style='border-bottom: 1px solid #e8e8e8;'><td class='tdCardPadding'>"+checkNull(rs.getString("tran_date"))+"</td><td align='right' class='tdCardPadding'>"+checkNull(rs.getString("doc_no"))+"</td><td align='right' class='tdCardPadding'>"+checkNumberNull(rs.getString("taxable_amt"))+"</td><td align='right' class='tdCardPadding'>"+checkNumberNull(rs.getString("igst_amt"))+"</td><td align='right' class='tdCardPadding'>"+checkNumberNull(rs.getString("cgst_amt"))+"</td><td align='right' class='tdCardPadding'>"+checkNumberNull(rs.getString("sgst_amt"))+"</td><td align='right' class='tdCardPadding'>"+checkNumberNull(rs.getString("cess_amt"))+"</td></tr>");
}
rowBuffer.append("</tbody></table>");
rowData = new JSONObject();
rowData.put("transactionDetail", rowBuffer.toString());
rowData.put("exportToExcel", "<td><img src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png' width='20px' height='20px' alt='Export to Excel' id='excel' name='excel' onclick='exportExcel(this.parentNode.id)' align='right' style='padding : 16px;'></td>");
rawDataTranTypeSummJson.put(count,rowData);*/
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (conn != null)
{
if (rs != null)
rs.close();
rs = null;
if (pstmt != null)
pstmt.close();
pstmt = null;
conn.close();
conn = null;
}
conn = null;
}
catch (Exception d)
{
d.printStackTrace();
System.out.println("Exception in :TransactionInOutEJB:" + d.getMessage());
throw new ITMException(d);
}
}
return rawDataTranTypeSummJson;
}
/*
@SuppressWarnings("unchecked")
@Override
public JSONObject getOutTaxTypeSummary(String dataSourceName,String month, String year, String status, String gstCode, String sessionSiteCode ) throws RemoteException, ITMException
{
JSONObject rawDataTranTypeSummJson = new JSONObject();
JSONObject rowData = null;
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0;
String sql = "";
String statusSQLString = "", gstCodeSQLString = "";
DashboardUtility dashboardUtility = null;
try
{
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
String periodCode = generatePeriodCode(month,year,dataSourceName);
status = checkNull(status);
dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status);
if(("Submitted,Saved,Pending".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status)))
{
statusSQLString = " and gsthdr.SUBMIT_STATUS in('P','T','S') ";
}
else
{
statusSQLString = " and gsthdr.SUBMIT_STATUS in ("+statusUtility+") ";
}
gstCode = checkNull(gstCode);
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode))
{
gstCodeSQLString = " ";
}
else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and gsthdr.TAX_REG_NO is null ";
}
else
{
gstCodeSQLString = " and gsthdr.TAX_REG_NO in ("+gstCodeUtility+") ";
}
sql = "select sum(gstdet.igst_amt) as igst_amt ,sum(gstdet.cgst_amt) as cgst_amt ," +
"sum(gstdet.sgst_amt) as sgst_amt,sum(gstdet.cess_amt) as cess_amt" +
" from gst_data_hdr gsthdr, gst_data_det gstdet where gsthdr.tran_id=gstdet.tran_id " +
"and gsthdr.rec_type='1' and gsthdr.tran_type in('01','02','03','04','05','06','07','09'," +
"'10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','26','27','28','29','30','31','32','33','34','35','36') " +
"and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+
"order by gsthdr.rec_type";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
StringBuffer taxTypeTableBuffer = new StringBuffer();
rowData = new JSONObject();
double igst_amnt = 0.0, cgst_amt = 0.0, sgst_amt = 0.0, cess_amt = 0.0, totalTax = 0.0;
if(rs.next())
{
System.out.println("============igst_amt: "+rs.getString("igst_amt")+" cgst_amt: "+rs.getString("igst_amt")+" sgst_amt: "+rs.getString("igst_amt")+" cess_amt: "+rs.getString("igst_amt"));
igst_amnt = Double.parseDouble(checkNumber(rs.getString("igst_amt")));
totalTax += igst_amnt;
cgst_amt = Double.parseDouble(checkNumber(rs.getString("cgst_amt")));
totalTax += cgst_amt;
sgst_amt = Double.parseDouble(checkNumber(rs.getString("sgst_amt")));
totalTax += sgst_amt;
cess_amt = Double.parseDouble(checkNumber(rs.getString("cess_amt")));
totalTax += cess_amt;
rowData.put("yearCode",periodCode);
rowData.put("igst_amnt",igst_amnt);
rowData.put("cgst_amt",cgst_amt);
rowData.put("sgst_amt",sgst_amt);
rowData.put("cess_amt",cess_amt);
rowData.put("totalTax",totalTax);
rowData.put("status", status);
rowData.put("gstCode", gstCode);
rowData.put("exportToExcel", "<td><img src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png' width='20px' height='20px' alt='Export to Excel' id='excel' name='excel' onclick='exportExcel(this.parentNode.id)' align='right' style='padding : 22px 12px 10px 0px;'></td>");
}
else
{
taxTypeTableBuffer.append("<table id='htmlTable' cellpadding='2' align='center' width='100%'><tr><td align = 'center' class='gwt-ScrollTable'>No Data Found</td></tr></table>");
}
System.out.println("taxTypeTableBuffer value: "+taxTypeTableBuffer);
rowData.put("taxTypeTableData", taxTypeTableBuffer.toString());
rawDataTranTypeSummJson.put(count, rowData);
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (conn != null)
{
if (rs != null)
rs.close();
rs = null;
if (pstmt != null)
pstmt.close();
pstmt = null;
conn.close();
conn = null;
}
conn = null;
}
catch (Exception d)
{
d.printStackTrace();
System.out.println("Exception in :TransactionInOutEJB:" + d.getMessage());
throw new ITMException(d);
}
}
return rawDataTranTypeSummJson;
}
@SuppressWarnings("unchecked")
public JSONObject getInTaxTypeSummary(String dataSourceName,String month, String year, String status, String gstCode, String sessionSiteCode ) throws RemoteException, ITMException
{
JSONObject rawDataTranTypeSummJson = new JSONObject();
JSONObject rowData = null;
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0;
String sql = "";
String statusSQLString = "", gstCodeSQLString = "";
DashboardUtility dashboardUtility = null;
try
{
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
String periodCode = generatePeriodCode(month, year, dataSourceName);
status = checkNull(status);
dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status);
if(("Submitted,Saved,Pending".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status)))
{
statusSQLString = " and gsthdr.SUBMIT_STATUS in('P','T','S') ";
}
else
{
statusSQLString = " and gsthdr.SUBMIT_STATUS in ("+statusUtility+") ";
}
gstCode = checkNull(gstCode);
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode))
{
gstCodeSQLString = " ";
}
else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and gsthdr.TAX_REG_NO is null ";
}
else
{
gstCodeSQLString = " and gsthdr.TAX_REG_NO in ("+gstCodeUtility+") ";
}
sql = "select sum(gstdet.igst_amt) as igst_amt ,sum(gstdet.cgst_amt) as cgst_amt ," +
"sum(gstdet.sgst_amt) as sgst_amt,sum(gstdet.cess_amt) as cess_amt" +
" from gst_data_hdr gsthdr, gst_data_det gstdet where gsthdr.tran_id=gstdet.tran_id " +
"and gsthdr.rec_type='2' and gsthdr.tran_type in('01','02','03','04','05','06','07','09'," +
"'10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','26','27','28','29','30','31','32','33','34','35','36') " +
"and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+
"order by gsthdr.rec_type";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
StringBuffer taxTypeTableBuffer = new StringBuffer(); while (rs.next())
rowData = new JSONObject();
double igst_amnt = 0.0, cgst_amt = 0.0, sgst_amt = 0.0, cess_amt = 0.0, totalTax = 0.0;
if(rs.next())
{ {
rowData = new JSONObject();
rowData.put("doc_no",checkNull(rs.getString("doc_no")));
rowData.put("tran_date",checkNumberNull(rs.getString("tran_date")));
rowData.put("taxable_amt",checkNumberNull(rs.getString("taxable_amt")));
rowData.put("igst_amt",checkNumberNull(rs.getString("igst_amt")));
rowData.put("cgst_amt",checkNumberNull(rs.getString("cgst_amt")));
rowData.put("sgst_amt",checkNumberNull(rs.getString("sgst_amt")));
rowData.put("cess_amt",checkNumberNull(rs.getString("cess_amt")));
igst_amnt = Double.parseDouble(checkNumber(rs.getString("igst_amt"))); rawDataTranTypeSummJson.put(count, rowData);
totalTax += igst_amnt; count++;
cgst_amt = Double.parseDouble(checkNumber(rs.getString("cgst_amt")));
totalTax += cgst_amt;
sgst_amt = Double.parseDouble(checkNumber(rs.getString("sgst_amt")));
totalTax += sgst_amt;
cess_amt = Double.parseDouble(checkNumber(rs.getString("cess_amt")));
totalTax += cess_amt;
rowData.put("yearCode",periodCode);
rowData.put("igst_amnt",igst_amnt);
rowData.put("cgst_amt",cgst_amt);
rowData.put("sgst_amt",sgst_amt);
rowData.put("cess_amt",cess_amt);
rowData.put("totalTax",totalTax);
rowData.put("status", status);
rowData.put("gstCode", gstCode);
rowData.put("exportToExcel", "<td><img src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png' width='20px' height='20px' alt='Export to Excel' id='excel' name='excel' onclick='exportExcel(this.parentNode.id)' align='right' style='padding : 22px 12px 10px 0px;'></td>");
}
else
{
taxTypeTableBuffer.append("<table id='htmlTable' cellpadding='2' align='center' width='100%'><tr><td align = 'center' class='gwt-ScrollTable'>No Data Found</td></tr></table>");
} }
System.out.println("taxTypeTableBuffer value: "+taxTypeTableBuffer);
rowData.put("taxTypeTableData", taxTypeTableBuffer.toString());
rawDataTranTypeSummJson.put(count, rowData);
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -1028,7 +607,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1028,7 +607,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
} }
return rawDataTranTypeSummJson; return rawDataTranTypeSummJson;
} }
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getTaxTypeDetail(String dataSourceName,String periodCode, String sessionSiteCode, String tranType, String status, String gstCode) throws RemoteException, ITMException public JSONObject getTaxTypeDetail(String dataSourceName,String periodCode, String sessionSiteCode, String tranType, String status, String gstCode) throws RemoteException, ITMException
...@@ -1063,7 +642,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1063,7 +642,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
else if(gstCode.equalsIgnoreCase("Unregistered")) else if(gstCode.equalsIgnoreCase("Unregistered"))
{ {
...@@ -1205,216 +784,6 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1205,216 +784,6 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
return rawDataTranTypeSummJson; return rawDataTranTypeSummJson;
} }
/*
@SuppressWarnings("unchecked")
@Override
public JSONObject getOutMismatchSummary(String dataSourceName,String month, String year, String status, String gstCode, String sessionSiteCode ) throws RemoteException, ITMException
{
JSONObject rawDataTranTypeSummJson = new JSONObject();
JSONObject rowData = null;
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0;
String sql = "";
String statusSQLString = "", gstCodeSQLString = "";
DashboardUtility dashboardUtility = null;
try
{
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
String periodCode = generatePeriodCode(month, year,dataSourceName);
status = checkNull(status);
dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status);
if(("Submitted,Saved,Pending".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status)))
{
statusSQLString = " and SUBMIT_STATUS in('P','T','S') ";
}
else
{
statusSQLString = " and SUBMIT_STATUS in ("+statusUtility+") ";
}
gstCode = checkNull(gstCode);
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode))
{
gstCodeSQLString = " ";
}
else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}
else
{
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
}
sql = "Select 'Outward' as Transaction,count(1) as count ,sum(amount) as amount from gst_data_hdr " +
"where rec_type='1' and tran_type in ('01','02','03','04','05','06','07','09'," +
"'10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','26','27','28','29','30','31','32','33','34','35','36') and site_code='"+sessionSiteCode+"' "
+statusSQLString+gstCodeSQLString+"and prd_code='"+periodCode+"'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
StringBuffer taxTypeTableBuffer = new StringBuffer();
rowData = new JSONObject();
if(rs.next())
{
rowData.put("yearCode",periodCode);
rowData.put("transaction",checkNull(rs.getString("Transaction")));
rowData.put("status", status);
rowData.put("gstCode", gstCode);
rowData.put("count",checkNumber(rs.getString("count")));
rowData.put("amount",checkNumber(rs.getString("amount")));
rowData.put("exportToExcel", "<td><img src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png' width='20px' height='20px' alt='Export to Excel' id='excel' name='excel' onclick='exportExcel(this.parentNode.id)' align='right' style='padding : 22px 12px 10px 0px;'></td>");
}
else
{
taxTypeTableBuffer.append("<table id='htmlTable' cellpadding='2' align='center' width='100%'><tr><td align = 'center' class='gwt-ScrollTable'>No Data Found</td></tr></table>");
}
System.out.println("taxTypeTableBuffer value: "+taxTypeTableBuffer);
rowData.put("taxTypeTableData", taxTypeTableBuffer.toString());
rawDataTranTypeSummJson.put(count, rowData);
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (conn != null)
{
if (rs != null)
rs.close();
rs = null;
if (pstmt != null)
pstmt.close();
pstmt = null;
conn.close();
conn = null;
}
conn = null;
}
catch (Exception d)
{
d.printStackTrace();
System.out.println("Exception in :TransactionInOutEJB:" + d.getMessage());
throw new ITMException(d);
}
}
return rawDataTranTypeSummJson;
}
@SuppressWarnings("unchecked")
public JSONObject getInMismatchSummary(String dataSourceName,String month, String year, String status, String gstCode, String sessionSiteCode ) throws RemoteException, ITMException
{
JSONObject rawDataTranTypeSummJson = new JSONObject();
JSONObject rowData = null;
ResultSet rs = null;
PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
int count = 0;
String sql = "";
String statusSQLString = "", gstCodeSQLString = "";
DashboardUtility dashboardUtility = null;
try
{
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
String periodCode = generatePeriodCode(month, year,dataSourceName);
status = checkNull(status);
dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status);
if(("Submitted,Saved,Pending".equalsIgnoreCase(status)) || ("".equalsIgnoreCase(status)))
{
statusSQLString = " and SUBMIT_STATUS in('P','T','S') ";
}
else
{
statusSQLString = " and SUBMIT_STATUS in ("+statusUtility+") ";
}
gstCode = checkNull(gstCode);
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode))
{
gstCodeSQLString = " ";
}
else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}
else
{
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
}
sql = "Select 'Inward' as Transaction,count(1) as count ,sum(amount) as amount from gst_data_hdr " +
"where rec_type='2' and tran_type in ('01','02','03','04','05','06','07','09'," +
"'10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','26','27','28','29','30','31','32','33','34','35','36') and site_code='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+
"and prd_code='"+periodCode+"'";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
StringBuffer taxTypeTableBuffer = new StringBuffer();
rowData = new JSONObject();
if(rs.next())
{
rowData.put("yearCode",periodCode);
rowData.put("transaction",checkNull(rs.getString("Transaction")));
rowData.put("status", status);
rowData.put("gstCode", gstCode);
rowData.put("count",checkNumber(rs.getString("count")));
rowData.put("amount",checkNumber(rs.getString("amount")));
rowData.put("exportToExcel", "<td><img src='"+CommonConstants.TOMCAT_HOME+"/ibase/dwh/FusionChart/images/excel.png' width='20px' height='20px' alt='Export to Excel' id='excel' name='excel' onclick='exportExcel(this.parentNode.id)' align='right' style='padding : 22px 12px 10px 0px;'></td>");
}
else
{
taxTypeTableBuffer.append("<table id='htmlTable' cellpadding='2' align='center' width='100%'><tr><td align = 'center' class='gwt-ScrollTable'>No Data Found</td></tr></table>");
}
System.out.println("taxTypeTableBuffer value: "+taxTypeTableBuffer);
rowData.put("taxTypeTableData", taxTypeTableBuffer.toString());
rawDataTranTypeSummJson.put(count, rowData);
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (conn != null)
{
if (rs != null)
rs.close();
rs = null;
if (pstmt != null)
pstmt.close();
pstmt = null;
conn.close();
conn = null;
}
conn = null;
}
catch (Exception d)
{
d.printStackTrace();
System.out.println("Exception in :TransactionInOutEJB:" + d.getMessage());
throw new ITMException(d);
}
}
return rawDataTranTypeSummJson;
}
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getMismatchDetail(String dataSourceName,String periodCode, String sessionSiteCode , String tranType, String status, String gstCode) throws RemoteException, ITMException public JSONObject getMismatchDetail(String dataSourceName,String periodCode, String sessionSiteCode , String tranType, String status, String gstCode) throws RemoteException, ITMException
...@@ -1449,7 +818,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1449,7 +818,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
else if(gstCode.equalsIgnoreCase("Unregistered")) else if(gstCode.equalsIgnoreCase("Unregistered"))
{ {
...@@ -1569,7 +938,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1569,7 +938,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
String periodCode = generatePeriodCode(month, year,dataSourceName); String periodCode = generatePeriodCode(month, year,conn);
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -1585,7 +954,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1585,7 +954,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
else if(gstCode.equalsIgnoreCase("Unregistered")) else if(gstCode.equalsIgnoreCase("Unregistered"))
{ {
...@@ -1720,7 +1089,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1720,7 +1089,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
String periodCode = generatePeriodCode(month, year, dataSourceName); String periodCode = generatePeriodCode(month, year, conn);
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -1736,7 +1105,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1736,7 +1105,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn,sessionSiteCode );
} }
else if(gstCode.equalsIgnoreCase("Unregistered")) else if(gstCode.equalsIgnoreCase("Unregistered"))
{ {
...@@ -1894,21 +1263,18 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1894,21 +1263,18 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
} }
} }
public String generatePeriodCode(String month, String year, String dataSourceName) private String generatePeriodCode(String month, String year, Connection conn )
{ {
String sql= "", periodCode = ""; String sql = "", periodCode = "";
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
try try
{ {
conn = connDriver.getConnectDB(dataSourceName);
connDriver = null;
month = checkNull(month); month = checkNull(month);
year = checkNull(year); year = checkNull(year);
System.out.println("Selected month: "+month+" year: "+year); System.out.println("Selected month: "+month+" year: "+year);
if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year))) if(("".equalsIgnoreCase(month)) && ("".equalsIgnoreCase(year)))
{ {
sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date"; sql = "Select Acct_Prd,Code,Descr From Period Where To_Date(Sysdate) Between Fr_Date and To_Date";
...@@ -1917,7 +1283,6 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1917,7 +1283,6 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
if (rs.next()) if (rs.next())
{ {
periodCode = checkNull(rs.getString("Code")); periodCode = checkNull(rs.getString("Code"));
String monthLocal = periodCode.substring(0, 2); String monthLocal = periodCode.substring(0, 2);
if(Integer.parseInt(monthLocal)>12) if(Integer.parseInt(monthLocal)>12)
{ {
...@@ -1953,6 +1318,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1953,6 +1318,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
e.printStackTrace(); e.printStackTrace();
} }
return periodCode; return periodCode;
} }
...@@ -2008,7 +1374,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2008,7 +1374,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
System.out.println("Inside getTaxMismatchSummary*******************"); System.out.println("Inside getTaxMismatchSummary*******************");
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
String periodCode = generatePeriodCode(month,year,dataSourceName); String periodCode = generatePeriodCode(month,year,conn);
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -2024,7 +1390,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2024,7 +1390,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn, sessionSiteCode);
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered")) /*else if(gstCode.equalsIgnoreCase("Unregistered"))
{ {
...@@ -2269,7 +1635,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2269,7 +1635,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
String periodCode = generatePeriodCode(month, year,dataSourceName); String periodCode = generatePeriodCode(month, year,conn);
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -2285,12 +1651,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2285,12 +1651,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn, sessionSiteCode);
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}*/
else else
{ {
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") "; gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
...@@ -2376,7 +1738,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2376,7 +1738,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
{ {
conn = connDriver.getConnectDB(dataSourceName); conn = connDriver.getConnectDB(dataSourceName);
connDriver = null; connDriver = null;
String periodCode = generatePeriodCode(month, year,dataSourceName); String periodCode = generatePeriodCode(month, year,conn);
status = checkNull(status); status = checkNull(status);
dashboardUtility = new DashboardUtility(); dashboardUtility = new DashboardUtility();
String statusUtility = dashboardUtility.getCommaSeparated(status); String statusUtility = dashboardUtility.getCommaSeparated(status);
...@@ -2392,12 +1754,9 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2392,12 +1754,9 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); String gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
if("".equalsIgnoreCase(gstCode)) if("".equalsIgnoreCase(gstCode))
{ {
gstCodeSQLString = " "; gstCodeSQLString = getDefaultGSTNumber(conn, sessionSiteCode);
} }
/*else if(gstCode.equalsIgnoreCase("Unregistered"))
{
gstCodeSQLString = " and TAX_REG_NO is null ";
}*/
else else
{ {
gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") "; gstCodeSQLString = " and TAX_REG_NO in ("+gstCodeUtility+") ";
...@@ -2468,4 +1827,39 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -2468,4 +1827,39 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
} }
return rawDataTransactionStatusSummJson; return rawDataTransactionStatusSummJson;
} }
//get Default GST number on load case
private String getDefaultGSTNumber(Connection conn, String sessionSiteCode )
{
ResultSet rs = null;
PreparedStatement pstmt = null;
String sql = "";
String defaultGSTNumber="";
try
{
sql = "SELECT REG_NO FROM SITEREGNO WHERE SITE_CODE ='"+sessionSiteCode+"' AND REF_CODE ='GSTIN_NO'" ;
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
defaultGSTNumber = checkNull(rs.getString("REG_NO"));
if (!("".equalsIgnoreCase(defaultGSTNumber)) && defaultGSTNumber.length()>0 )
{
defaultGSTNumber= " and TAX_REG_NO in ('"+defaultGSTNumber+"')";
}
else
{
defaultGSTNumber="";
}
}
}
catch (Exception e)
{
e.printStackTrace();
}
return defaultGSTNumber;
}
} }
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