凭证导入工作流同步2 add by 39135 HuTianzhi

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

@@ -11,6 +11,8 @@
             <bm:query-sql><![CDATA[
              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,
@@ -61,6 +63,8 @@
 
     <bm:query-fields>
         <bm:query-field name="journal_num" queryExpression="t1.journal_num like &apos;%&apos;||${@journal_num}||&apos;%&apos;"/>
+        <bm:query-field name="batch_number" queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/>
+        <bm:query-field name="reverse_batch_number" queryExpression="t1.reverse_batch_number like &apos;%&apos;||${@reverse_batch_number}||&apos;%&apos;"/>
         <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}"/>

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

@@ -39,6 +39,7 @@
             param['function_code'] = 'HLS536';
             param['document_id'] = journal_header_id;
             param['document_category'] = 'JE';
+            param['query_only'] = 'Y';
             var edit_flag = '${/parameter/@edit_flag}';
             if(edit_flag == 'Y' ){
                 param['function_usage'] = 'MODIFY';
@@ -99,13 +100,15 @@
             <a:dataSet id="hls_journal_header_query">
                 <a:fields>
                     <a:field name="journal_num"/>
+                    <a:field name="batch_number"/>
+                    <a:field name="reverse_batch_number"/>
                     <a:field name="journal_date_from"/>
                     <a:field name="journal_date_to"/>
                     <a:field name="total_amount_dr_from"/>
                     <a:field name="total_amount_dr_to"/>
                     <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="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>
@@ -128,10 +131,14 @@
                 <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:textField name="batch_number" bindTarget="hls_journal_header_query" prompt="凭证导入批次号"/>
+                <a:textField name="reverse_batch_number" 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>
                     <a:column name="journal_num" lock="true" prompt="凭证编号" renderer="hls536_journal_num_render" width="120"/>
+                    <a:column name="batch_number"  prompt="凭证导入批次号" width="120"/>
+                    <a:column name="reverse_batch_number"  prompt="凭证反冲批次号" width="120"/>
                     <a:column name="js_company_short_name" prompt="记账公司" width="90"/>
                     <a:column name="period_name" align="center" prompt="期间" width="80"/>
                     <a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/>
@@ -141,7 +148,7 @@
                     <a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
                     <a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
                     <a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
-                    <a:column name="error_message" prompt="错误信息" width="150"/>
+                    <a:column name="error_message" prompt="错误信息"  width="150"/>
                     <a:column name="attachment_file"  prompt="凭证模板附件" width="120" renderer="receipt_attachment_upload" align="center"/>
                     <a:column name="other_attachment_file"  prompt="其它附件" width="120" renderer="attachment_upload" align="center"/>
                 </a:columns>