凭证导入工作的最新更新 add by 39135 HuTianzhi

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

@@ -2,8 +2,8 @@
 <!--
     $Author: trd
     $Date: 2022-12-6 下午2:36:27
-    $Revision: 1.0  
-    $Purpose: 
+    $Revision: 1.0
+    $Purpose:
 -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
@@ -37,6 +37,7 @@
                         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
@@ -45,7 +46,8 @@
                      t1.journal_type,
                      (select t.post_gl_status
                         from hls_journal_header t
-                       where t.journal_num = t1.journal_num) post_gl_status
+                       where t.journal_header_imp_id = t1.journal_header_id
+                       ) post_gl_status
                 FROM hls_journal_header_imp t1
                  #WHERE_CLAUSE#
                  order by t1.journal_header_id desc
@@ -53,17 +55,18 @@
         </bm:operation>
     </bm:operations>
     <bm:data-filters>
-         <bm:data-filter name="query" expression="t1.reversed_journal_header_id is null "/>
-       </bm:data-filters>
+        <bm:data-filter name="query" expression="t1.reversed_journal_header_id is null "/>
+    </bm:data-filters>
 
-     <bm:query-fields>
-         <bm:query-field name="journal_num" queryExpression="t1.journal_num like ${@journal_num}"/>
+    <bm:query-fields>
+        <bm:query-field name="journal_num" queryExpression="t1.journal_num like ${@journal_num}"/>
         <bm:query-field name="journal_date_from" queryExpression="to_date(t1.journal_date,'yyyy-mm-dd') &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
         <bm:query-field name="journal_date_to" queryExpression="to_date(t1.journal_date,'yyyy-mm-dd') &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
-         <bm:query-field name="total_amount_dr_from" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &gt;= ${@total_amount_dr_from}"/>
-         <bm:query-field name="total_amount_dr_to" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &lt;= ${@total_amount_dr_to}"/>
-         <bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
+        <bm:query-field name="total_amount_dr_from" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &gt;= ${@total_amount_dr_from}"/>
+        <bm:query-field name="total_amount_dr_to" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &lt;= ${@total_amount_dr_to}"/>
+        <bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
         <bm:query-field name="description" queryExpression="t1.description like ${@description}"/>
         <bm:query-field name="wfl_status" queryExpression="t1.wfl_status=${@wfl_status}"/>
-      </bm:query-fields>
+        <bm:query-field name="reverse_wfl_status" queryExpression="t1.reverse_wfl_status=${@reverse_wfl_status}"/>
+    </bm:query-fields>
 </bm:model>

src/main/webapp/modules/hls/HLS536/hls_journal_import_wfl.lview

@@ -77,6 +77,7 @@
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
             <a:dataSet id="hls536_wfl_status_ds" lookupCode="HLS536_WFL_STATUS"/>
+            <a:dataSet id="hls536_reverse_wfl_status_ds" lookupCode="HLS536_WFL_STATUS_REVERSE"/>
             <a:dataSet id="hls_journal_header_query">
                 <a:fields>
                     <a:field name="journal_num"/>
@@ -87,6 +88,8 @@
                     <a:field name="description"/>
                     <a:field name="wfl_status_n" displayField="code_value_name" options="hls536_wfl_status_ds" returnField="wfl_status" valueField="code_value"/>
                     <a:field name="wfl_status" />
+                    <a:field name="reverse_wfl_status_n" displayField="code_value_name" options="hls536_reverse_wfl_status_ds" returnField="reverse_wfl_status" valueField="code_value"/>
+                    <a:field name="reverse_wfl_status" />
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="hls_journal_header_result_ds" autoPageSize="true" autoQuery="true" model="hls.HLS536.hls_journal_import_header_wfl" queryDataSet="hls_journal_header_query"  selectable="true">
@@ -106,6 +109,7 @@
                 <a:numberField name="total_amount_dr_to" allowFormat="true" bindTarget="hls_journal_header_query" prompt="金额到"/>
                 <a:textField name="description" bindTarget="hls_journal_header_query" prompt="凭证摘要"/>
                 <a:comboBox name="wfl_status_n" bindTarget="hls_journal_header_query" prompt="凭证导入状态"/>
+                <a:comboBox name="reverse_wfl_status_n" bindTarget="hls_journal_header_query" prompt="凭证反冲状态"/>
             </a:form>
             <a:grid id="hls_journal_headers_grid" bindTarget="hls_journal_header_result_ds" marginHeight="250" marginWidth="40" navBar="true">
                 <a:columns>