收款反冲调整07

src/main/webapp/WEB-INF/classes/csh/CSH1300/csh_transaction_miantain_query.lwm

@@ -106,7 +106,6 @@
         <bm:pk-field name="transaction_id"/>
     </bm:primary-key>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(t1.recoi_status not in('APPROVED'))"/>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.collection_classes = &apos;REFUND&apos;)"/>
         <bm:data-filter name="query" expression="(t1.ref_contract_id is  null)"/>
@@ -115,6 +114,7 @@
         <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
         <bm:data-filter name="query" expression="(t1.returned_flag = 'NOT')"/>
         <bm:data-filter name="query" expression="(t1.source_csh_trx_id is null)"/>
+        <bm:data-filter name="query" expression="(t1.recoi_status is null OR t1.recoi_status!='APPROVED')"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm

@@ -106,13 +106,13 @@
         <bm:pk-field name="transaction_id"/>
     </bm:primary-key>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(t1.recoi_status not in('APPROVED'))"/>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
         <bm:data-filter name="query" expression="(t1.ref_contract_id is  null)"/>
         <bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
         <bm:data-filter name="query" expression="(t1.confirmed_flag not  in('ACCAUDITING','NEW','CT_REJECTED'))"/>
         <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
+        <bm:data-filter name="query" expression="(t1.recoi_status is null OR t1.recoi_status!='APPROVED')"/>
     </bm:data-filters>
     <bm:query-fields>
         <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>