commited latest changes of GST-Reconcilation

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

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

@@ -536,7 +536,8 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 							+ " (CASE WHEN RECO_STATUS IS NULL THEN 'A' ELSE RECO_STATUS END)  != 'M' ";*/
 						
 						sql = " SELECT DISTINCT TAX_REG_NO,DOC_NO FROM GST_DATA_HDR WHERE "
-							+ " PRD_CODE = ? AND SITE_CODE = ? AND REC_TYPE = '2' AND "
+							+ " PRD_CODE = ? AND SITE_CODE = ? AND REC_TYPE = '2' " 
+							+ " AND TRAN_TYPE IN ('01','02','03','04','05','10','11','12','13') AND "
 							+ " (CASE WHEN RECO_STATUS IS NULL THEN 'A' ELSE RECO_STATUS END)  != 'M' ";
 						
 						pstmt = conn.prepareStatement(sql);
@@ -639,7 +640,7 @@ public class GSTRecoWizEJB extends ValidatorEJB implements GSTRecoWizEJBLocal, G
 										 	/*changed by kaustubh on 28 sep 2017 */
 										 	sql = " SELECT PRD_CODE,CUST_CODE,ORDER_NO,CUST_NAME,REVERSE_CHRG,LR_NO,LR_DATE,ORDER_DATE,REAS_CODE,DOC_DATE,DOC_NO,ORDER_NO, "+
 												    " ECOM_REG_NO,AMOUNT,SITE_CODE,RECO_STATUS,GST_CODE,GST_TYPE FROM GST_DATA_HDR  "+
-												//    " WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','D') ";   COMMENTED BY KAUSTUBH ON 4 OCT
+												 //   " WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','D') ";   //COMMENTED BY KAUSTUBH ON 4 OCT
 												    " WHERE DOC_NO = ? AND REC_TYPE = '2' AND SUBMIT_STATUS IN ('P','A') ";
 										 	pstmt = conn.prepareStatement(sql);
 											pstmt.setString(1, invoiceID);