Merge remote-tracking branch 'origin/remote_dev' into remote_dev

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/WEB-INF/classes/zjwfl/zj_wfl_workflow.lwm

@@ -19,6 +19,11 @@
         <bm:field name="show_approve_history_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_APPROVE_HISTORY_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_APPROVE_HISTORY_FLAG"/>
         <bm:field name="show_all_approve_ht_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_ALL_APPROVE_HT_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_ALL_APPROVE_HT_FLAG"/>
         <bm:field name="serial_number" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SERIAL_NUMBER" prompt="序号"/>
+        <bm:field name="is_archive" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_ARCHIVE" />
+        <bm:field name="is_archive_desc" forInsert="false" forUpdate="false"/>
+        <bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE" />
+        <bm:field name="archive_type_desc" forInsert="false" forUpdate="false"/>
+
     </bm:fields>
     <bm:operations>
         <bm:operation name="query">
@@ -40,7 +45,11 @@
 				       t1.display_service_name,
 				       t1.show_approve_history_flag,
 				       t1.show_all_approve_ht_flag,
-				       t1.serial_number
+				       t1.serial_number,
+				       t1.is_archive,
+                      t1.archive_type,
+                      t1.is_archive_desc,
+                      t1.archive_type_desc
 				  from zj_wfl_workflow_v t1
 				  #WHERE_CLAUSE#
 				  order by t1.serial_number,t1.workflow_type_code,t1.workflow_code
@@ -76,7 +85,9 @@
 										                 p_show_approve_history_flag	=> ${@show_approve_history_flag},
 										                 p_show_all_approve_ht_flag		=> ${@show_all_approve_ht_flag},
 										                 p_serial_number				=> ${@serial_number},
-										                 p_user_id          			=> ${/session/@user_id});
+                                                         p_is_archive                   => ${@is_archive},
+                                                         p_archive_type                 => ${@archive_type},
+                                                         p_user_id          			=> ${/session/@user_id});
 			
 				end;
 			]]></bm:update-sql>
@@ -97,7 +108,9 @@
 										                 p_show_approve_history_flag	=> ${@show_approve_history_flag},
 										                 p_show_all_approve_ht_flag		=> ${@show_all_approve_ht_flag},
 										                 p_serial_number				=> ${@serial_number},
-										                 p_user_id          			=> ${/session/@user_id});
+                                                         p_is_archive                   => ${@is_archive},
+                                                         p_archive_type                 => ${@archive_type},
+                                                        p_user_id          			=> ${/session/@user_id});
 			
 				end;
 			]]></bm:update-sql>

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

@@ -2,12 +2,12 @@
 <!--
     $Author: trd
     $Date: 2012-12-6 上午11:18:39
-    $Revision: 1.0  
-    $Purpose: 
+    $Revision: 1.0
+    $Purpose:
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
     <a:init-procedure>
-      </a:init-procedure>
+    </a:init-procedure>
     <a:view>
         <a:link id="hls_journal_import_create_link_id" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_create.lview"/>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
@@ -15,10 +15,10 @@
         <a:screen-include screen="modules/hls/hls_common_javascript.lview"/>
 
 
-         <script><![CDATA[
-         Leaf.onReady(function () {
-             $('hls_journal_header_result_ds').setQueryParameter('journal_submit_batch_id','${/parameter/@journal_submit_batch_id}');
-         })
+        <script><![CDATA[
+        Leaf.onReady(function () {
+            $('hls_journal_header_result_ds').setQueryParameter('journal_submit_batch_id','${/parameter/@journal_submit_batch_id}');
+        })
         //查询按钮
 
         function hls536_journal_query() {
@@ -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';
@@ -51,47 +52,47 @@
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_journal_import_create_link_id');
         }
 
-         function hls536_journal_num_render(value, record, name) {
-             return '<a href="javascript:hls536_link_dynamic(' + record.id + ',' + record.get('journal_header_id') + ');">' + value + '</a>';
-         }
+        function hls536_journal_num_render(value, record, name) {
+            return '<a href="javascript:hls536_link_dynamic(' + record.id + ',' + record.get('journal_header_id') + ');">' + value + '</a>';
+        }
 
-         function receipt_attachment_upload(val,rec,name){
-             return '<a href=javascript:open_upload_window('+rec.get('journal_header_id')+')>凭证模板附件</a>';
-         }
+        function receipt_attachment_upload(val,rec,name){
+            return '<a href=javascript:open_upload_window('+rec.get('journal_header_id')+')>凭证模板附件</a>';
+        }
 
-         function open_upload_window(record_id){
-             var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_HEADER_IMP&header_id=' + record_id;
-             var win = new Leaf.Window({
-                 url: url,
-                 title: '${l:HLS.SUPPORTING_DOCUMENT}',
-                 id: 'attachment_uploadFile_id',
-                 width: 850,
-                 height: 400
-             });
-             win.on('close', function() {
-                 hls536_journal_query();
-             });
-         }
+        function open_upload_window(record_id){
+            var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_HEADER_IMP&header_id=' + record_id;
+            var win = new Leaf.Window({
+                url: url,
+                title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                id: 'attachment_uploadFile_id',
+                width: 850,
+                height: 400
+            });
+            win.on('close', function() {
+                hls536_journal_query();
+            });
+        }
 
-           function attachment_upload(val,rec,name){
-                 return '<a href=javascript:open_attachment_upload('+rec.get('journal_header_id')+')>其它附件</a>';
-                         }
+        function attachment_upload(val,rec,name){
+            return '<a href=javascript:open_attachment_upload('+rec.get('journal_header_id')+')>其它附件</a>';
+        }
 
-               function open_attachment_upload(record_id){
-                 var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_DETAIL_IMP&header_id=' + record_id;
-                 var win = new Leaf.Window({
-                     url: url,
-                     title: '${l:HLS.SUPPORTING_DOCUMENT}',
-                     id: 'attachment_uploadFile_id',
-                     width: 850,
-                     height: 400
-                 });
-                 win.on('close', function() {
-                     hls536_journal_query();
-                 });
-             }
+        function open_attachment_upload(record_id){
+            var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_DETAIL_IMP&header_id=' + record_id;
+            var win = new Leaf.Window({
+                url: url,
+                title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                id: 'attachment_uploadFile_id',
+                width: 850,
+                height: 400
+            });
+            win.on('close', function() {
+                hls536_journal_query();
+            });
+        }
 
-         ]]></script>
+        ]]></script>
         <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"/>
@@ -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,6 @@
                     <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="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>

src/main/webapp/modules/zjwfl/zj_wfl_workflow.lview

@@ -72,10 +72,36 @@
             	{
             	    record.set('can_cancel','N');
             	}
+               if(name=='is_archive')
+                {
+                     if(value=='Y'){
+                         record.getMeta().getField('archive_type_desc').setRequired(true);
+                         record.getMeta().getField('archive_type_desc').setReadOnly(false);
+                     }else{
+                         record.getMeta().getField('archive_type_desc').setRequired(false);
+                         record.getMeta().getField('archive_type_desc').setReadOnly(true);
+                     }
+                }
             }
+
+             function onLoad_workflowDs(ds) {
+                            var records=ds.getAll();
+                            for (var u = 0;u < ds.getAll().length;u++) {
+                                if(records[u].get('is_archive')=='Y'){
+                                    records[u].getMeta().getField('archive_type_desc').setRequired(true);
+                                    records[u].getMeta().getField('archive_type_desc').setReadOnly(false);
+                                }else{
+                                    records[u].getMeta().getField('archive_type_desc').setRequired(false);
+                                    records[u].getMeta().getField('archive_type_desc').setReadOnly(true);
+                                }
+                            }
+
+                        }
             
             ]]></script>
         <a:dataSets>
+           <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
+           <a:dataSet id="elec_file_type" lookupCode="DATA_CLASSIFICATION"/>
             <a:dataSet id="sub_category_ds" lookupCode="ZJ_WFL_SUB_CATEGORY"/>
             <a:dataSet id="para_workflowDs" autoCreate="true" model="zjwfl.zj_wfl_workflow">
                 <a:fields>
@@ -86,11 +112,19 @@
                             <a:map from="workflow_type_desc" to="workflow_type_desc"/>
                         </a:mapping>
                     </a:field>
+                     <a:field name="is_archive_desc" displayField="code_value_name" options="yes_no_ds"  returnField="is_archive" valueField="code_value"/>
+                     <a:field name="archive_type_desc" displayField="code_value_name" options="elec_file_type" returnField="archive_type" valueField="code_value"/>
+                     <a:field name="enabled_flag_desc" defaultValue="是" displayField="code_value_name" options="yes_no_ds" returnField="enabled_flag" valueField="code_value"/>
+                     <a:field name="enabled_flag" defaultValue="Y"/>
                     <a:field name="sub_category_desc" displayField="code_value_name" options="sub_category_ds" returnField="sub_category" valueField="code_value"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="workflowDs" autoPageSize="true" autoQuery="true" model="zjwfl.zj_wfl_workflow" queryDataSet="para_workflowDs" selectable="true">
                 <a:fields>
+                    <a:field name="is_archive" />
+                    <a:field name="archive_type"/>
+                    <a:field name="is_archive_desc" displayField="code_value_name" options="yes_no_ds" required="true" returnField="is_archive" valueField="code_value"/>
+                    <a:field name="archive_type_desc" displayField="code_value_name" options="elec_file_type" required="true" returnField="archive_type" valueField="code_value"/>
                     <a:field name="workflow_code" required="true"/>
                     <a:field name="workflow_desc" required="true"/>
                     <a:field name="sub_category_desc" displayField="code_value_name" options="sub_category_ds" required="true" returnField="sub_category" valueField="code_value"/>
@@ -114,6 +148,7 @@
                 </a:fields>
                 <a:events>
                     <a:event name="update" handler="onUpdate_workflowDs"/>
+                    <a:event name="load" handler="onLoad_workflowDs"/>
                 </a:events>
             </a:dataSet>
         </a:dataSets>
@@ -123,7 +158,10 @@
                 <a:textField name="workflow_code" bindTarget="para_workflowDs" maxLength="200" prompt="工作流代码" typeCase="upper"/>
                 <a:textField name="workflow_desc" bindTarget="para_workflowDs" maxLength="2000" prompt="工作流描述"/>
                 <a:comboBox name="sub_category_desc" bindTarget="para_workflowDs" prompt="主从属性"/>
-            </a:form>
+                <a:comboBox name="enabled_flag_desc" bindTarget="para_workflowDs" prompt="是否启用"/>
+                <a:comboBox name="is_archive_desc" bindTarget="para_workflowDs" prompt="是否生成电子档案"/>
+                <a:comboBox name="archive_type_desc" bindTarget="para_workflowDs" prompt="电子档案类型"/>
+           </a:form>
             <a:hBox>
                 <a:button click="workflowDs_query" text="HAP_QUERY"/>
                 <a:button click="para_workflowDs_reset" text="HAP_RESET"/>
@@ -145,6 +183,8 @@
                     <a:column name="enabled_flag" editor="workflowDs_grid_check" prompt="启用" width="60"/>
                     <a:column name="can_cancel" editorFunction="editorFun_workflowDs_grid" prompt="可收回" width="60"/>
                     <a:column name="node_define" align="center" prompt="工作流节点定义" renderer="render_workflowDs_grid" width="100"/>
+                    <a:column name="is_archive_desc"  prompt="是否生成电子档案" editor="workflowDs_grid_comb"  width="120"/>
+                    <a:column name="archive_type_desc" align="center" prompt="电子档案类型"  editor="workflowDs_grid_comb" width="120"/>
                 </a:columns>
                 <a:editors>
                     <a:numberField id="workflowDs_grid_num"/>