RcvIbca Conf bug fix manual confirm

Pdc received and given added conditon to check (totAmt -adjAmt) > pdcAmt

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

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

@@ -134,7 +134,10 @@ public class PdcGivenAct extends ActionHandlerEJB implements PdcGivenActLocal,Pd
 				 + " AND SUNDRY_CODE = ? "
 				 //Commemted and added to show only the vouchers not the PDC by Varsha V on 18-03-19
 				 // + " AND TOT_AMT - ADJ_AMT <> 0"; 
-		         +" AND (TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) <> 0";		
+				 //Condition added by Kunal to check tot - adj amount is greater than pdc amt
+				 + " AND ABS(TOT_AMT - ADJ_AMT) > 0 "
+		         //+" AND (TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) <> 0";
+				 + " AND ABS(TOT_AMT - ADJ_AMT) > (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end)";
 			pstmt = conn.prepareStatement(sql);		
 			pstmt.setString(1, siteCode);
 			pstmt.setString(2, currCode);
@@ -182,7 +185,10 @@ public class PdcGivenAct extends ActionHandlerEJB implements PdcGivenActLocal,Pd
 				+ " AND SUNDRY_CODE = ? "
 				//Commemted and added to show only the vouchers not the PDC by Varsha V on 18-03-19
 				//+ " AND TOT_AMT - ADJ_AMT <> 0 "
-				+" AND (TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) <> 0 "
+				+ " AND ABS(TOT_AMT - ADJ_AMT) > 0 "
+				//+" AND (TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) <> 0 "
+				//Condition added by Kunal to check tot - adj amount is greater than pdc amt
+				+ " AND ABS(TOT_AMT - ADJ_AMT) > (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) "
 				+ " ORDER BY DUE_DATE";											
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, currCode);

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

@@ -132,7 +132,10 @@ public class PdcReceivedAct extends ActionHandlerEJB implements PdcReceivedActLo
 				 + " WHERE SITE_CODE = ?"
 				 + " AND CURR_CODE = ?"
 				 + " AND CUST_CODE = ?" 				 
-				 + " AND TOT_AMT - ADJ_AMT <> 0";			
+				 //+ " AND TOT_AMT - ADJ_AMT <> 0"
+				//Condition added by Kunal to check tot - adj amount is greater than pdc amt
+				 + " AND ABS(TOT_AMT - ADJ_AMT) > 0 "
+				 + " AND ABS(TOT_AMT - ADJ_AMT) > (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ";
 			pstmt = conn.prepareStatement(sql);		
 			pstmt.setString(1, siteCode);
 			pstmt.setString(2, currCode);
@@ -168,7 +171,10 @@ public class PdcReceivedAct extends ActionHandlerEJB implements PdcReceivedActLo
 					+ " WHERE CURR_CODE = ?"
 					+ " AND SITE_CODE = ?"
 					+ " AND CUST_CODE = ?"
-					+ " AND TOT_AMT - ADJ_AMT <> 0"
+					//+ " AND TOT_AMT - ADJ_AMT <> 0"
+					//Condition added by Kunal to check tot - adj amount is greater than pdc amt
+					+ " AND ABS(TOT_AMT - ADJ_AMT) > 0 "
+					+ " AND ABS(TOT_AMT - ADJ_AMT) > (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) "
 					+ " ORDER BY DUE_DATE";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, currCode);

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

@@ -51,10 +51,10 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
 		{
 			retString = confirm( tranID, xtraParams, forcedFlag , conn );
 
-			if ( retString != null && retString.length() > 0 )
+			/*if ( retString != null && retString.length() > 0 )
 			{
 				throw new Exception("Exception while calling RcvIbcaConf Confirm for tran  Id:["+tranID+"]");
-			}
+			}*/
 		}
 		catch(Exception ex)
 		{