Gimatex: Export bank receipt

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

webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java

@@ -423,7 +423,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 		double amtRevrsed = 0.0;
 		double amtRev = 0.0;
 		double badAmt = 0.0;
-		double totBc = 0.0;
+		double totBc = 0.0,taxAmt=0.0;
 		double chq = 0.0;
 		int i = 0;
 		int cnt = 0 ;
@@ -568,7 +568,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			sql = "select tran_id, tran_date, cust_code, tran_type, rcp_mode, bank_code, ref_no, ref_date, remarks, net_amt, curr_code," +
 					" exch_rate, net_amt__bc, fin_entity, acct_code__ar, cctr_code__ar, acct_code__bal, cctr_code__bal, site_code," +
 					" confirmed, adv_amt ,acct_code__cf, cctr_code__cf,eff_date, chq_amt,remarks, proj_code, entry_batch_no,bill_amt ," +
-					" diff_amt__exch, net_amt__bc,  anal_code, bill_disc_amt, oth_amt, efundadj_amt, acct_code__adv, cctr_code__adv ,tax_amt ,item_ser" +
+					" diff_amt__exch, net_amt__bc,  anal_code, bill_disc_amt, oth_amt, efundadj_amt, acct_code__adv, cctr_code__adv ,	 ,item_ser" +
 					" from  receipt  where tran_id = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
@@ -2065,14 +2065,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
 			//changes made-by-monika-30-may-2019
 			chq = ((double) Double.parseDouble( "" + RcpHdrMap.get("chq_amt")) );
 			//end
-
+			//addded by monika-27 july-2019
+			taxAmt=((double) Double.parseDouble( "" + RcpHdrMap.get("tax_amt")) );		
+			//end
 			// if EPC adjusted in same currency then
 			if(isEpcCurrSame == true)
 			{
 				chq = chq + ((double) Double.parseDouble( "" + RcpHdrMap.get("efundadj_amt"))) ;	
 			}
-			System.out.println("chq and  ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total) +"]");
-			if(Math.abs(chq - total) > 1)
+			//commented by  monika -27 july-2019
+			//System.out.println("chq and  ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total ) +"]");
+			//if(Math.abs(chq - total) > 1)
+			//changes  by monika-27 july-2019
+			System.out.println("chq and  ["+chq+"] total ["+total + "] diff [" + Math.abs(chq - total -taxAmt ) +"]");
+			if(Math.abs(chq - total - taxAmt) > 1)//end
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTRCPT8","","",conn);
 				conn.rollback();