Skip to content

B
business-java
Commit 331271e6 authored by kdabholkar's avatar kdabholkar
Browse files
Options

commit changes regarding custom offline sheet. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183661 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a5b26952
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 20 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 331271e6
......@@ -19,11 +19,9 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
......@@ -37,6 +35,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CreationHelper;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
......@@ -5840,9 +5839,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
/* 5. Values of exempt, Nil-rated and non-GST inward supplies
* (From a supplier under composition scheme, Exempt and Nil rated supply)*/
detSql = " select AMOUNT,tran_type from gst_data_hdr where PRD_CODE= ? and REC_TYPE= ? and SUBMIT_STATUS = 'P' and "
+" SITE_CODE= ? and tran_type in ('28','29','30','31') ";
/*detSql = " select AMOUNT,tran_type from gst_data_hdr where PRD_CODE= ? and REC_TYPE= ? and SUBMIT_STATUS = 'P' and "
+" SITE_CODE= ? and tran_type in ('28','29','30','31') ";*/
detSql = " select sum(AMOUNT) as amount ,tran_type from gst_data_hdr where PRD_CODE = ? and REC_TYPE = ? and SUBMIT_STATUS = 'P' and "
+ " SITE_CODE= ? and tran_type in ('28','29','30','31') group by TRAN_TYPE " ;
detPstmt = conn.prepareStatement(detSql);
detPstmt.setString(1, periodCode);
......@@ -5858,33 +5860,33 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if("28".equalsIgnoreCase(tranType))
{
amount1 =amount1 +amount;
//amount1 =amount1 +amount;
XSSFRow outWorkdTaxDataRow = dataSheetForGSTR3B.getRow(38);
outWorkdTaxDataRow.getCell(3).setCellValue(amount1);
outWorkdTaxDataRow.getCell(3).setCellValue(amount);
}
if("29".equalsIgnoreCase(tranType))
{
amount1 =amount1 +amount;
//amount1 =amount1 +amount;
XSSFRow outWorkdTaxDataRow = dataSheetForGSTR3B.getRow(39);
outWorkdTaxDataRow.getCell(3).setCellValue(amount1);
outWorkdTaxDataRow.getCell(3).setCellValue(amount);
}
if("30".equalsIgnoreCase(tranType))
{
amount1 =amount1 +amount;
//amount1 =amount1 +amount;
XSSFRow outWorkdTaxDataRow = dataSheetForGSTR3B.getRow(38);
outWorkdTaxDataRow.getCell(4).setCellValue(amount1);
outWorkdTaxDataRow.getCell(4).setCellValue(amount);
}
if("31".equalsIgnoreCase(tranType))
{
amount1 =amount1 +amount;
//amount1 =amount1 +amount;
XSSFRow outWorkdTaxDataRow = dataSheetForGSTR3B.getRow(39);
outWorkdTaxDataRow.getCell(4).setCellValue(amount1);
outWorkdTaxDataRow.getCell(4).setCellValue(amount);
}
......@@ -6119,6 +6121,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
}
}
//XSSFFormulaEvaluator.evaluateAllFormulaCells(retDataWorkbook);
//retDataWorkbook.setForceFormulaRecalculation(true);
}
......@@ -6189,7 +6196,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
String gstrWorkBookPath = "";
String sep = File.separator;
String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",tranDateStr="",errorCode = "", dataErrMsg = "", refInvId = "",
String tranId = "", ctin = "", posStateCode = "", docNo = "", docDateStr = "",chgDateStr="",errorCode = "", dataErrMsg = "", refInvId = "",
refInvDtStr = "", preGST = "", portCode = "", gstDateFormat = "", customerName = "", regUreg = "UNREGISTERED",
siteGSTStCode = "", isRCM = "", tranTypeStr = "", interIntraExp = "", suppGSTStCode = "", crdrType = "", refId="";
......@@ -6202,7 +6209,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
String sql = "", hdrSql = "", detSql = "";
Date refInvDate = null , docDate = null,trandate=null;
Date refInvDate = null , docDate = null,chgDate=null;
Connection conn = null;
PreparedStatement pstmt = null, hdrPstmt = null, detPstmt = null;
ResultSet rs = null, hdrRs = null, detRs = null;
......@@ -6396,7 +6403,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
closeResources(hdrRs, hdrPstmt);
hdrSql = " SELECT GDH.TRAN_ID,GDH.TRAN_DATE, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, CASE WHEN GDH.TRAN_TYPE='05' THEN 'YES' ELSE 'NO' END AS RCM, "
hdrSql = " SELECT GDH.TRAN_ID,GDH.CHG_DATE, GDH.DOC_NO, GDH.DOC_DATE, GDH.CUST_NAME, CASE WHEN GDH.TRAN_TYPE='05' THEN 'YES' ELSE 'NO' END AS RCM, "
+ " GEN.UDF_STR1, GDH.TAX_REG_NO, GDH.GST_CODE, GDH.AMOUNT, GDH.ORDER_NO, GDH.REF_ID FROM GST_DATA_HDR GDH, GENCODES GEN "
+ " WHERE GDH.REC_TYPE = ? AND GDH.PRD_CODE = ? AND GDH.SITE_CODE = ? AND GDH.SUBMIT_STATUS = ? "
+ " AND GDH.TRAN_TYPE NOT IN ('10','11','12','13') AND GEN.MOD_NAME='W_GSTR_PURC' AND GEN.FLD_NAME='TRAN_TYPE' "
......@@ -6425,16 +6432,16 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
amount = Double.parseDouble(String.format("%.2f",hdrRs.getDouble("AMOUNT")));
portCode = checkNull(hdrRs.getString("ORDER_NO"));
refId = checkNull(hdrRs.getString("REF_ID"));
trandate = hdrRs.getDate("TRAN_DATE");
chgDate = hdrRs.getDate("CHG_DATE");
if(docDate!=null)
{
docDateStr = gstDateFormatSdf.format(docDate);
}
if(trandate!=null)
if(chgDate!=null)
{
tranDateStr = gstDateFormatSdf.format(trandate);
chgDateStr = gstDateFormatSdf.format(chgDate);
}
if(ctin.trim().length() > 2)
......@@ -6487,9 +6494,9 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
/* Chnaged By Kaustubh on 4 April 2018 add value in blank tran_date column start */
//dataRow.createCell(1).setCellValue("");
XSSFCell tranDateCell = dataRow.createCell(1);
if(tranDateStr!=null && tranDateStr.trim().length()>0)
if(chgDateStr!=null && chgDateStr.trim().length()>0)
{
tranDateCell.setCellValue(gstDateFormatSdf.parse(tranDateStr));
tranDateCell.setCellValue(gstDateFormatSdf.parse(chgDateStr));
tranDateCell.setCellStyle(dateCellStyle);
}
/* Chnaged By Kaustubh on 4 April 2018 add value in blank tran_date column end */
......
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