Commit needful changes to avoid duplicate values in Offline download Sheet.

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

webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableData.java

@@ -43,7 +43,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 {
 	
 @Override
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag) throws RemoteException,ITMException
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String fromDateStr,String toDateStr, String forced_flag) throws RemoteException,ITMException
 	{
 	    System.out.println("Json for gst table data transfer called");
 		Document dom = null;
@@ -60,7 +60,7 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 			}
 			*/
 		     	System.out.println("TRAN id:"+tran_id+":");
-			  resString = getGstTableData(tran_id,xtraParams,sitecode, period, type,forced_flag);
+			  resString = getGstTableData(tran_id,xtraParams,sitecode, period, type,fromDateStr,toDateStr,forced_flag);
 			
 		}catch(Exception e)
 		{
@@ -73,13 +73,13 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 	}
 
  	//Changed by wasim on to overload getGstTableData with connection parameter [START]
- 	public String getGstTableData(String tran_id, String xtraParams ,String sitecode, String period, String type, String forced_flag) throws Exception
+ 	public String getGstTableData(String tran_id, String xtraParams ,String sitecode, String period, String type, String fromDateStr,String toDateStr, String forced_flag) throws Exception
 	{
  		String retString = "";
  		Connection conn = null;
  		try
  		{
- 			retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode,period,type, conn);
+ 			retString = getGstTableData(tran_id, xtraParams,forced_flag,sitecode,period,type,fromDateStr,toDateStr, conn);
  		}
  		catch(Exception e)
  		{
@@ -93,11 +93,11 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 	//Changed by wasim on to overload getGstTableData with connection parameter [END]
 	
  	//public String getGstTableData(String tran_id, String xtraParams , String forced_flag) throws RemoteException,ITMException
-	public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, String period, String type, Connection conn) throws RemoteException,ITMException
+	public String getGstTableData(String tran_id, String xtraParams , String forced_flag,String sitecode, String period, String type,String fromDateStr , String toDateStr, Connection conn) throws RemoteException,ITMException
 	{
 		System.out.println("Inside GetGstTableData");
 		System.out.println("Newsitecode::"+sitecode);
-		System.out.println("New period::"+period);
+		System.out.println("New period::"+period+"from["+fromDateStr+"]"+"toDateStr["+toDateStr+"]");
 		System.out.println("New type::"+type);
 		
 		String s=period;  
@@ -445,8 +445,19 @@ public class GetGstTableData extends ActionHandlerEJB implements GetGstTableData
 		            ObjectMapper objectMapper = new ObjectMapper();
 					String json = objectMapper.writeValueAsString(gstHrdDetData); 				
 					JSONObject gstr1HeaderObj = new JSONObject();
+					
+					JSONObject gstr1SupportObj = new JSONObject();
+					gstr1SupportObj.put("fromDate", fromDateStr);
+					gstr1SupportObj.put("toDate", toDateStr);
+					gstr1SupportObj.put("type", type);
+					gstr1SupportObj.put("sitecode", sitecode);
+					
 					gstr1HeaderObj.put("data", json);
+					gstr1HeaderObj.put("suppParam",gstr1SupportObj);
+					
+					
 					
+					System.out.println("json values in getGSTValue"+gstr1HeaderObj.toString());
 					
 					RequestBodyEntity request = Unirest.post(String.format("%s", GST_TABLE_URL))
 							                  // .setTimeouts(connectionTimeout,socketTimeout)

webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableDataLocal.java

@@ -11,7 +11,7 @@ import javax.ejb.Local;
 public interface GetGstTableDataLocal extends ActionHandlerLocal{
 
 
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String forced_flag)throws RemoteException,ITMException;
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String type, String fromdate,String todate,String forced_flag)throws RemoteException,ITMException;
 }
 	
 

webitm-gst-client/ibase/webitm/ejb/gstclient/GetGstTableDataRemote.java

@@ -14,7 +14,7 @@ public interface GetGstTableDataRemote extends ActionHandlerRemote {
 
 	
 
-	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String synctype , String forced_flag) throws RemoteException,ITMException;
+	public String actionHandler(String tran_id , String xtraParams ,String sitecode ,String period, String synctype ,String fromdate, String todate, String forced_flag) throws RemoteException,ITMException;
 }
 
 

webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java

@@ -548,6 +548,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						    //  +" sysdate as ADD_DATE, "  commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							 // +" sysdate CHG_DATE, "  commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -796,6 +797,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						//	+" sysdate ADD_DATE,"             commented by kaustubh 27 july 2017
 							+" '' ADD_TERM,"
 							+" ' ' CHG_USER,"
+							+" i.TRAN_DATE as CHG_DATE, "
 						//	+" sysdate CHG_DATE,"             commented by kaustubh 27 july 2017
 							+" ' 'CHG_TERM,"
 							+" ddf_get_siteregno(i.site_code__dlv,'GSTIN_NO') as TAX_REG_NO,"
@@ -1040,6 +1042,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							//	+" sysdate ADD_DATE,"    commented by kaustubh 27 july 2017
 								+" '' ADD_TERM,"
 								+" ' ' CHG_USER,"
+								+" i.TRAN_DATE as CHG_DATE, "
 							//	+" sysdate CHG_DATE,"   commented by kaustubh 27 july 2017
 								+" ' 'CHG_TERM,"
 								+"  c.tax_reg_2 as TAX_REG_NO,"
@@ -1254,6 +1257,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								+" '' ADD_USER,"
 								+" '' ADD_TERM,"
 								+" ' ' CHG_USER,"
+								+" i.TRAN_DATE as CHG_DATE, "
 								+" ' 'CHG_TERM,"
 								+"  c.tax_reg_2 as TAX_REG_NO,"
 								+" ' '  as RECO_STATUS,"
@@ -1729,6 +1733,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -1910,6 +1915,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							//	+" sysdate ADD_DATE,"       commented by kaustubh 27 july 2017
 								+" '' ADD_TERM,"
 								+" ' ' CHG_USER,"
+								+" i.TRAN_DATE as CHG_DATE, "
 							//	+" sysdate CHG_DATE,"          commented by kaustubh 27 july 2017
 								+" ' 'CHG_TERM,"
 								+"  c.tax_reg_2 as TAX_REG_NO,"
@@ -2145,6 +2151,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							//	+" sysdate ADD_DATE,"    commented by kaustubh 27 july 2017
 								+" '' ADD_TERM,"
 								+" ' ' CHG_USER,"
+								+" i.TRAN_DATE as CHG_DATE, "
 						//		+" sysdate CHG_DATE,"     commented by kaustubh 27 july 2017
 								+" ' 'CHG_TERM,"
 								+"  c.tax_reg_2 as TAX_REG_NO,"
@@ -2349,6 +2356,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							+" '' ADD_TERM,"
 							+" ' ' CHG_USER,"
 							+" ' 'CHG_TERM,"
+							+" i.TRAN_DATE as CHG_DATE, "
 							+"  c.tax_reg_2 as TAX_REG_NO,"
 							+" ' '  as RECO_STATUS,"
 						//	+" ' ' as ECOM_REG_NO,"
@@ -2539,6 +2547,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 //     +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 							//	  +" sysdate CHG_DATE, "          commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -2772,6 +2781,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							     // +" sysdate as ADD_DATE, "   commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								 // +" sysdate CHG_DATE, "        commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -3002,9 +3012,11 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" ' ' as SUBMIT_STATUS, "
 								//  +" null SUBMIT_DATE, "          commented by kaustubh 27 july 2017
 								  +" '' ADD_USER, "
+								  
 							     // +" sysdate as ADD_DATE, "       commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								 // +" sysdate CHG_DATE, "         commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -3234,6 +3246,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "           commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "               commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -3458,6 +3471,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							   //   +" sysdate as ADD_DATE, "      commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -3678,6 +3692,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						    //  +" sysdate as ADD_DATE, "      commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							 // +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -3876,6 +3891,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" '' ADD_USER, "
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
 							  +" ' '  as RECO_STATUS, "
@@ -4059,6 +4075,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "    commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								 // +" sysdate CHG_DATE, "      commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -4258,6 +4275,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" '' ADD_USER, "
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
 								  +" ' '  as RECO_STATUS, "
@@ -4389,24 +4407,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						 * 8A(1) NIL Header NIL Inter-State nil rated supplies to registered  *	
 						 */
 						  hdrSql = " select '' as  TRAN_ID, "
-								  /* modified by kaustubh*/
-								 /* +" to_date(i.GP_DATE) as TRAN_DATE, "*/
-								  /*+" to_date(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end) as TRAN_DATE, "    commented by kaustubh on 25 july 2017*/
 								  +" '' as TRAN_ID__REF, "
-								//  +" case when s.SITE_CODE__EXC is null then s.site_code else s.SITE_CODE__EXC end as SITE_CODE, "
-								//    +" ddf_get_siteregno(s.site_code,'OPRTNG_SITE') AS SITE_CODE ,"
-								   +" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
+								  +" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
 								  + " i.tran_date as PRD_CODE,"
-								  /*+" to_char(i.GP_DATE,'MMYYYY') as PRD_CODE, "*/
-								/*  if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))       commented by kaustubh on 25 july
-				                    {
-				        	          hdrSql = hdrSql +" cast(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE, ";
-				                    }
-				                    else
-				                    {	
-					                hdrSql = hdrSql +"to_char(case when i.GP_DATE is null then i.tran_date else i.GP_DATE end,'MMYYYY') as PRD_CODE,";
-				                    }
-								  hdrSql=hdrSql*/
 								  +" '1' as REC_TYPE, " 
 								  +" 'L' as GST_TYPE,"
 								  +" '15' as TRAN_TYPE," 
@@ -4416,12 +4419,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" '' as SUBMISSION_TYPE," 
 								  +" '' as  DOC_CHECKSUM,"
 								  +" 'NRATD' as DOC_TYPE, " 
-								  /* modified by kaustubh*/
-								/*  +" i.GP_NO as DOC_NO, "*/
-								 // +"case when i.GP_NO is null then i.invoice_id else i.GP_NO end as DOC_NO, "
 								  +" i.invoice_id as DOC_NO, "
-								 /* +" i.gp_date as DOC_DATE, "*/
-								//  +"case when i.gp_date is null then i.tran_date else i.gp_date end  as DOC_DATE,"
 							      +" i.tran_date as DOC_DATE,"
 								  +" i.net_amt as AMOUNT, "
 								  +" 'N' as REVERSE_CHRG, "
@@ -4442,6 +4440,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  //    +" sysdate as ADD_DATE, "            commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "         commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -4467,9 +4466,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  }*/
 								  hdrSql = hdrSql +" ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
-								 // +" and i.conf_date between ? and ? "  commented by kaustubh 27 july 2017
-								 +" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '15' ) = 0 ";
 						
 						/**
 						 * Detail NIL Inter-State nil rated supplies to registered 8A(1) NIL*	
@@ -4479,23 +4477,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    +" 'A' as STATUS, " 
 							    +" 0 as SR_NO__OLD, "
 							    +" 'G' as LINE_TYPE,";
-							    /*changed by kaustubh on 19-07-2017*/
-								/*+" si.hsn_no as GS_CODE, "
-								+" tx.TAXABLE_AMT as TAXABLE_AMT, "
-								+" case when t.tax_type = 'I'  then tx.tax_perc else 0  end as IGST_PERC,"
-							    +" (case when t.tax_type = 'I'  then tx.tax_amt else 0  end) as IGST_AMT,"
-							    +" case when t.tax_type = 'H'  then tx.tax_perc else 0  end as CGST_PERC,"
-							    +" (case when t.tax_type = 'H'  then tx.tax_amt else 0  end) as  CGST_AMT,"
-								+" case when t.tax_type = 'G'  then tx.tax_perc else 0  end as SGST_PERC,"
-							    +" (case when t.tax_type = 'G'  then tx.tax_amt else 0  end) as  SGST_AMT,"*/
-							    /*+ "fn_get_hsn_no(i.site_code,it.item_code) as GS_CODE,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, ' ', 'T') as TAXABLE_AMT,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'I', 'R') as IGST_PERC,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'I', 'A') as IGST_AMT,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'H', 'R') as CGST_PERC,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'H', 'A') as CGST_AMT,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'R') as SGST_PERC,"
-								   + "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
 							    
 							    if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 								 {
@@ -4523,20 +4504,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    dtlSql = dtlSql 	   
 							
 								   
-							//	+" item.sh_descr GS_DESCR,"   commented by kaustubh on 28 july 2017
-							// +" item.descr as  GS_DESCR," 
-							   +" ' ' as GS_DESCR, "
-								 /*changed by kaustubh on 19-07-2017*/
-								/*+" u.descr as UNIT,"*/
-								//+" item.UNIT as UNIT,"
-							  +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+							    +" ' ' as GS_DESCR, "
+
+							    +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
 							    +" (it.quantity__stduom) as QUANTITY,"
 								+" 'OE' as SUPPLY_TYPE," ;
-								 /*changed by kaustubh on 19-07-2017*/
-							    /*+" case when t.tax_type = 'J'  then tx.tax_perc else 0  end as CESS_PERC,"
-							    +" (case when t.tax_type = 'J'  then tx.tax_amt else 0  end) as CESS_AMT,"*/
-								/*+" fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
-								 +"fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,"*/
+	
 								 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 								 {
 									 dtlSql = dtlSql + "fn_gst_rate_amt(CAST('S-INV' AS VARCHAR(6)),i.invoice_id,CAST(it.line_no as char(3)), CAST('J' AS CHAR(1)), CAST('R' AS CHAR(1))) AS CESS_PERC,"
@@ -4544,8 +4517,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 		                         }
 								 else 
 								 {
-									 
-								 
 									 dtlSql = dtlSql     +"fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'R') as CESS_PERC,"
 							                             +"fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'J', 'A') as CESS_AMT,";
 		                        
@@ -4553,8 +4524,6 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								 dtlSql = dtlSql 
 						  
 								+" '' as REMARKS ,";
-								 /*changed by kaustubh on 19-07-2017*/
-								//+" fn_get_gst_rate('S-INV',i.invoice_id, it.line_no) as gst_rate "
 								 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))    
 								  {
 									dtlSql = dtlSql  +" fn_get_gst_rate('S-INV',i.invoice_id,CAST(it.line_no as char(3))) as gst_rate ";
@@ -4564,40 +4533,25 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									dtlSql = dtlSql  +" fn_get_gst_rate('S-INV',i.invoice_id, it.line_no) as gst_rate ";
 								  }
 								  dtlSql = dtlSql 
-								/*+" from invoice i,invoice_trace it,taxtran tx, siteitem si, tax t, item, uom u "*/
 								+" from invoice i,invoice_trace it,item "
 								+" where i.invoice_id = it.invoice_id "
-								/*commented by kaustubh on 19-07-2017*/
-								/*+" and si.site_code = i.site_code "
-								+" and si.item_code = it.item_code "*/
 								+" and item.item_code = it.item_code "
-								/*changed by kaustubh on 19-07-2017*/
-								/*+" and t.tax_code = tx.tax_code "
-								+" and t.tax_type in ('G','H','I','J') "
-								+" and tx.tran_code = 'S-INV' "
-								+" and tx.tran_id = i.invoice_id ";*/
-								
-								/*commented by kaustubh on 21-07-2017 /  3 aug */
 								+"and (select count(1) from taxtran ti, tax tx where tx.tax_code = ti.tax_code "
 							    +"and ti.tran_code = 'S-INV' "
 							    +"and ti.tran_id = i.invoice_id  " 
 							    +"and tx.tax_type in ('G','H','I','J')" ;
 								 if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
 								 {
-									//dtlSql = dtlSql +" and cast(tx.line_no as integer)  = it.line_no ";
 									dtlSql =dtlSql +" and cast(ti.line_no as integer) = it.line_no ) > 0";
 								 }
 								 else
 								 {	
-									//dtlSql = dtlSql +" and to_number(trim(tx.line_no)) = it.line_no ";
 									dtlSql =dtlSql +" and to_number(trim(ti.line_no)) = it.line_no ) > 0";
 								 }
 								 dtlSql = dtlSql 
 										 
 								+" and i.invoice_id = ? ";
-								 
-								/*+" and u.unit = item.unit ";*/
-								
+											
 						retString = executeSqlAndPopulateData(hdrSql,dtlSql,"8A(1) NIL");
 						
 						 /**
@@ -4657,6 +4611,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "            commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -4684,7 +4639,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								//  +" and i.conf_date between ? and ? " commented by kaustubh 27 july 2017
 								  +" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '16' ) = 0 ";
+
 	
 						/**
 						 * Detail NIL Inter-State nil rated supplies to registered 8A(2) NIL*	
@@ -4880,6 +4836,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						    //  +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							//  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -4907,8 +4864,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" and ti.tran_code = 'S-INV' and ti.tran_id = i.invoice_id and t.tax_type not in ('G','H','I','J')) > 0 "
 							  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							 // +" and i.conf_date between ? and ? " commented by kaustubh on 27 july
-							 +" and i.tran_date between ? and ? "
-					  		  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+							  +" and i.tran_date between ? and ? "
+							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '17' ) = 0 ";
+
 	
 						/**
 						 * Detail NIL Inter-State nil rated supplies to registered 8A(3) NIL*	
@@ -5095,6 +5053,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						//	+" sysdate ADD_DATE,"             commented by kaustubh 27 july 2017
 							+" '' ADD_TERM,"
 							+" ' ' CHG_USER,"
+							+" i.TRAN_DATE as CHG_DATE, "
 						//	+" sysdate CHG_DATE,"             commented by kaustubh 27 july 2017
 							+" ' 'CHG_TERM,"
 							+" ddf_get_siteregno(i.site_code__dlv,'GSTIN_NO') as TAX_REG_NO,"
@@ -5128,7 +5087,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  		+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							/*+" and i.conf_date between ? and ? " modified by kaustubh on 27 july */
 					  		+" and i.tran_date between ? and ? "
-					  		+" and (select count(1) from gst_data_hdr where ref_ser = 'D-ISS' and ref_id = i.tran_id ) = 0 ";
+					  		+" and (select count(1) from gst_data_hdr where ref_ser = 'D-ISS' and ref_id = i.tran_id and tran_type='18') = 0 ";
+					  		
 				   
 				   /**
 					*  Detail DistOrd Issue 8(B) Nill rated ditribution issue (8B DIS)*	
@@ -5307,6 +5267,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -5332,8 +5293,9 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  hdrSql = hdrSql +" ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								 // +" and i.conf_date between ? and ? "    commented by kaustubh on 27 july
-								 +" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '18' ) = 0 ";
+								  
 						  
 							/**
 							 * Detail Intra-state to registered suppliers 8B(1) NIL *	
@@ -5524,6 +5486,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  //    +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 							//	  +" sysdate CHG_DATE, "              commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -5550,8 +5513,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  hdrSql = hdrSql +" ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								 // +" and i.conf_date between ? and ? "    commetned by kaustubh on 27 july
-								 +" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '19' ) = 0 ";
 						 
 							/**
 							 * Detail Intra-state to registered suppliers 8B(2) NIL *	
@@ -5741,6 +5704,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  //    +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "               commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -5770,8 +5734,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" and ti.tran_code = 'S-INV' and ti.tran_id = i.invoice_id and t.tax_type not in ('G','H','I','J')) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								 // +" and i.conf_date between ? and ? "     commented by kaustubh 27 july
-								 +" and i.tran_date between ? and ? "
-						  		  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '20' ) = 0 ";
 						 
 							/**
 							 * Detail Intra-state to registered suppliers 8B(3) NIL *	
@@ -5962,6 +5926,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						    //  +" sysdate as ADD_DATE, "       commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							//  +" sysdate CHG_DATE, "          commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -5988,7 +5953,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							  //+" and i.conf_date between ? and ? " commented by kaustubh on 27 july
 							  +" and i.tran_date between ? and ? "
-							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '21' ) = 0 ";
 					  
 						/**
 						 * Detail Inter-state to unregistered suppliers 8C(1) NIL *	
@@ -6178,6 +6143,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						   //   +" sysdate as ADD_DATE, "                commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							//  +" sysdate CHG_DATE, "                   commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -6205,8 +6171,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							//  +" and i.conf_date between ? and ? "  commented by kaustubh on 27 july
 							  +" and i.tran_date between ? and ? "
-							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
-					  
+							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '22' ) = 0 ";
+							  
 					  	/**
 						  * Detail Inter-state to unregistered suppliers 8C(2) NIL *	
 						 */
@@ -6403,6 +6369,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  //    +" sysdate as ADD_DATE, "               commented by kaustubh 27 july 2017
 							  +" '' ADD_TERM, "
 						      +" ' ' CHG_USER, "
+						      +" i.TRAN_DATE as CHG_DATE, "
 							//  +" sysdate CHG_DATE, "                  commented by kaustubh 27 july 2017
 							  +" ' 'CHG_TERM, "
 							  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -6430,8 +6397,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  +" and ti.tran_code = 'S-INV' and ti.tran_id = i.invoice_id and t.tax_type not in ('G','H','I','J') ) > 0 "
 							  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 							 // +" and i.conf_date between ? and ? " commented by kaustubh on 27 july
-							 +" and i.tran_date between ? and ? "
-					  		  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+							  +" and i.tran_date between ? and ? "
+							  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '23' ) = 0 ";
 	
 					  	/**
 						  * Detail Inter-state to unregistered suppliers 8C(3) NIL *	
@@ -6624,6 +6591,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "         commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								 // +" sysdate CHG_DATE, "            commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -6649,8 +6617,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  hdrSql = hdrSql +" ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								//  +" and i.conf_date between ? and ? " copmmented by kaustubh on 27 july
-								+" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '24' ) = 0 ";
 						  
 							/**
 							 * Detail Intra-state to unregistered suppliers 8D(1) NIL *	
@@ -6840,6 +6808,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							  //    +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -6866,8 +6835,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  hdrSql = hdrSql +" ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								//  +" and i.conf_date between ? and ? " commented by kaustubh on 27 july 
-								+" and i.tran_date between ? and ? "
-								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+								  +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '25' ) = 0 ";
 						  
 						  	/**
 							  * Detail Intra-state to unregistered suppliers 8D(2) NIL *	
@@ -7064,6 +7033,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							    //  +" sysdate as ADD_DATE, "    commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, " 
+							      +" i.TRAN_DATE as CHG_DATE, "
 								 // +" sysdate CHG_DATE, "       commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -7092,8 +7062,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  +" and ti.tran_code = 'S-INV' and ti.tran_id = i.invoice_id and t.tax_type not in ('G','H','I','J') ) > 0 "
 								  +" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 								//  +" and i.conf_date between ? and ? "  commented by kaustubh on 27 july
-							    	+" and i.tran_date between ? and ? "
-						  		  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id ) = 0 ";
+							      +" and i.tran_date between ? and ? "
+								  +" and (select count(1) from gst_data_hdr where ref_ser = 'S-INV' and ref_id = i.invoice_id and TRAN_TYPE= '26' ) = 0 ";
 	
 						  	/**
 							  * Detail Intra-state to unregistered suppliers 8D(3) NIL *	
@@ -7286,6 +7256,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							     // +" sysdate as ADD_DATE, "        commented by kaustubh 27 july 2017
 								  +" '' ADD_TERM, "
 							      +" ' ' CHG_USER, "
+							      +" i.TRAN_DATE as CHG_DATE, "
 								//  +" sysdate CHG_DATE, "        commented by kaustubh 27 july 2017
 								  +" ' 'CHG_TERM, "
 								  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -7466,7 +7437,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			hdrSql =  "select "
 					  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 					  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 					  +"from  "
 					  +"(SELECT ''                                     AS TRAN_ID, "
 					  +"''                                          as TRAN_ID__REF,"
@@ -7506,6 +7477,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +"'' ADD_USER,"
 					  +"'' ADD_TERM,"
 					  +"' ' CHG_USER,"
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +"' 'CHG_TERM,"
 					  +"c.tax_reg_2 AS TAX_REG_NO,"
 					  +"' '         AS RECO_STATUS,"
@@ -7528,7 +7500,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			 		  +" group by "
 			 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 			    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 			
 		 
 		/**
@@ -7642,7 +7614,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			hdrSql =  "select "
 					  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 					  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 					  +"from  "
 					  +"(SELECT ''                                     AS TRAN_ID, "
 					  +"''                                          as TRAN_ID__REF,"
@@ -7682,6 +7654,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +"'' ADD_USER,"
 					  +"'' ADD_TERM,"
 					  +"' ' CHG_USER,"
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +"' 'CHG_TERM,"
 					  +"c.tax_reg_2 AS TAX_REG_NO,"
 					  +"' '         AS RECO_STATUS,"
@@ -7704,7 +7677,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			 		  +" group by "
 			 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 			    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 			
 		 
 		/**
@@ -7814,7 +7787,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			hdrSql =  "select "
 					  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 					  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 					  +"from  "
 					  +"(SELECT ''                                     AS TRAN_ID, "
 					  +"''                                          as TRAN_ID__REF,"
@@ -7854,6 +7827,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +"'' ADD_USER,"
 					  +"'' ADD_TERM,"
 					  +"' ' CHG_USER,"
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +"' 'CHG_TERM,"
 					  +"c.tax_reg_2 AS TAX_REG_NO,"
 					  +"' '         AS RECO_STATUS,"
@@ -7876,7 +7850,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			 		  +" group by "
 			 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 			    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 			
 		 
 		/**
@@ -7984,7 +7958,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			hdrSql =  "select "
 					  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 					  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+					  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 					  +"from  "
 					  +"(SELECT ''                                     AS TRAN_ID, "
 					  +"''                                          as TRAN_ID__REF,"
@@ -8024,6 +7998,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +"'' ADD_USER,"
 					  +"'' ADD_TERM,"
 					  +"' ' CHG_USER,"
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +"' 'CHG_TERM,"
 					  +"c.tax_reg_2 AS TAX_REG_NO,"
 					  +"' '         AS RECO_STATUS,"
@@ -8046,7 +8021,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 			 		  +" group by "
 			 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 			    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+			          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 			
 		 
 		/**
@@ -8183,6 +8158,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -8322,6 +8298,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -8462,6 +8439,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -8602,6 +8580,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -8745,6 +8724,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -8878,6 +8858,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9011,6 +8992,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9143,6 +9125,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9278,6 +9261,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9410,6 +9394,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9542,6 +9527,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9674,6 +9660,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						  +" '' ADD_USER, "
 						  +" '' ADD_TERM, "
 					      +" ' ' CHG_USER, "
+					      +" i.TRAN_DATE as CHG_DATE, "
 						  +" ' 'CHG_TERM, "
 						  +" c.tax_reg_2 as TAX_REG_NO, "
 						  +" ' '  as RECO_STATUS, "
@@ -9812,6 +9799,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -9945,6 +9933,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -10077,6 +10066,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -10208,6 +10198,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" i.TRAN_ID as  REF_ID, "
 					  +" ' ' as SUBMIT_STATUS, "
 					  +" '' ADD_USER, "
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
 					  +" ' 'CHG_TERM, "
@@ -10345,6 +10336,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -10475,6 +10467,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" i.TRAN_ID as  REF_ID, "
 					  +" ' ' as SUBMIT_STATUS, "
 					  +" '' ADD_USER, "
+					  +" i.TRAN_DATE as CHG_DATE, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
 					  +" ' 'CHG_TERM, "
@@ -10608,6 +10601,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -10741,6 +10735,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					  +" '' ADD_USER, "
 					  +" '' ADD_TERM, "
 				      +" ' ' CHG_USER, "
+				      +" i.TRAN_DATE as CHG_DATE, "
 					  +" ' 'CHG_TERM, "
 					  +" c.tax_reg_2 as TAX_REG_NO, "
 					  +" ' '  as RECO_STATUS, "
@@ -10917,6 +10912,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									    //  +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 										  +" '' ADD_TERM, "
 									      +" ' ' CHG_USER, "
+									      +" i.TRAN_DATE as CHG_DATE, "
 									//	  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 										  +" ' 'CHG_TERM, "
 										  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -11158,6 +11154,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +" ' ' as SUBMIT_STATUS, "
 								//	  +" null SUBMIT_DATE, "                   commented by kaustubh 27 july 2017
 									  +" '' ADD_USER, "
+									  +" i.TRAN_DATE as CHG_DATE, "
 								    //  +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
@@ -11487,6 +11484,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								    //  +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 								//	  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -11722,6 +11720,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								    //  +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 								//	  +" sysdate CHG_DATE, "             commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" c.tax_reg_2 as TAX_REG_NO, "
@@ -11904,7 +11903,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							hdrSql =  "select "
 									  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 									  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 									  +"from  "
 									  +"(SELECT ''                                     AS TRAN_ID, "
 									  +"''                                          as TRAN_ID__REF,"
@@ -11945,6 +11944,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +"'' ADD_USER,"
 									  +"'' ADD_TERM,"
 									  +"' ' CHG_USER,"
+									  +" i.TRAN_DATE as CHG_DATE, "
 									  +"' 'CHG_TERM,"
 									  +"c.tax_reg_2 AS TAX_REG_NO,"
 									  +"' '         AS RECO_STATUS,"
@@ -11966,7 +11966,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 		  +" group by "
 							 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 							    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 							
 						 
 						/**
@@ -12077,7 +12077,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							hdrSql =  "select "
 									  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 									  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 									  +"from  "
 									  +"(SELECT ''                                     AS TRAN_ID, "
 									  +"''                                          as TRAN_ID__REF,"
@@ -12118,6 +12118,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +"'' ADD_USER,"
 									  +"'' ADD_TERM,"
 									  +"' ' CHG_USER,"
+									  +" i.TRAN_DATE as CHG_DATE, "
 									  +"' 'CHG_TERM,"
 									  +"c.tax_reg_2 AS TAX_REG_NO,"
 									  +"' '         AS RECO_STATUS,"
@@ -12139,7 +12140,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 		  +" group by "
 							 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 							    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 							
 						 
 						/**
@@ -12252,7 +12253,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							hdrSql =  "select "
 									  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 									  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 									  +"from  "
 									  +"(SELECT ''                                     AS TRAN_ID, "
 									  +"''                                          as TRAN_ID__REF,"
@@ -12293,6 +12294,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +"'' ADD_USER,"
 									  +"'' ADD_TERM,"
 									  +"' ' CHG_USER,"
+									  +" i.TRAN_DATE as CHG_DATE, "
 									  +"' 'CHG_TERM,"
 									  +"c.tax_reg_2 AS TAX_REG_NO,"
 									  +"' '         AS RECO_STATUS,"
@@ -12314,7 +12316,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 		  +" group by "
 							 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 							    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 							
 						 
 						/**
@@ -12426,7 +12428,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							hdrSql =  "select "
 									  +"TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 									  +"DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT, "
-									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
+									  +"ORDER_NO,REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO, RECO_STATUS,ECOM_REG_NO,REF_SER "
 									  +"from  "
 									  +"(SELECT ''                                     AS TRAN_ID, "
 									  +"''                                          as TRAN_ID__REF,"
@@ -12467,6 +12469,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 									  +"'' ADD_USER,"
 									  +"'' ADD_TERM,"
 									  +"' ' CHG_USER,"
+									  +" i.TRAN_DATE as CHG_DATE, "
 									  +"' 'CHG_TERM,"
 									  +"c.tax_reg_2 AS TAX_REG_NO,"
 									  +"' '         AS RECO_STATUS,"
@@ -12488,7 +12491,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 		  +" group by "
 							 		  +" TRAN_ID,TRAN_ID__REF,SITE_CODE ,PRD_CODE ,REC_TYPE,GST_TYPE,TRAN_TYPE,CUST_CODE,CUST_NAME,GST_CODE,SUBMISSION_TYPE, "
 							    	  +" DOC_CHECKSUM,DOC_TYPE,DOC_NO,DOC_DATE,AMOUNT,REVERSE_CHRG,LR_NO,REAS_CODE,REF_ID__INV,REF_DATE__INV,PROV_ASSMNT,ORDER_NO, "
-							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
+							          +" REMARKS,REF_ID,SUBMIT_STATUS,ADD_USER,ADD_TERM,CHG_USER,CHG_DATE,CHG_TERM,TAX_REG_NO,RECO_STATUS,ECOM_REG_NO,REF_SER";
 							
 						 
 						/**
@@ -12651,6 +12654,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								  //    +" sysdate as ADD_DATE, "      commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 									//  +" sysdate CHG_DATE, "         commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" '' as TAX_REG_NO, "
@@ -12880,6 +12884,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								//      +" sysdate as ADD_DATE, "   commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 									//  +" sysdate CHG_DATE, "    commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" '' as TAX_REG_NO, "
@@ -13123,6 +13128,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								   //   +" sysdate as ADD_DATE, "          commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 								//	  +" sysdate CHG_DATE, "                  commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" '' as TAX_REG_NO, "
@@ -13388,6 +13394,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								   //   +" sysdate as ADD_DATE, "         commented by kaustubh 27 july 2017
 									  +" '' ADD_TERM, "
 								      +" ' ' CHG_USER, "
+								      +" i.TRAN_DATE as CHG_DATE, "
 									//  +" sysdate CHG_DATE, "            commented by kaustubh 27 july 2017
 									  +" ' 'CHG_TERM, "
 									  +" '' as TAX_REG_NO, "
@@ -13821,7 +13828,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 						
 					  GetGstTableData gstDataSinkObj = new GetGstTableData();
 					 // retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,connGST);
-					  retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,period,type,connGST);
+					 // retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,period,type,connGST);
+					  retString = gstDataSinkObj.getGstTableData("", xtraParams, "" ,sitecode,period,type,fromDateStr,toDateStr,connGST);
 
 					
 					System.out.println("Return String from GST_DATA_SYNC["+retString+"]");
@@ -34698,7 +34706,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 						/*+" and i.conf_date between ? and ? " modified by kaustubh on 27 july */
 						+" and i.tran_date between ? and ? "
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'D-RCP' and ref_id = i.tran_id ) = 0 ";
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'D-RCP' and ref_id = i.tran_id and TRAN_TYPE = '18' ) = 0 ";
 
 					/**
 					*  Detail DistOrd Receipt (Nill rated )*	
@@ -34892,7 +34900,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";      
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '22' ) = 0 "; 
 	
 				     
 				/**
@@ -35083,7 +35091,8 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";      
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '22' ) = 0 ";
+						
 	
 				     
 				/**
@@ -35278,7 +35287,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '23' ) = 0 ";
 	
 		/**
 		 * Detail intra-state to registered suppliers 7A(2) NEXE (REG)*	
@@ -35470,7 +35479,8 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '23' ) = 0 ";
+						
 	
 		/**
 		 * Detail intra-state to registered suppliers 7A(2) NEXE (REG)*	
@@ -35650,7 +35660,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  							
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '25' ) = 0 ";						
 	
 	
 		/**
@@ -35831,7 +35841,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  							
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '25' ) = 0 ";					
 	
 	
 		/**
@@ -36001,7 +36011,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						 	  hdrSql = hdrSql +" ) > 0 "
 						+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 						+"  and i.tran_date between ? and ? "
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  											
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '24' ) = 0 ";										
 	
 				/**
 				 * Detail intra-state to registered suppliers 7A(4) NIL *	
@@ -36168,7 +36178,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						 	  hdrSql = hdrSql +" ) > 0 "
 						+" and case when i.confirmed is null then 'N' else i.confirmed end = 'Y' "
 						+"  and i.tran_date between ? and ? "
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 ";  											
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '24' ) = 0 "; 											
 	
 				/**
 				 * Detail intra-state to registered suppliers 7A(4) NIL *	
@@ -36347,7 +36357,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '18' ) = 0 ";
 	
 						
 		/**
@@ -36530,7 +36540,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 								hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 							}
 							hdrSql = hdrSql */
-							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '18' ) = 0 ";
 		
 							
 			/**
@@ -36712,7 +36722,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 								hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 							}
 							hdrSql = hdrSql */
-							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '19' ) = 0 ";
 		
 					/**
 					 * Detail COMP Inter-State COMP rated supplies to registered 7B(2) EXE*	
@@ -36887,7 +36897,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 								hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 							}
 							hdrSql = hdrSql */
-							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+							+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '19' ) = 0 ";
 		
 					/**
 					 * Detail COMP Inter-State COMP rated supplies to registered 7B(2) EXE*	
@@ -37063,7 +37073,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '21' ) = 0 ";
 	
 			/**
 			 * Detail COMP Inter-State COMP rated supplies to registered 7B(3) NIL*	
@@ -37238,7 +37248,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 							hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 						}
 						hdrSql = hdrSql */
-						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+						+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '21' ) = 0 ";
 	
 			/**
 			 * Detail COMP Inter-State COMP rated supplies to registered 7B(3) NIL*	
@@ -37415,7 +37425,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 					}
 					hdrSql = hdrSql */
-					+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+					+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '20' ) = 0 ";
 
 	/**
 	 * Detail COMP Inter-State COMP rated supplies to registered 7B(4) NON(REG)*	
@@ -37592,7 +37602,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 						hdrSql = hdrSql  +" and i.tran_date  <  '"+strDate+"' ";
 					}
 					hdrSql = hdrSql */
-					+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id ) = 0 "; 
+					+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RCP' and ref_id = i.tran_id and TRAN_TYPE= '20' ) = 0 "; 
 
 	/**
 	 * Detail COMP Inter-State COMP rated supplies to registered 7B(4) NON*	
@@ -38866,7 +38876,7 @@ dtlSql =         " select '' as  TRAN_ID, "
 		currDate = Timestamp.valueOf(genericUtility.getValidDateString(currDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
 		
 		
-		System.out.println("current Date"+currDate);
+		System.out.println("current2 Date"+currDate);
 		
 		int updCnt = 0;
 		int detCnts = 0,hdrCnts = 0,lineNo = 0;
@@ -38978,11 +38988,11 @@ dtlSql =         " select '' as  TRAN_ID, "
 					
 					
 					//Added by kaustubh on 4 April 2018 start
-					if("2".equalsIgnoreCase(recType))
-					{
+					//if("2".equalsIgnoreCase(recType))
+					//{
 					
 						chgDate = rsSelHdr.getTimestamp("CHG_DATE");
-					}
+					//}
 					//Added by kaustubh on 4 April 2018 end