MiscPayAct.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@198164 ce508802-f39f-4f6c-b175-0d175dae99d5

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

@@ -178,9 +178,9 @@ public class MiscPayAct extends ActionHandlerEJB implements MiscPayActLocal,Misc
 		try
 		{
 			//Changes and Commented By Bhushan on 06-06-2016 :START
-//conn = connDriver.getConnectDB("DriverITM");
-conn = getConnection();
-//Changes and Commented By Bhushan on 06-06-2016 :END
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
+			//Changes and Commented By Bhushan on 06-06-2016 :END
 			paymentType=  genericUtility.getColumnValue("pay_type",dom);
 			tranID  =  genericUtility.getColumnValue("tran_id",dom);
 			//System.out.println("!!!!!!!!The transaction id is==="+tranID);
@@ -199,7 +199,9 @@ conn = getConnection();
 			sundryType = genericUtility.getColumnValue("sundry_type",dom);
 			sundryType1 = sundryType.charAt(0);
 
-			sql1="SELECT COUNT(*) AS ROWCNT FROM MISC_PAYABLES WHERE SITE_CODE = '"+ siteCode +"'" + " AND CURR_CODE = '"+currCode +"'" + " AND SUNDRY_TYPE = '"+ sundryType +"'"+"AND SUNDRY_CODE = '"+ sundryCode +"'"+" AND TOT_AMT - ADJ_AMT <> 0";
+			sql1="SELECT COUNT(*) AS ROWCNT FROM MISC_PAYABLES WHERE SITE_CODE = '"+ siteCode +"'" + " AND CURR_CODE = '"+currCode +"'" + " AND SUNDRY_TYPE = '"+ sundryType +"'"+"AND SUNDRY_CODE = '"+ sundryCode +"'"
+			//+" AND TOT_AMT - ADJ_AMT <> 0";//Commemted by Varsha V on 07-03-19
+			+" AND (TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ) <> 0";
 
 			System.out.println("sql1 :="+sql1);
 			//stmt = conn.createStatement(); //Pavan [closed expected opening cursor and pstmt].
@@ -328,7 +330,8 @@ conn = getConnection();
 					+"MISC_PAYABLES.CURR_CODE = '"+currCode+"' "
 					+"AND MISC_PAYABLES.SITE_CODE = '"+siteCode+"' "
 					+"AND MISC_PAYABLES.SUNDRY_TYPE = '"+sundryType+"' "
-					+"AND MISC_PAYABLES.TOT_AMT - MISC_PAYABLES.ADJ_AMT <> 0 ";
+					//+"AND MISC_PAYABLES.TOT_AMT - MISC_PAYABLES.ADJ_AMT <> 0 ";//Commemted by Varsha V on 07-03-19
+			        +"AND (MISC_PAYABLES.TOT_AMT - MISC_PAYABLES.ADJ_AMT - (case when MISC_PAYABLES.PDC_AMOUNT is null then 0 else MISC_PAYABLES.PDC_AMOUNT end) ) <> 0 ";
 			System.out.println("str1:="+str1);
 			System.out.println("sql3:="+sql3);
 			sql4 = sql3.concat(str1);
@@ -554,8 +557,10 @@ conn = getConnection();
 					 +"EXCH_RATE, "
 					 +"ACCT_CODE, "
 					 +"CCTR_CODE, "
-					 +"TOT_AMT - ADJ_AMT, "
-					 +"TOT_AMT - ADJ_AMT, "
+					// +"TOT_AMT - ADJ_AMT, "//commented by Varsha V on 07-03-19
+					// +"TOT_AMT - ADJ_AMT, "//commented by Varsha V on 07-03-19
+					 +"(TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ), "
+					 +"(TOT_AMT - ADJ_AMT - (case when PDC_AMOUNT is null then 0 else PDC_AMOUNT end) ), "
 					 +"TRAN_SER  "
 					 +"FROM MISC_PAYABLES "
 					 +"WHERE TRAN_ID = ?" ;		//'"+tranId+"' ";