Commit 2989a62e authored by steurwadkar's avatar steurwadkar

Changes made to add hsn blank, unit blank and port code blank in sheet

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177516 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ea6f658c
......@@ -3459,6 +3459,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
PreparedStatement pstmt = null, hdrPstmt = null, detPstmt = null;
ResultSet rs = null, hdrRs = null, detRs = null;
FinCommon finCommon = new FinCommon();
boolean isGSNullSheetAdded = false, isUnitNullSheetAdded = false, isPortNullSheetAdded = false;
XSSFSheet hsnBlnkDataSheet = null, unitBlnkDataSheet = null, portBlnkDataSheet = null;
int rowNo = 1;
try
{
conn = getConnection();
......@@ -4200,7 +4205,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
sql = " SELECT MIN(DOC_NO) FROM_NO, MAX(DOC_NO) TO_NO, COUNT(1) TOT_CNT"
+ " FROM GST_DATA_HDR WHERE SITE_CODE = ? AND PRD_CODE = ? AND REC_TYPE = ?"
+ " AND TRAN_TYPE IN ('01','03','04','05','11','12','13','14')";
+ " AND TRAN_TYPE IN ('01','03','04','05','11','12','13','14', '06', '07')";//Added by Santosh on 02/01/2018 to add export invoice count
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
......@@ -4293,6 +4298,108 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
}
}
closeResources(rs, pstmt);
sql = " SELECT H.REF_ID, H.REF_SER, D.TAXABLE_AMT FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID AND H.SITE_CODE = ? AND H.PRD_CODE = ? AND H.REC_TYPE = ? "
+ " AND D.GS_CODE IS NULL ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, periodCode);
pstmt.setString(3, "1");
rs = pstmt.executeQuery();
while(rs.next())
{
if(!isGSNullSheetAdded)
{
retDataWorkbook.createSheet("HSN BLANK");
isGSNullSheetAdded = true;
hsnBlnkDataSheet = retDataWorkbook.getSheet("HSN BLANK");
XSSFRow hdrRow = hsnBlnkDataSheet.createRow(0);
hdrRow.createCell(0).setCellValue("REF_ID");
hdrRow.createCell(1).setCellValue("REF_SER");
hdrRow.createCell(2).setCellValue("TAXABLE_AMT");
}
XSSFRow dataRow = hsnBlnkDataSheet.createRow(rowNo++);
dataRow.createCell(0).setCellValue(rs.getString("REF_ID"));
dataRow.createCell(1).setCellValue(rs.getString("REF_SER"));
dataRow.createCell(2).setCellValue(rs.getString("TAXABLE_AMT"));
}
closeResources(rs, pstmt);
rowNo = 1;
sql = " SELECT H.REF_ID, H.REF_SER, D.GS_CODE, D.TAXABLE_AMT FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID AND H.SITE_CODE = ? AND H.PRD_CODE = ? AND H.REC_TYPE = ? "
+ " AND D.UNIT NOT IN (SELECT DISTINCT UNIT FROM UOM) ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, periodCode);
pstmt.setString(3, "1");
rs = pstmt.executeQuery();
while(rs.next())
{
if(!isUnitNullSheetAdded)
{
retDataWorkbook.createSheet("UOM BLANK");
isUnitNullSheetAdded = true;
unitBlnkDataSheet = retDataWorkbook.getSheet("UOM BLANK");
XSSFRow hdrRow = unitBlnkDataSheet.createRow(0);
hdrRow.createCell(0).setCellValue("REF_ID");
hdrRow.createCell(1).setCellValue("REF_SER");
hdrRow.createCell(2).setCellValue("HSN/SAC");
hdrRow.createCell(3).setCellValue("TAXABLE_AMT");
}
XSSFRow dataRow = unitBlnkDataSheet.createRow(rowNo++);
dataRow.createCell(0).setCellValue(rs.getString("REF_ID"));
dataRow.createCell(1).setCellValue(rs.getString("REF_SER"));
dataRow.createCell(2).setCellValue(rs.getString("GS_CODE"));
dataRow.createCell(3).setCellValue(rs.getString("TAXABLE_AMT"));
}
closeResources(rs, pstmt);
rowNo = 1;
sql = " SELECT H.REF_ID, H.REF_SER, H.AMOUNT FROM GST_DATA_HDR H, GST_DATA_DET D WHERE H.TRAN_ID = D.TRAN_ID AND H.SITE_CODE = ? AND H.PRD_CODE = ? AND H.REC_TYPE = ? AND H.TRAN_TYPE IN ('06','07') "
+ " AND H.ORDER_NO IS NULL ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
pstmt.setString(2, periodCode);
pstmt.setString(3, "1");
rs = pstmt.executeQuery();
while(rs.next())
{
if(!isPortNullSheetAdded)
{
retDataWorkbook.createSheet("PORT CODE BLANK");
isPortNullSheetAdded = true;
portBlnkDataSheet = retDataWorkbook.getSheet("PORT CODE BLANK");
XSSFRow hdrRow = portBlnkDataSheet.createRow(0);
hdrRow.createCell(0).setCellValue("REF_ID");
hdrRow.createCell(1).setCellValue("REF_SER");
hdrRow.createCell(2).setCellValue("AMOUNT");
}
XSSFRow dataRow = portBlnkDataSheet.createRow(rowNo++);
dataRow.createCell(0).setCellValue(rs.getString("REF_ID"));
dataRow.createCell(1).setCellValue(rs.getString("REF_SER"));
dataRow.createCell(2).setCellValue(rs.getString("AMOUNT"));
}
closeResources(rs, pstmt);
}
else if("2".equalsIgnoreCase(recType))
{
......
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