PdcGivenAct.java - changes done to retrieve data without pdc transaction on voucher action

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

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

@@ -132,7 +132,9 @@ public class PdcGivenAct extends ActionHandlerEJB implements PdcGivenActLocal,Pd
 				 + " AND CURR_CODE = ? "
 				 + " AND SUNDRY_TYPE = ? " 
 				 + " AND SUNDRY_CODE = ? "
-				 + " AND TOT_AMT - ADJ_AMT <> 0";			
+				 //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";		
 			pstmt = conn.prepareStatement(sql);		
 			pstmt.setString(1, siteCode);
 			pstmt.setString(2, currCode);
@@ -178,7 +180,9 @@ public class PdcGivenAct extends ActionHandlerEJB implements PdcGivenActLocal,Pd
 				+ " AND SITE_CODE = ? "
 				+ " AND SUNDRY_TYPE = ? "
 				+ " AND SUNDRY_CODE = ? "
-				+ " AND TOT_AMT - ADJ_AMT <> 0 "
+				//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 "
 				+ " ORDER BY DUE_DATE";											
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, currCode);
@@ -292,8 +296,10 @@ public class PdcGivenAct extends ActionHandlerEJB implements PdcGivenActLocal,Pd
 					 +"REF_NO, "
 					 +"DUE_DATE, "
 					 +"CURR_CODE, "
-					 +"EXCH_RATE, "					 
-					 +"TOT_AMT - ADJ_AMT AS AMOUNT, "					 					
+					 +"EXCH_RATE, "		
+					 //Commemted and added to show only the vouchers not the PDC by Varsha V on 18-03-19			 
+					 //+"TOT_AMT - ADJ_AMT AS AMOUNT, "	
+					 +"(TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) as AMOUNT, "
 					 +"ACCT_CODE, "
 					 +"CCTR_CODE "
 					 +"FROM MISC_PAYABLES "