changes in exemp query of offline download sheet

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

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

@@ -4055,10 +4055,21 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					XSSFSheet nilDataSheet = retDataWorkbook.getSheet("exemp");
 					
-					sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               START   */
+					
+					/*sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
 						+ " WHERE REC_TYPE = '1' AND TRAN_TYPE  in (?,?,?) AND SITE_CODE = ? AND PRD_CODE = ?"
-						+ " GROUP BY TRAN_TYPE";
-						
+						+ " GROUP BY TRAN_TYPE";*/
+					
+					  sql =   "SELECT H.tran_type,SUM(d.TAXABLE_AMT) AS AMOUNT " 
+					  		+ "FROM GST_DATA_DET d,GST_DATA_HDR H " 
+					  		+ "WHERE d.tran_id  =h.tran_id " 
+					  		+ "AND H.Tran_Type IN (?,?,?) AND H.Site_Code  = ? " 
+					  		+ "AND H.Rec_Type ='1' AND H.Prd_Code   = ? " 
+					  		+ "GROUP BY H.TRAN_TYPE" ;
+
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               END    */
+					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "15");
 					pstmt.setString(2, "16");
@@ -4092,11 +4103,23 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					nilInterRegDataRow.createCell(3).setCellValue(nonGSTAmount);
 					
 					nilAmount = 0.0; exemtAmount = 0.0; nonGSTAmount = 0.0;
+						
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               START   */
 					
-					sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
+					/*sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
 						+ " WHERE REC_TYPE = '1' AND TRAN_TYPE  in (?,?,?) AND SITE_CODE = ? AND PRD_CODE = ?"
-						+ " GROUP BY TRAN_TYPE";
-						
+						+ " GROUP BY TRAN_TYPE";*/
+					
+					  sql =   "SELECT H.tran_type,SUM(d.TAXABLE_AMT) AS AMOUNT " 
+					  		+ "FROM GST_DATA_DET d,GST_DATA_HDR H " 
+					  		+ "WHERE d.tran_id  =h.tran_id " 
+					  		+ "AND H.Tran_Type IN (?,?,?) AND H.Site_Code  = ? " 
+					  		+ "AND H.Rec_Type ='1' AND H.Prd_Code   = ? " 
+					  		+ "GROUP BY H.TRAN_TYPE" ;
+
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               END    */
+					
+					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "18");
 					pstmt.setString(2, "19");
@@ -4131,10 +4154,21 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					nilAmount = 0.0; exemtAmount = 0.0; nonGSTAmount = 0.0;
 					
-					sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               START   */
+					
+					/*sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
 						+ " WHERE REC_TYPE = '1' AND TRAN_TYPE  in (?,?,?) AND SITE_CODE = ? AND PRD_CODE = ?"
-						+ " GROUP BY TRAN_TYPE";
-						
+						+ " GROUP BY TRAN_TYPE";*/
+					
+					  sql =   "SELECT H.tran_type,SUM(d.TAXABLE_AMT) AS AMOUNT " 
+					  		+ "FROM GST_DATA_DET d,GST_DATA_HDR H " 
+					  		+ "WHERE d.tran_id  =h.tran_id " 
+					  		+ "AND H.Tran_Type IN (?,?,?) AND H.Site_Code  = ? " 
+					  		+ "AND H.Rec_Type ='1' AND H.Prd_Code   = ? " 
+					  		+ "GROUP BY H.TRAN_TYPE" ;
+
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               END    */
+					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "21");
 					pstmt.setString(2, "22");
@@ -4169,10 +4203,21 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
 					
 					nilAmount = 0.0; exemtAmount = 0.0; nonGSTAmount = 0.0;
 					
-					sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               START   */
+					
+					/*sql = " SELECT TRAN_TYPE,SUM(AMOUNT) AS AMOUNT FROM GST_DATA_HDR "
 						+ " WHERE REC_TYPE = '1' AND TRAN_TYPE  in (?,?,?) AND SITE_CODE = ? AND PRD_CODE = ?"
-						+ " GROUP BY TRAN_TYPE";
-						
+						+ " GROUP BY TRAN_TYPE";*/
+					
+					  sql =   "SELECT H.tran_type,SUM(d.TAXABLE_AMT) AS AMOUNT " 
+					  		+ "FROM GST_DATA_DET d,GST_DATA_HDR H " 
+					  		+ "WHERE d.tran_id  =h.tran_id " 
+					  		+ "AND H.Tran_Type IN (?,?,?) AND H.Site_Code  = ? " 
+					  		+ "AND H.Rec_Type ='1' AND H.Prd_Code   = ? " 
+					  		+ "GROUP BY H.TRAN_TYPE" ;
+
+					/* Changed By Kaustubh on 10 May 2018 get TAXABLE_AMT from detail table instead of Header table AMOUNT               END    */
+					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, "24");
 					pstmt.setString(2, "25");