unit column added in offline excel file

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

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

@@ -3459,11 +3459,6 @@ 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();
@@ -4299,6 +4294,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					}
 					closeResources(rs, pstmt);
 					
+					boolean isGSNullSheetAdded = false, isUnitNullSheetAdded = false, isPortNullSheetAdded = false;
+					XSSFSheet hsnBlnkDataSheet = null, unitBlnkDataSheet = null, portBlnkDataSheet = null;
+					int rowNo = 1;
+					
 					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 ";
 					
@@ -4333,7 +4332,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					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 = ? "
+					sql = " SELECT H.REF_ID, H.REF_SER, D.GS_CODE, D.TAXABLE_AMT, D.UNIT 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);
@@ -4347,15 +4346,16 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					{
 						if(!isUnitNullSheetAdded)
 						{
-							retDataWorkbook.createSheet("UOM BLANK");
+							retDataWorkbook.createSheet("UOM INVALID-BLANK");
 							isUnitNullSheetAdded = true;
 							
-							unitBlnkDataSheet = retDataWorkbook.getSheet("UOM BLANK");
+							unitBlnkDataSheet = retDataWorkbook.getSheet("UOM INVALID-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");
+							hdrRow.createCell(4).setCellValue("UNIT");
 						}
 						
 						XSSFRow dataRow = unitBlnkDataSheet.createRow(rowNo++);
@@ -4363,6 +4363,7 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 						dataRow.createCell(1).setCellValue(rs.getString("REF_SER"));
 						dataRow.createCell(2).setCellValue(rs.getString("GS_CODE"));
 						dataRow.createCell(3).setCellValue(rs.getString("TAXABLE_AMT"));
+						dataRow.createCell(4).setCellValue(rs.getString("UNIT"));
 					}
 					
 					closeResources(rs, pstmt);