Skip to content

B
business-java
Commit 93a392ab authored by kpandey's avatar kpandey
Browse files
Options

Changes in sql querry in taxMissmatchSummary 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191493 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4d6bd4fe
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 8 deletions
webitm-dashboard/ibase/dashboard/gst/ejb/TransactionInOutEJB.java
View file @ 93a392ab
...@@ -1418,7 +1418,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1418,7 +1418,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
"and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+ "and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+
"order by gsthdr.rec_type";*/ "order by gsthdr.rec_type";*/
sql="SELECT SUM(gstdet.igst_amt) AS igst_amt ,SUM(gstdet.cgst_amt) AS cgst_amt ,"+ /* 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 ,"+ "SUM(gstdet.sgst_amt) AS sgst_amt ,SUM(GSTDET.CESS_AMT) AS CESS_AMT ,"+
"round(SUM(COALESCE(GSTDET.IGST_AMT,0) + COALESCE(GSTDET.CGST_AMT,0)+ COALESCE(GSTDET.sgst_amt,0)+ "+ "round(SUM(COALESCE(GSTDET.IGST_AMT,0) + COALESCE(GSTDET.CGST_AMT,0)+ COALESCE(GSTDET.sgst_amt,0)+ "+
"COALESCE(GSTDET.CESS_AMT,0))) AS total_tax ,SUM(CASE WHEN GSTHDR.SUBMIT_STATUS = 'P' THEN 1 ELSE 0 "+ "COALESCE(GSTDET.CESS_AMT,0))) AS total_tax ,SUM(CASE WHEN GSTHDR.SUBMIT_STATUS = 'P' THEN 1 ELSE 0 "+
...@@ -1431,17 +1431,33 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1431,17 +1431,33 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
",'31','32','33','34','35','36','41','42','43','44','45','46','47','48') "+ ",'31','32','33','34','35','36','41','42','43','44','45','46','47','48') "+
"AND gsthdr.prd_code = '"+periodCode+"' AND GSTHDR.SITE_CODE = '"+sessionSiteCode+"' "+ "AND gsthdr.prd_code = '"+periodCode+"' AND GSTHDR.SITE_CODE = '"+sessionSiteCode+"' "+
statusSQLString+gstCodeSQLString+ statusSQLString+gstCodeSQLString+
" GROUP BY GSTHDR.SUBMIT_STATUS ORDER BY GSTHDR.SUBMIT_STATUS"; " GROUP BY GSTHDR.SUBMIT_STATUS ORDER BY GSTHDR.SUBMIT_STATUS";*/
System.out.println("sql start for OutwardTax\n sessionSiteCode: "+sessionSiteCode+"\n periodCode: "+periodCode);
//Changes done by KAMAL.P start(02/10/2018)
sql="select sum(D.IGST_AMT+D.CGST_AMT+D.SGST_AMT) as OutwardTax " +
" from gst_data_Hdr H,gst_data_DET D " +
" where H.tran_id=D.tran_id and " +
" H.site_code='"+sessionSiteCode+"' and H.PRD_CODE='"+periodCode+"' and H.REC_TYPE=1 and H.TRAN_TYPE<>50 ";
System.out.println("sql iin===>"+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
System.out.println("rs for sql ===>"+rs);
System.out.println("if method start");
if(rs.next()) if(rs.next())
{ {
System.out.println("============igst_amt: "+rs.getString("igst_amt")+" cgst_amt: "+rs.getString("cgst_amt")+" sgst_amt: "+rs.getString("sgst_amt")+" cess_amt: "+rs.getString("cess_amt")); //System.out.println("============igst_amt: "+rs.getString("igst_amt")+" cgst_amt: "+rs.getString("cgst_amt")+" sgst_amt: "+rs.getString("sgst_amt")+" cess_amt: "+rs.getString("cess_amt"));
totalTax = checkNumberNull(rs.getString("total_tax")); totalTax = checkNumberNull(rs.getString("OutwardTax"));
System.out.println("totaltax for outward"+totalTax);
totalAmountMap.put("outwardTax","<font style='font-size: 15px; font-weight: 500;'>INR</font> "+totalTax); totalAmountMap.put("outwardTax","<font style='font-size: 15px; font-weight: 500;'>INR</font> "+totalTax);
System.out.println("totalAmountMap for outward"+totalAmountMap);
} }
else else
{ {
System.out.println("SQL does not return any data---------------------------Outward Tax"); System.out.println("SQL does not return any data---------------------------Outward Tax");
...@@ -1452,6 +1468,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1452,6 +1468,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("---------------------------Inward Tax"); System.out.println("---------------------------Inward Tax");
//Changes done by KAMAL.P END(02/10/2018)
//***************************Inward Tax*********************************** //***************************Inward Tax***********************************
/*sql = "select sum(gstdet.igst_amt) as igst_amt ,sum(gstdet.cgst_amt) as cgst_amt ," + /*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" + "sum(gstdet.sgst_amt) as sgst_amt,sum(gstdet.cess_amt) as cess_amt" +
...@@ -1460,7 +1477,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1460,7 +1477,8 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
"'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') " + "'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+ "and gsthdr.prd_code='"+periodCode+"' and gsthdr.SITE_CODE='"+sessionSiteCode+"' " +statusSQLString+gstCodeSQLString+
"order by gsthdr.rec_type";*/ "order by gsthdr.rec_type";*/
sql="SELECT SUM(gstdet.igst_amt) AS igst_amt ,SUM(gstdet.cgst_amt) AS cgst_amt ,"+
/* 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 ,"+ "SUM(gstdet.sgst_amt) AS sgst_amt ,SUM(GSTDET.CESS_AMT) AS CESS_AMT ,"+
"round(SUM(COALESCE(GSTDET.IGST_AMT,0) + COALESCE(GSTDET.CGST_AMT,0)+ COALESCE(GSTDET.sgst_amt,0)+ "+ "round(SUM(COALESCE(GSTDET.IGST_AMT,0) + COALESCE(GSTDET.CGST_AMT,0)+ COALESCE(GSTDET.sgst_amt,0)+ "+
"COALESCE(GSTDET.CESS_AMT,0))) AS total_tax ,SUM(CASE WHEN GSTHDR.SUBMIT_STATUS = 'P' THEN 1 ELSE 0 "+ "COALESCE(GSTDET.CESS_AMT,0))) AS total_tax ,SUM(CASE WHEN GSTHDR.SUBMIT_STATUS = 'P' THEN 1 ELSE 0 "+
...@@ -1473,16 +1491,30 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1473,16 +1491,30 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
",'31','32','33','34','35','36','41','42','43','44','45','46','47','48') "+ ",'31','32','33','34','35','36','41','42','43','44','45','46','47','48') "+
"AND gsthdr.prd_code = '"+periodCode+"' AND GSTHDR.SITE_CODE = '"+sessionSiteCode+"' "+ "AND gsthdr.prd_code = '"+periodCode+"' AND GSTHDR.SITE_CODE = '"+sessionSiteCode+"' "+
statusSQLString+gstCodeSQLString+ statusSQLString+gstCodeSQLString+
" GROUP BY GSTHDR.SUBMIT_STATUS ORDER BY GSTHDR.SUBMIT_STATUS"; " GROUP BY GSTHDR.SUBMIT_STATUS ORDER BY GSTHDR.SUBMIT_STATUS";*/
System.out.println("sql start for inward\n sessionSiteCode: "+sessionSiteCode+"\n periodCode: "+periodCode);
//Changes done by KAMAL.P start(02/10/2018)
sql="select sum(D.IGST_AMT+D.CGST_AMT+D.SGST_AMT) as InwardTax" +
" from gst_data_Hdr H,gst_data_DET D" +
" where H.tran_id=D.tran_id and" +
" H.site_code='"+sessionSiteCode+"' and H.PRD_CODE='"+periodCode+"' and H.REC_TYPE=2 and H.TRAN_TYPE<>50";
System.out.println("sql ==>"+sql);
totalTax = ""; totalTax = "";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
System.out.println("============igst_amt: "+rs.getString("igst_amt")+" cgst_amt: "+rs.getString("cgst_amt")+" sgst_amt: "+rs.getString("sgst_amt")+" cess_amt: "+rs.getString("cess_amt")); //System.out.println("============igst_amt: "+rs.getString("igst_amt")+" cgst_amt: "+rs.getString("cgst_amt")+" sgst_amt: "+rs.getString("sgst_amt")+" cess_amt: "+rs.getString("cess_amt"));
totalTax = checkNumberNull(rs.getString("total_tax")); totalTax = checkNumberNull(rs.getString("InwardTax"));
System.out.println("totaltax for inward"+totalTax);
totalAmountMap.put("inwardTax","<font style='font-size: 15px; font-weight: 500;'>INR</font> "+totalTax); totalAmountMap.put("inwardTax","<font style='font-size: 15px; font-weight: 500;'>INR</font> "+totalTax);
System.out.println("totalAmountMap for outward"+totalAmountMap);
} }
else else
{ {
...@@ -1494,6 +1526,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO ...@@ -1494,6 +1526,7 @@ public class TransactionInOutEJB extends ValidatorEJB implements TransactionInO
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("---------------------------Outward Mismatch"); System.out.println("---------------------------Outward Mismatch");
//Changes done by KAMAL.P END(02/10/2018)
gstCode = checkNull(gstCode); gstCode = checkNull(gstCode);
gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode); gstCodeUtility = dashboardUtility.getCommaSeparated(gstCode);
......
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