commited to add new changes of GSTR1 and GSTR2 data queries.

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

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

@@ -1930,7 +1930,7 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 /*changed 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 ";
+							 +" and item.item_code = it.item_code "
 							 
 							 /*changed by kaustubh on 19-07-2017*/
 							/* +" and t.tax_code = tx.tax_code "
@@ -1939,10 +1939,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 							 +" and tx.tran_id = i.invoice_id ";*/
 						
 							 /*changed by kaustubh on 21-07-2017*/ 
-						 /*+"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')" ;
+							 +"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 ";
@@ -1953,14 +1953,13 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								//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";
 							 }
-							 if(taxClassAllStr.length() > 0)
+							/* if(taxClassAllStr.length() > 0)
 						  	 {
 								 dtlSql = dtlSql +" and tx.tax_class not in ("+taxClassAllStr+") ";
 								 
 						  	 }
-							 dtlSql = dtlSql 
-									 
-									 
+						  	 */
+							 dtlSql = dtlSql 									 
 						     +" and i.invoice_id = ?  ";
 							 
 							 /*changed by kaustubh on 19-07-2017 only unit*/
@@ -2165,10 +2164,10 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 								//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";
 							 }
-							 if(taxClassAllStr.length() > 0)
+							/* if(taxClassAllStr.length() > 0)
 						  	 {
 								 dtlSql = dtlSql +" and tx.tax_class not in ("+taxClassAllStr+") ";
-						  	 }
+						  	 }*/
 							 dtlSql = dtlSql
 							 
 							 +" and i.tran_id = ? ";
@@ -13577,7 +13576,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
 					/*changed by kaustubh on 25 july 2017*/
 					/*pstmtInsHdr.setString(5,prdCodeGstHdr);*/
 					pstmtInsHdr.setString(5,prdCodenew);
-					pstmtInsHdr.setString(6,"1");	
+				//	pstmtInsHdr.setString(6,"1");	                  changed by kaustubh on 23 aug 2017
+					pstmtInsHdr.setString(6,recType);
 					pstmtInsHdr.setString(7,gstType);	
 					pstmtInsHdr.setString(8,tranType);
 					pstmtInsHdr.setString(9,custCode);