Skip to content

B
business-java
Commit 39cce2b3 authored by steurwadkar's avatar steurwadkar
Browse files
Options

Changes made to display Total value column in Custom excel format for GSTR 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180262 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 51ab3fdf
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 39cce2b3
......@@ -5454,7 +5454,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
}
}
detSql = " SELECT GST_RATE, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT "
detSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT "
+ " FROM GST_DATA_DET WHERE TRAN_ID = ? GROUP BY GST_RATE ";
detPstmt = conn.prepareStatement(detSql);
......@@ -5463,6 +5463,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
while(detRs.next())
{
gstRate = Double.parseDouble(String.format("%.2f",detRs.getDouble("GST_RATE")));
taxableAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("TAXABLE_AMT")));
igstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("IGST_AMT")));
cgstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("CGST_AMT")));
sgstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("SGST_AMT")));
......@@ -5486,13 +5487,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(6).setCellValue(ctin);
dataRow.createCell(7).setCellValue(posStateCode+"-"+checkNull(stateCodeHMap.get(posStateCode)));
dataRow.createCell(8).setCellValue(amount);
dataRow.createCell(9).setCellValue(gstRate);
dataRow.createCell(10).setCellValue(igstAmt);
dataRow.createCell(11).setCellValue(cgstAmt);
dataRow.createCell(12).setCellValue(sgstAmt);
dataRow.createCell(13).setCellValue(cessAmt);
dataRow.createCell(14).setCellValue(totTaxAmt);
dataRow.createCell(15).setCellValue(portCode);
dataRow.createCell(9).setCellValue(taxableAmt);
dataRow.createCell(10).setCellValue(gstRate);
dataRow.createCell(11).setCellValue(igstAmt);
dataRow.createCell(12).setCellValue(cgstAmt);
dataRow.createCell(13).setCellValue(sgstAmt);
dataRow.createCell(14).setCellValue(cessAmt);
dataRow.createCell(15).setCellValue(totTaxAmt);
dataRow.createCell(16).setCellValue(portCode);
}
closeResources(detRs, detPstmt);
}
......@@ -5554,7 +5556,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
}
}
detSql = " SELECT GST_RATE, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT "
detSql = " SELECT GST_RATE, SUM(TAXABLE_AMT) AS TAXABLE_AMT, SUM(IGST_AMT) AS IGST_AMT, SUM(CGST_AMT) AS CGST_AMT, SUM(SGST_AMT) AS SGST_AMT, SUM(CESS_AMT) AS CESS_AMT "
+ " FROM GST_DATA_DET WHERE TRAN_ID = ? GROUP BY GST_RATE ";
detPstmt = conn.prepareStatement(detSql);
......@@ -5563,6 +5565,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
while(detRs.next())
{
gstRate = Double.parseDouble(String.format("%.2f",detRs.getDouble("GST_RATE")));
taxableAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("TAXABLE_AMT")));
igstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("IGST_AMT")));
cgstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("CGST_AMT")));
sgstAmt = Double.parseDouble(String.format("%.2f",detRs.getDouble("SGST_AMT")));
......@@ -5588,13 +5591,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
dataRow.createCell(8).setCellValue(""); //TODO need to check with devendra sir
dataRow.createCell(9).setCellValue(""); //TODO need to check with devendra sir
dataRow.createCell(10).setCellValue(amount);
dataRow.createCell(11).setCellValue(gstRate);
dataRow.createCell(12).setCellValue(igstAmt);
dataRow.createCell(13).setCellValue(cgstAmt);
dataRow.createCell(14).setCellValue(sgstAmt);
dataRow.createCell(15).setCellValue(cessAmt);
dataRow.createCell(16).setCellValue(totTaxAmt);
dataRow.createCell(17).setCellValue(portCode);
dataRow.createCell(11).setCellValue(taxableAmt);
dataRow.createCell(12).setCellValue(gstRate);
dataRow.createCell(13).setCellValue(igstAmt);
dataRow.createCell(14).setCellValue(cgstAmt);
dataRow.createCell(15).setCellValue(sgstAmt);
dataRow.createCell(16).setCellValue(cessAmt);
dataRow.createCell(17).setCellValue(totTaxAmt);
dataRow.createCell(18).setCellValue(portCode);
}
closeResources(detRs, detPstmt);
}
......
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