commit changes regarding RCM query of GSTR 1

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

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

@@ -1282,8 +1282,18 @@ 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 2017
-						  		+" and i.tran_date between ? and ? " 
-						  		+" AND '01-JUL-2017' > (Select Tran_date from porcp where tran_id =i.TRAN_ID__REF) "
+						  		+" and i.tran_date between ? and ? "; 
+						  		if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))      
+								 {
+									hdrSql = hdrSql +" AND '2017-07-01 00:00:00' ";
+								 }
+								 else
+								 {	
+									 hdrSql = hdrSql +" AND '01-JUL-2017'";
+								 }
+								hdrSql=hdrSql
+						  		
+						  		+" > (Select Tran_date from porcp where tran_id =i.TRAN_ID__REF) "
 								+" and (select count(1) from gst_data_hdr where ref_ser = 'P-RET' and ref_id = i.tran_id ) = 0 ";
 						
 						/**
@@ -1527,10 +1537,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								+" '' as TRAN_ID__REF,"
 								+" ddf_get_siteregno(s.site_code,'OPTNG_SITE') AS SITE_CODE ,"
 								+ " i.tran_date as PRD_CODE,"
-								+" '1' as REC_TYPE,"// -- GSTR1,GSTR2,etc.
-								+" 'R' as GST_TYPE,"
-								+" '02' as TRAN_TYPE,"// -- b2b,b2c
-								//+" i.sundry_code as CUST_CODE,"
+							//	+" '1' as REC_TYPE,"// -- GSTR1,GSTR2,etc.     Changed on 25 April 2018  as per discuss with devendra sir for client pitambari
+								+" '2' as REC_TYPE,"
+							    +" 'R' as GST_TYPE,"
+							//	+" '02' as TRAN_TYPE,"// -- b2b,b2c            Changed on 25 April 2018  as per discuss with devendra sir for client pitambari
+							    +" '05' as TRAN_TYPE,"
+							//+" i.sundry_code as CUST_CODE,"
 								+"C.SUPP_CODE as CUST_CODE,"
 								+" Case When c.tax_reg_2='UNREGISTER' then i.remarks ELSE c.supp_name END AS CUST_NAME, "
 								//+" c.supp_name as CUST_NAME,"								
@@ -1587,7 +1599,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								 +" 'A' as STATUS," // -- M – Modification, A – Accept D – Delete
 								 +" 0 as SR_NO__OLD,"
 								 +" CASE WHEN it.item_code IS NULL THEN 'S' ELSE 'G' END AS LINE_TYPE, "
-								 +" CASE WHEN it.item_code IS NULL THEN 'S' ELSE 'G' END AS LINE_TYPE,"
+								// +" CASE WHEN it.item_code IS NULL THEN 'S' ELSE 'G' END AS LINE_TYPE,"
 						         +" (select CASE "
 						         +" WHEN (NVL(pd.anal_code,'X')<>'X') "
 						         +" THEN (select SH_DESCR from ANALYSIS where ANALYSIS.ANAL_CODE=pd.anal_code) "