adding new development for TAX_REG_2 blank or null sheet.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@181525 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java

@@ -4372,7 +4372,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					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') "
+					sql = " SELECT H.REF_ID, H.REF_SER, H.AMOUNT FROM GST_DATA_HDR H WHERE 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);
@@ -4403,6 +4403,47 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					}
 					
 					closeResources(rs, pstmt);
+					
+					
+					/* 
+					 * Added By Kaustubh to create sheets for TAX_REG_2 blank or null  on 5 march 2018   start 
+					 */
+					
+						
+					sql = " SELECT REF_ID, REF_SER, AMOUNT FROM GST_DATA_HDR  WHERE SITE_CODE = ? AND PRD_CODE = ? AND REC_TYPE = ? "
+							+" AND TRAN_TYPE IN ('01','02','03','04','05','29','30','31','32') " 
+							+" AND TAX_REG_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("TAX_REG_2 BLANK");
+								isPortNullSheetAdded = true;
+								
+								portBlnkDataSheet = retDataWorkbook.getSheet("TAX_REG_2 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);
+					
+					 /* Added By Kaustubh to create sheets for TAX_REG_2 blank or null  on 5 march 2018   End */ 
 				}
 				else if("2".equalsIgnoreCase(recType))
 				{
@@ -5227,7 +5268,47 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					closeResources(rs, pstmt);
 					
-					//END PriyankaC on 24JAN18.
+					//Changes by PriyankaC on 24JAN18 	END.
+					
+					
+					/* 
+					 * Added By Kaustubh to create sheets for TAX_REG_2 blank or null  on 5 march 2018   start 
+					 */
+						
+					sql = " SELECT REF_ID, REF_SER, AMOUNT FROM GST_DATA_HDR  WHERE SITE_CODE = ? AND PRD_CODE = ? AND REC_TYPE = ? "
+							+" AND TRAN_TYPE IN ('01','02','03','04','05','10','11','12','13') " 
+							+" AND TAX_REG_NO IS NULL";
+					
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, siteCode);
+						pstmt.setString(2, periodCode);
+						pstmt.setString(3, "2");
+						
+						rs = pstmt.executeQuery();
+						
+						while(rs.next())
+						{
+							if(!isPortNullSheetAdded)
+							{
+								retDataWorkbook.createSheet("TAX_REG_2 BLANK");
+								isPortNullSheetAdded = true;
+								
+								portBlnkDataSheet = retDataWorkbook.getSheet("TAX_REG_2 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);
+					
+					 /* Added By Kaustubh to create sheets for TAX_REG_2 blank or null  on 5 march 2018   End */ 
 					
 				}