手工凭证11月调整

src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm

@@ -94,6 +94,48 @@
                 where ${/session/@user_id}=10418
                 and(t1.wfl_status in ('APPROVING', 'REJECT', 'APPROVED')
                    )
+               union
+                select t1.journal_header_id,
+                    t1.batch_id,
+                    t1.batch_number,
+                    t1.reverse_batch_number,
+                    t1.journal_submit_batch_id,
+                    t1.journal_num,
+                    t1.error_message,
+                    t1.total_amount_dr,
+                    t1.total_amount_cr,
+                    (select c.company_short_name
+                       from fnd_companies_vl c
+                      where c.company_id = t1.je_company_id) js_company_short_name,
+                    t1.period_name,
+                    to_char(t1.journal_date,'yyyy-mm-dd') journal_date,
+                    t1.currency_code,
+                    (SELECT gc.currency_name
+                       FROM gld_currency_v gc
+                      WHERE gc.currency_code = t1.currency_code) currency_desc,
+                    t1.total_amount_fuc_dr,
+                    (SELECT d.je_transaction_desc
+                       FROM gld_je_transaction d
+                      WHERE d.je_transaction_code = t1.je_transaction_code) je_transaction_desc,
+                    t1.description,
+                    (SELECT COUNT(1)
+                       FROM hls_journal_detail_imp t
+                      WHERE t.journal_header_id = t1.journal_header_id) je_detail_count,
+                    t1.wfl_status,
+                    (select v.code_value_name value_name
+                       from sys_code_values_v v
+                      where v.code = 'HLS536_WFL_STATUS'
+                        and v.code_value = t1.wfl_status) wfl_status_n,
+                    t1.reversed_flag,
+                    t1.reverse_wfl_status,
+                    (select v.code_value_name value_name
+                       from sys_code_values_v v
+                      where v.code = 'HLS536_WFL_STATUS_REVERSE'
+                        and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
+                    t1.journal_type
+               FROM hls_journal_header_imp t1
+               where ${/session/@user_id}=10417
+
 
 
 ) t1

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm

@@ -56,7 +56,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <!--<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>-->
-          <bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0017','HAND')) and t1.workflow_code not in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014','0017','HAND'))  and 1 = 1)
+          <bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;,&apos;WFL_FEE_REMIT&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0013')) and t1.workflow_code in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;))or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0017','HAND')) and t1.workflow_code not in (&apos;HLS_JOURNAL_WFL&apos;, &apos;HLS_JOURNAL_REVERSE_WFL&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014','0017','HAND'))  and 1 = 1)
                         or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or  (
                         (${/session/@user_id}
                         in (Select t.user_id