[feat]农行划扣

3b3c8cfd · Darming · 57c63f2b · 3b3c8cfd · 3b3c8cfd · 3b3c8cfd
Commit 3b3c8cfd authored Nov 15, 2019 by Darming
47 changed files
--- a/src/main/database/clear_table.sql
+++ b/src/main/database/clear_table.sql
@@ -129,11 +129,11 @@ create sequence fnd_interface_log_s;
 /*truncate table fnd_atm_attachment;
 truncate table fnd_atm_attachment_multi;*/
- truncate table fnd_atm_attachment fa where fa.attachment_id in(
+DELETE FROM  fnd_atm_attachment fa where fa.attachment_id in(
    select attachment_id from FND_ATM_ATTACHMENT_MULTI t where t.table_name not in ('HLS_NOTICE_DEFINITION','HLS_DOC_FILE_TEMPLET')
  );
- truncate table FND_ATM_ATTACHMENT_MULTI t where t.table_name not in ('HLS_NOTICE_DEFINITION','HLS_DOC_FILE_TEMPLET');
+ DELETE FROM FND_ATM_ATTACHMENT_MULTI t where t.table_name not in ('HLS_NOTICE_DEFINITION','HLS_DOC_FILE_TEMPLET');
 /*drop sequence fnd_atm_attachment_s;
@@ -166,13 +166,13 @@ truncate table csh_payment_req_ln;
 /*凭证相关*/
-truncate table hls_journal_header;
+-- truncate table hls_journal_header;
-truncate table hls_journal_detail;
+-- truncate table hls_journal_detail;
+--
-drop sequence hls_journal_header_s;
+-- drop sequence hls_journal_header_s;
-create sequence hls_journal_header_s;
+-- create sequence hls_journal_header_s;
-drop sequence hls_journal_detail_s;
+-- drop sequence hls_journal_detail_s;
-create sequence hls_journal_detail_s;
+-- create sequence hls_journal_detail_s;
@@ -304,21 +304,21 @@ truncate table CON_COL_MANAGEMENT_HD;
 drop sequence CON_COL_MANAGEMENT_HD_S;
 create sequence CON_COL_MANAGEMENT_HD_S;
-	truncate table CON_COL_MANAGEMENT_LN;
+  truncate table CON_COL_MANAGEMENT_LN;
 drop sequence CON_COL_MANAGEMENT_LN_S;
 create sequence CON_COL_MANAGEMENT_LN_S;
-	truncate table KINGDEE_INTERFACE_LOGS;
+  truncate table KINGDEE_INTERFACE_LOGS;
 drop sequence KINGDEE_INTERFACE_LOGS_S;
 create sequence KINGDEE_INTERFACE_LOGS_S;
-	truncate table csh_deduction_interface;
+  truncate table csh_deduction_interface;
 drop sequence csh_deduction_interface_S;
 create sequence csh_deduction_interface_S;
-	drop sequence csh_deduction_ifc_batch_s;
+  drop sequence csh_deduction_ifc_batch_s;
 create sequence csh_deduction_ifc_batch_s;
-	truncate table vfs_command;
+  truncate table vfs_command;
 drop sequence vfs_command_S;
 create sequence vfs_command_S;
@@ -768,7 +768,7 @@ truncate table ds_guarantor_interface;
 truncate table ds_dcs_saleorder_interface;
 truncate table ds_org_contract;
 truncate table ds_np_contract;
-truncate table ds_app_change_tenant；
+truncate table ds_app_change_tenant;
 drop sequence ds_app_change_tenant_s;
 create sequence ds_app_change_tenant_s;
@@ -1215,6 +1215,9 @@ create sequence ds_abc_interface_assign_s;
 delete FROM fnd_coding_rule_values;
 truncate table aut_trx_user_authorize;
+DROP SEQUENCE aut_trx_user_authorize_s;
+CREATE SEQUENCE aut_trx_user_authorize_s;
 truncate table aut_owner_user_authorize;
 truncate table t_goods_name_z;
@@ -1236,4 +1239,59 @@ drop sequence INSTALLMENT_MORTGAGE_BALANCE_S;
 create sequence INSTALLMENT_MORTGAGE_BALANCE_S;
 truncate table  CUS_INFORMATION_MANAGEMENT;
 drop sequence CUS_INFORMATION_MANAGEMENT_S;
 create sequence CUS_INFORMATION_MANAGEMENT_S;
\ No newline at end of file
+truncate table csh_transaction_plan;
+drop sequence csh_transaction_plan_s;
+create sequence csh_transaction_plan_s;
+truncate table csh_transaction_import_temp;
+drop sequence csh_transaction_import_temp_s;
+create sequence csh_transaction_import_temp_s;
+truncate table gld_write_off;
+drop sequence gld_write_off_s;
+create sequence gld_write_off_s;
+truncate table HL_SBO_RESPONSE_QUERY;
+drop sequence HL_SBO_RESPONSE_QUERY_s;
+create sequence HL_SBO_RESPONSE_QUERY_s;
+truncate table HL_SBO_TEMP;
+drop sequence HL_SBO_TEMP_s;
+create sequence HL_SBO_TEMP_s;
+truncate table HL_TRANSACTION_SPLIT;
+drop sequence HL_TRANSACTION_SPLIT_s;
+create sequence HL_TRANSACTION_SPLIT_s;
+truncate table HL_TRANSPORT_XML;
+drop sequence HL_TRANSPORT_XML_s;
+create sequence HL_TRANSPORT_XML_s;
+truncate table hls_ebank_batch_import_log;
+drop sequence hls_ebank_batch_import_log_s;
+create sequence hls_ebank_batch_import_log_s;
+truncate table SYS_WEBSERVICE_INVOKE_RECORDS;
+drop sequence sys_ws_invoke_records_s;
+create sequence sys_ws_invoke_records_s;
+truncate table hls_bp_master_agent_division;
+drop sequence hls_bp_master_agent_division_s;
+create sequence hls_bp_master_agent_division_s;
+truncate table cus_deposit_calc_overdue_tmp;
+drop sequence cus_deposit_calc_overdue_tmp_s;
+create sequence cus_deposit_calc_overdue_tmp_s;
+truncate table hls_document_use_seal;
+drop sequence hls_document_use_seal_s;
+create sequence hls_document_use_seal_s;
+TRUNCATE TABLE hls_lease_item;
+DROP SEQUENCE hls_lease_item_s;
+CREATE SEQUENCE hls_lease_item_s;
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
+++ b/src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
@@ -15,7 +15,7 @@
                    last_updated_by  = ${/session/@user_id},
                    confirmed_flag   = 'ACCAUDITING'
                where transaction_id = ${@transaction_id}
-                  and confirmed_flag = 'NEW';
+                  and confirmed_flag in ('NEW','CT_REJECTED');
            end;
            ]]></bm:update-sql>
        </bm:operation>

--- a/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm
+++ b/src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm
@@ -173,6 +173,6 @@
 <!--        <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>-->
        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT'))) and t1.returned_flag != 'FULL' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
 <!--        <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />-->
-        <bm:data-filter name="position_code" expression="((${@position_code} = '009' and (t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'F' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and ((t1.bp_category != 'TENANT' or t1.paid_byother_flag != 'F') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)))"/>
+        <bm:data-filter name="position_code" expression="((${@cw_flag} = 'Y') or (${@position_code} = '009' and (t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'F' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and ((t1.bp_category != 'TENANT' or t1.paid_byother_flag != 'F') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)))"/>
    </bm:data-filters>
 </bm:model>
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_abc_2_ccb_import_data_insert.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_abc_2_ccb_import_data_insert.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.save_import_data_abc2(p_header_id => ${@header_id},
+                                                      p_user_id => ${/session/@user_id},
+                                                      p_output_id	=>${@output_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.csh_write_off_ebank_input(p_output_id=>${@output_id},
+                                      p_user_id  => ${/session/@user_id},
+                                      p_company_id  => ${/session/@company_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_acr_import_data_delete.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_acr_import_data_delete.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.delete_ebanking_data(p_output_id => ${@output_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="delete">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    DELETE
+                    FROM
+                        hls_acr_ebank_output_hd_temp ht
+                    WHERE
+                        ht.output_hd_id= ${@output_hd_id};
+                    DELETE
+                    FROM
+                        hls_acr_ebank_output_ln_temp lt
+                    WHERE
+                        lt.output_id=${@output_hd_id};
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hl_change_image_path.change_wfl_image_path;
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_acr_import_data_insert.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/HLS_ACR5040/hls_acr_import_data_insert.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.save_import_data(p_header_id => ${@header_id},
+                                                      p_user_id => ${/session/@user_id},
+                                                      p_output_id	=>${@output_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.csh_write_off_ebank_input(p_output_id=>${@output_id},
+                                      p_user_id  => ${/session/@user_id},
+                                      p_company_id  => ${/session/@company_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_abc2_file_path.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_abc2_file_path.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: hp  
+    $Date: 2013-8-12 上午09:38:31  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:fields>
+        <bm:field name="file_path"/>
+        <bm:field name="file_date"/>
+    </bm:fields>
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+        		select 
+        			sys_parameter_pkg.value(p_parameter_code => 'ACR_INVOICE_ABC_2') file_path,
+        			to_char(sysdate,'YYYYMMDD') file_date
+        		from 
+        			dual
+        	]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_file_name.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_file_name.lwm
@@ -7,7 +7,7 @@
            </bm:parameters>
            <bm:update-sql><![CDATA[
                begin
-                	${@file_name} := hls_acr_ebanking_pkg.get_output_file_name(p_company_id => ${/session/@company_id},p_user_id => ${/session/@user_id});                                 
+                	${@file_name} := hls_acr_ebanking_new_pkg.get_output_file_name(p_company_id => ${/session/@company_id},p_user_id => ${/session/@user_id});
                end;              
            ]]></bm:update-sql>
        </bm:operation>

--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_file_name.lwm_bak
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/get_output_file_name.lwm_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" baseTable="exp_employee_assigns">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:parameters>
+                <bm:parameter name="file_name" datatype="java.lang.String" output="true" outputPath="/parameter/@file_name"/>
+            </bm:parameters>
+            <bm:update-sql><![CDATA[
+                begin
+                	${@file_name} := hls_acr_ebanking_pkg.get_output_file_name(p_company_id => ${/session/@company_id},p_user_id => ${/session/@user_id});                                 
+                end;              
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hl_hls_acrebank_output_file_name.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hl_hls_acrebank_output_file_name.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wdd  
+    $Date: 2018-5-30 下午2:01:51  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT
+                    TO_CHAR(t.creation_date, 'YYYYMMDD')
+                    || '-'
+                    ||
+                    (SELECT
+                        COUNT(DISTINCT(t1.output_id))
+                    FROM
+                        hls_acr_ebank_output_temp t1
+                    WHERE
+                        EXISTS
+                        (SELECT
+                            1
+                        FROM
+                            hls_acr_ebank_output_temp t2
+                        WHERE
+                            TO_CHAR(t2.creation_date, 'YYYYMMDD') = TO_CHAR(SYSDATE, 'YYYYMMDD')
+                        )
+                    ) AS file_name
+                FROM
+                    hls_acr_ebank_output_temp t
+                WHERE
+                    t.output_id =${@output_id} AND
+                    rownum      = 1
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_abc_2_output_temp_for_maintain.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_abc_2_output_temp_for_maintain.lwm
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
+    <bm:fields>
+        <bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
+        <bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>
+        <bm:field name="sequence_no" databaseType="NUMBER" datatype="java.lang.Double" physicalName="SEQUENCE_NO" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SEQUENCE_NO"/>
+        <bm:field name="bp_id_tenant" databaseType="NUMBER" datatype="java.lang.Double" physicalName="BP_ID_TENANT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_ID"/>
+        <bm:field name="due_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DUE_AMOUNT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.RECEIVABLE_AMOUNT"/>
+        <bm:field name="limit_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="LIMIT_AMOUNT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.LIMIT_AMOUNT"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_NAME" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_NAME"/>
+        <bm:field name="dd_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DD_BANK_ACCOUNT_NUM" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_ACCOUNT_NUMBER"/>
+        <bm:field name="id_card_no" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ID_CARD_NO" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.IDENTITY_NO"/>
+        <bm:field name="process_result" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROCESS_RESULT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.PROCESS_RESULT"/>
+        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER"/>
+        <bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES"/>
+        <bm:field name="due_date" databaseType="DATE" datatype="java.lang.String" expression="to_char(due_date,&apos;yyyy-mm-dd&apos;)" physicalName="DUE_DATE"/>
+        <bm:field name="pay_type" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;7&apos;" physicalName="PAY_TYPE"/>
+        <bm:field name="transaction_type" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;1&apos;" physicalName="TRANSACTION_TYPE"/>
+        <bm:field name="account_no" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;03399500040009165&apos;" physicalName="ACCOUNT_NO"/>
+        <bm:field name="account_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;宏菱融资租赁（上海）有限公司&apos;" physicalName="ACCOUNT_NAME"/>
+        <bm:field name="dd_bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select dd_bank_branch_name from con_contract t where t.data_class=&apos;NORMAL&apos; and t.dd_bank_account_num=t1.dd_bank_account_num and rownum=1)" physicalName="DD_BANK_BRANCH_NAME"/>
+        <bm:field name="usage" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;代收用途&apos;" physicalName="USAGE"/>
+        <bm:field name="fen_code" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;01&apos;" physicalName="FEN_CODE"/>
+        <bm:field name="curr_flag" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;0&apos;" physicalName="CURR_FLAG"/>
+        <bm:field name="serial_no" databaseType="VARCHAR2" datatype="java.lang.String" expression="rownum" physicalName="SERIAL-NO"/>
+        <bm:field name="mark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MARK" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.MARK"/>
+        <!-- <bm:field name="step_bank_flag" databaseType="NUMBER" datatype="java.lang.Double" physicalName="STEP_BANK_FLAG" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.STEP_BANK_FLAG"/>
+        <bm:field name="step_bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="STEP_BANK_BRANCH_NAME" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.STEP_BANK_BRANCH_NAME"/>
+        <bm:field name="multi_protocol_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MULTI_PROTOCOL_NUMBER" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.MULTI_PROTOCOL_NUMBER"/>
+        <bm:field name="mark_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MARK_NUMBER" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.MARK_NUMBER"/>
+        <bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DESCRIPTION" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.DESCRIPTION"/>
+        <bm:field name="bank_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select e.ebank_name from con_contract t ,csh_ebank e where t.direct_debit_bank_id = e.ebank_id and t.data_class=&apos;NORMAL&apos; and t.dd_bank_account_num=t1.dd_bank_account_num and rownum=1)" physicalName="BANK_NAME"/> -->
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+        <f:multi-language-storage/>
+        <ns2:sequence-pk/>
+    </bm:features>
+    <bm:primary-key>
+        <bm:pk-field name="ebank_tmp_id"/>
+    </bm:primary-key>
+    <bm:query-fields>
+        <bm:query-field field="session_id" queryOperator="="/>
+        <bm:query-field field="times" queryOperator="="/>
+    </bm:query-fields>
+    <bm:order-by>
+        <bm:field name="sequence_no"/>
+    </bm:order-by>
+    <bm:data-filters>
+        <bm:data-filter enforceOperations="query" expression="t1.due_amount&gt;0"/>
+        <bm:data-filter enforceOperations="query" expression="t1.session_id=${/session/@session_id}"/>
+        <bm:data-filter enforceOperations="query" expression="t1.output_id=${@output_id}"/>
+    </bm:data-filters>
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hls_acr_ebanking_new_pkg.check_data(p_output_id => ${@output_id},
+                                   p_session_id => ${/session/@session_id},
+                                   p_user_id=> ${/session/@user_id},
+                                   p_data_length   => ${@data_length});
+                END;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="data_length" dataType="java.lang.Long" input="false" output="true" outputPath="/parameter/@data_length"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_for_init.lwm_bak
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_for_init.lwm_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<ns1:model xmlns:ns2="leaf.database.local.oracle" xmlns:ns1="http://www.leaf-framework.org/schema/bm">
+    <ns1:operations>
+        <ns1:operation name="query">
+            <ns1:query-sql><![CDATA[
+				SELECT code_value,
+				       code_value_name
+				  FROM sys_code_values_v c
+				 WHERE c.code = 'HLS_ACR_PAYMENT_METHOD'
+				 AND c.code_value IN ('04','05')
+            ]]></ns1:query-sql>
+        </ns1:operation>
+    </ns1:operations>
+</ns1:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm
@@ -14,6 +14,16 @@
        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER"/>
        <bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES"/>
        <bm:field name="due_date" databaseType="DATE" datatype="java.lang.String" expression="to_char(due_date,&apos;yyyy-mm-dd&apos;)" physicalName="DUE_DATE"/>
+        <bm:field name="pay_type" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;7&apos;" physicalName="PAY_TYPE"/>
+        <bm:field name="transaction_type" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;1&apos;" physicalName="TRANSACTION_TYPE"/>
+        <bm:field name="account_no" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;03399500040009165&apos;" physicalName="ACCOUNT_NO"/>
+        <bm:field name="account_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;宏菱融资租赁（上海）有限公司&apos;" physicalName="ACCOUNT_NAME"/>
+        <bm:field name="dd_bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select dd_bank_branch_name from con_contract t where t.data_class=&apos;NORMAL&apos; and t.dd_bank_account_num=t1.dd_bank_account_num and rownum=1)" physicalName="DD_BANK_BRANCH_NAME"/>
+        <bm:field name="usage" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;代收用途&apos;" physicalName="USAGE"/>
+        <bm:field name="fen_code" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;01&apos;" physicalName="FEN_CODE"/>
+        <bm:field name="curr_flag" databaseType="VARCHAR2" datatype="java.lang.String" expression="&apos;0&apos;" physicalName="CURR_FLAG"/>
+        <bm:field name="serial_no" databaseType="VARCHAR2" datatype="java.lang.String" expression="to_char(rownum,&apos;0000&apos;)" physicalName="SERIAL-NO"/>
+        <bm:field name="mark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MARK" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.MARK"/>
    </bm:fields>
    <bm:features>
        <f:standard-who/>
@@ -32,5 +42,7 @@
    </bm:order-by>
    <bm:data-filters>
        <bm:data-filter enforceOperations="query" expression="t1.due_amount&gt;0"/>
+        <bm:data-filter enforceOperations="query" expression="t1.session_id=${/session/@session_id}"/>
+        <bm:data-filter enforceOperations="query" expression="t1.output_id=${@output_id}"/>
    </bm:data-filters>
 </bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm_bak
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_acr_ebank_output_temp_for_maintain.lwm_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ACR_EBANK_OUTPUT_TEMP">
+    <bm:fields>
+        <bm:field name="ebank_tmp_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EBANK_TMP_ID" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.EBANK_TMP_ID"/>
+        <bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Double" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SESSION_ID"/>
+        <bm:field name="sequence_no" databaseType="NUMBER" datatype="java.lang.Double" physicalName="SEQUENCE_NO" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.SEQUENCE_NO"/>
+        <bm:field name="bp_id_tenant" databaseType="NUMBER" datatype="java.lang.Double" physicalName="BP_ID_TENANT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_ID"/>
+        <bm:field name="due_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DUE_AMOUNT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.RECEIVABLE_AMOUNT"/>
+        <bm:field name="limit_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="LIMIT_AMOUNT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.LIMIT_AMOUNT"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_NAME" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_NAME"/>
+        <bm:field name="dd_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DD_BANK_ACCOUNT_NUM" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.CUSTOMER_ACCOUNT_NUMBER"/>
+        <bm:field name="id_card_no" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ID_CARD_NO" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.IDENTITY_NO"/>
+        <bm:field name="process_result" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROCESS_RESULT" prompt="HLS_ACR_EBANK_OUTPUT_TEMP.PROCESS_RESULT"/>
+        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER"/>
+        <bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES"/>
+        <bm:field name="due_date" databaseType="DATE" datatype="java.lang.String" expression="to_char(due_date,&apos;yyyy-mm-dd&apos;)" physicalName="DUE_DATE"/>
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+        <f:multi-language-storage/>
+        <ns2:sequence-pk/>
+    </bm:features>
+    <bm:primary-key>
+        <bm:pk-field name="ebank_tmp_id"/>
+    </bm:primary-key>
+    <bm:query-fields>
+        <bm:query-field field="session_id" queryOperator="="/>
+        <bm:query-field field="times" queryOperator="="/>
+    </bm:query-fields>
+    <bm:order-by>
+        <bm:field name="sequence_no"/>
+    </bm:order-by>
+    <bm:data-filters>
+        <bm:data-filter enforceOperations="query" expression="t1.due_amount&gt;0"/>
+    </bm:data-filters>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.bmbak20180926
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.bmbak20180926
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm" alias="hm" baseTable="hls_bp_master">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+               select hm.bp_id,
+               		  hm.bp_name,
+               		  nvl(hm.id_card_no,hm.id_card_no_leg) id_card_no,
+               		  hm.bp_class 
+               from hls_bp_master hm
+               #WHERE_CLAUSE#
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" forDisplay="true" forQuery="true" physicalName="BP_ID" prompt="用户ID"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="用户名称"/>
+        <bm:field name="id_card_no" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="ID_CARD_NO" prompt="身份证号"/>
+    </bm:fields>
+    <bm:query-fields><![CDATA[
+    ]]></bm:query-fields>
+    <bm:data-filters>
+        <bm:data-filter enforceActions="query" expression="hm.bp_class = ${@customer_type}"/>
+    </bm:data-filters>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm
@@ -17,8 +17,10 @@
        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="用户名称"/>
        <bm:field name="id_card_no" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="ID_CARD_NO" prompt="身份证号"/>
    </bm:fields>
-    <bm:query-fields><![CDATA[
+      <bm:query-fields >
-    ]]></bm:query-fields>
+   	<bm:query-field name="bp_name" queryExpression="hm.bp_name = ${@bp_name}"   />
+   	<bm:query-field name="bp_id" queryExpression="hm.bp_id = ${@bp_id}"   />
+   </bm:query-fields>
    <bm:data-filters>
        <bm:data-filter enforceActions="query" expression="hm.bp_class = ${@customer_type}"/>
    </bm:data-filters>

--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm_bak
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/hls_prj_customer_for_lov.lwm_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="hm" baseTable="hls_bp_master">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+               select hm.bp_id,
+               		  hm.bp_name,
+               		  nvl(hm.id_card_no,hm.id_card_no_leg) id_card_no,
+               		  hm.bp_class 
+               from hls_bp_master hm
+               #WHERE_CLAUSE#
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" forDisplay="true" forQuery="true" physicalName="BP_ID" prompt="用户ID"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="用户名称"/>
+        <bm:field name="id_card_no" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="ID_CARD_NO" prompt="身份证号"/>
+    </bm:fields>
+    <bm:query-fields><![CDATA[
+    ]]></bm:query-fields>
+    <bm:data-filters>
+        <bm:data-filter enforceActions="query" expression="hm.bp_class = ${@customer_type}"/>
+    </bm:data-filters>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.bmbak20180927
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.bmbak20180927
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm">
+    <bm:query-fields><![CDATA[
+    ]]></bm:query-fields>
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[  
+				BEGIN
+			 hls_acr_ebanking_pkg.run_ebank_output(
+				       p_session_id =>${/session/@session_id},
+				       p_file_name => ${/parameter/@file_name},
+				       p_deadline_date =>to_date(${@deadline_date},'yyyy-mm-dd'),
+				        p_deadline_date_to =>to_date(${@deadline_date_to},'yyyy-mm-dd'),
+				       p_currency_code =>${@currency_code},
+				       p_customer_type =>${@customer_type},
+				       p_payment_type =>${@payment_method},
+				       p_limit_amount =>${@limit_amount},
+				       p_user_id =>${/session/@user_id},
+				       p_company_id =>${/session/@company_id},
+				       p_customer_id =>${@customer_id},
+				       p_contract_number => ${@contract_number},
+				       p_period_split_flag	=>	${@generate_rules},
+				       p_output_id=>${@output_id});
+				END;		
+			]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="output_id" output="true" outputPath="@output_id"/>
+            </bm:parameters>
+        </bm:operation>
+        <!--  <bm:operation name="query">
+            <bm:update-sql><![CDATA[
+                SELECT
+                    t1.EBANK_TMP_ID,
+                    t1.session_id,
+                    t1.SEQUENCE_NO,
+                    t1.BP_ID_TENANT,
+                    t1.DUE_AMOUNT,
+                    t1.LIMIT_AMOUNT,
+                    t1.BP_NAME,
+                    t1.DD_BANK_ACCOUNT_NUM,
+                    t1.ID_CARD_NO,
+                    t1.PROCESS_RESULT,
+                    t1.CONTRACT_NUMBER,
+                    t1.TIMES,
+                    TO_CHAR(due_date,'yyyy-mm-dd') AS due_date,
+                    '农行代扣' AS pay_type,
+                    '1' AS transaction_type,
+                    '123454322345' AS account_no,
+                    '宏菱融资租赁（上海）有限公司' AS account_name,
+                    (SELECT
+                        dd_bank_branch_name
+                    FROM
+                        con_contract t
+                    WHERE
+                        t.data_class         ='NORMAL' AND
+                        t.dd_bank_account_num=t1.dd_bank_account_num AND
+                        rownum               =1
+                    ) AS dd_bank_branch_name,
+                    '代收用途' AS usage,
+                    '01' AS fen_code,
+                    '0' AS curr_flag
+                FROM
+                    HLS_ACR_EBANK_OUTPUT_TEMP t1
+                WHERE
+                    t1.due_amount>0 AND
+                    t.output_id  =${@output_id}
+                ORDER BY
+                    SEQUENCE_NO
+            ]]></bm:update-sql>
+        </bm:operation> -->
+    </bm:operations>
+    <bm:features/>
+</bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.lwm
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.lwm
@@ -6,10 +6,11 @@
        <bm:operation name="update">
            <bm:update-sql><![CDATA[  
 				BEGIN
-				  hls_acr_ebanking_pkg.run_ebank_output(
+					hls_acr_ebanking_new_pkg.run_ebank_output(
 				       p_session_id =>${/session/@session_id},
 				       p_file_name => ${/parameter/@file_name},
 				       p_deadline_date =>to_date(${@deadline_date},'yyyy-mm-dd'),
+				        p_deadline_date_to =>to_date(${@deadline_date_to},'yyyy-mm-dd'),
 				       p_currency_code =>${@currency_code},
 				       p_customer_type =>${@customer_type},
 				       p_payment_type =>${@payment_method},
@@ -18,10 +19,56 @@
 				       p_company_id =>${/session/@company_id},
 				       p_customer_id =>${@customer_id},
 				       p_contract_number => ${@contract_number},
-				       p_period_split_flag	=>	${@generate_rules});
+				       p_period_split_flag	=>	${@generate_rules},
+				       p_output_id=>${@output_id},
+				       p_times=>${@period_number});
 				END;		
 			]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="output_id" output="true" outputPath="@output_id"/>
+            </bm:parameters>
        </bm:operation>
+        <!--  <bm:operation name="query">
+            <bm:update-sql><![CDATA[
+                SELECT
+                    t1.EBANK_TMP_ID,
+                    t1.session_id,
+                    t1.SEQUENCE_NO,
+                    t1.BP_ID_TENANT,
+                    t1.DUE_AMOUNT,
+                    t1.LIMIT_AMOUNT,
+                    t1.BP_NAME,
+                    t1.DD_BANK_ACCOUNT_NUM,
+                    t1.ID_CARD_NO,
+                    t1.PROCESS_RESULT,
+                    t1.CONTRACT_NUMBER,
+                    t1.TIMES,
+                    TO_CHAR(due_date,'yyyy-mm-dd') AS due_date,
+                    '农行代扣' AS pay_type,
+                    '1' AS transaction_type,
+                    '123454322345' AS account_no,
+                    '宏菱融资租赁（上海）有限公司' AS account_name,
+                    (SELECT
+                        dd_bank_branch_name
+                    FROM
+                        con_contract t
+                    WHERE
+                        t.data_class         ='NORMAL' AND
+                        t.dd_bank_account_num=t1.dd_bank_account_num AND
+                        rownum               =1
+                    ) AS dd_bank_branch_name,
+                    '代收用途' AS usage,
+                    '01' AS fen_code,
+                    '0' AS curr_flag
+                FROM
+                    HLS_ACR_EBANK_OUTPUT_TEMP t1
+                WHERE
+                    t1.due_amount>0 AND
+                    t.output_id  =${@output_id}
+                ORDER BY
+                    SEQUENCE_NO
+            ]]></bm:update-sql>
+        </bm:operation> -->
    </bm:operations>
    <bm:features/>
 </bm:model>
--- a/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.lwm_bak
+++ b/src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.lwm_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:query-fields><![CDATA[
+    ]]></bm:query-fields>
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[  
+				BEGIN
+				  hls_acr_ebanking_pkg.run_ebank_output(
+				       p_session_id =>${/session/@session_id},
+				       p_file_name => ${/parameter/@file_name},
+				       p_deadline_date =>to_date(${@deadline_date},'yyyy-mm-dd'),
+				       p_currency_code =>${@currency_code},
+				       p_customer_type =>${@customer_type},
+				       p_payment_type =>${@payment_method},
+				       p_limit_amount =>${@limit_amount},
+				       p_user_id =>${/session/@user_id},
+				       p_company_id =>${/session/@company_id},
+				       p_customer_id =>${@customer_id},
+				       p_contract_number => ${@contract_number},
+				       p_period_split_flag	=>	${@generate_rules});
+				END;		
+			]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:features/>
+</bm:model>
--- a/src/main/webapp/WEB-INF/leaf.plugin.export.task/report-task.config
+++ b/src/main/webapp/WEB-INF/leaf.plugin.export.task/report-task.config
+<?xml version="1.0" encoding="UTF-8"?>
+<et:ReportTask xmlns:t="leaf.application.action" xmlns:a="http://www.leaf-framework.org/application" xmlns:et="leaf.plugin.export.task" xmlns:p="uncertain.proc" reportDir="E:\hls_files\geely_hls\report_task_file">
+	<!--下载报表的权限校验-->
+    <p:procedure name="pre-service">
+        <p:set field="@success" value="true"/>
+        <t:session-copy/>
+        <p:switch test="/session/@session_id">
+            <p:case Value="*">
+                <a:model-query defaultWhereclause="report_id = ${/parameter/@report_id}" fetchAll="true" model="psr.PSR1030.psr_task_reports" rootPath="result"/>
+                <p:switch test="/model/result/record">
+                    <p:case Value="null">
+						<p:set field="/access-check/@status_code" value="unauthorized"/>
+                        <t:check-dispatch dispatchUrl="${/request/@context_path}/error_screen_unauthorized.lview" field="/access-check/@status_code" message="没有权限访问指定的页面" value="unauthorized"/>
+                    </p:case>
+                </p:switch>
+            </p:case>
+            <p:case>
+                <p:set field="/access-check/@status_code" value="login_required"/>
+                <t:check-dispatch dispatchUrl="${/request/@context_path}/error_session_expired.lview" field="/access-check/@status_code" message="登录已失效，请重新登录" value="login_required"/>
+            </p:case>
+        </p:switch>
+    </p:procedure>
+	<!-- 创建任务模板-->
+	<task:async-task xmlns:task="leaf.application.task" bm="db.sys_tasks_pkg.add_task" taskDescription="生成报表" taskName="生成报表" taskType="JAVA">
+		<ex:ModelExportTask xmlns:ex="leaf.plugin.export.task"/>
+		<!--生成报表后的后续处理，这里是模板，请修改以适应实际情况-->
+		<p:switch test="/parameter/@sendToMail">
+			<p:case Value="true">
+				<mail:AutoSendMail xmlns:mail="leaf.plugin.mail" content="mail" title="test" tto="jinxiao.lin@hand-china.com">
+					<attachments>
+						<mail:attachment path="${/parameter/@file_path}"/>
+					</attachments>
+				</mail:AutoSendMail>
+				<et:ReportRemove xmlns:et="leaf.plugin.export.task" fullPath="${/parameter/@file_path}"/>
+			</p:case>
+			<p:case>
+				<a:model-insert model="psr.PSR1030.psr_task_reports"/>
+			</p:case>
+		</p:switch>
+     </task:async-task>	
+</et:ReportTask>
--- a/src/main/webapp/WEB-INF/leaf.plugin.mail/mail.config
+++ b/src/main/webapp/WEB-INF/leaf.plugin.mail/mail.config
+<?xml version="1.0" encoding="UTF-8"?>
+<mail:MailServerConfig xmlns:mail="leaf.plugin.mail" auth="true" from="kang.liu01@hand-china.com" password="liukang" smtpServer="mail.hand-china.com" userName="kang.liu01@hand-china.com"/>
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_abc_2_f_info_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_abc_2_f_info_queryfields.js
+var add_datafilters = [ {
+	name : 'QUERY',
+	expression : 't1.output_id=${@output_id}' 
+}
+];
+add_datafilter();
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_abc_2_in_line_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_abc_2_in_line_queryfields.js
+var add_datafilters = [ {
+	name : 'QUERY',
+	expression : 't1.output_id=${@output_id}' 
+}
+];
+add_datafilter();
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_f_info_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_f_info_queryfields.js
+var add_datafilters = [ {
+	name : 'QUERY',
+	expression : 't1.output_id=${@output_id}' 
+}
+];
+add_datafilter();
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_in_line_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_detail_in_line_queryfields.js
+var add_datafilters = [ {
+	name : 'QUERY',
+	expression : 't1.output_id=${@output_id}' 
+}
+];
+add_datafilter();
--- a/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_header_in_line_queryfields.js
+++ b/src/main/webapp/WEB-INF/server-script/layoutconfig/hls_acr5030_header_in_line_queryfields.js
+var override_queryfields = [
+{
+	name:'deadline_date',
+	queryexpression:"t1.deadline_date = to_date(${@deadline_date},'YYYY-MM-DD')"
+},
+{
+	name:'deadline_date_to',
+	queryexpression:"t1.deadline_date_to = to_date(${@deadline_date_to},'YYYY-MM-DD')"
+},
+{
+	name:'actual_amount',
+	queryexpression:"t1.actual_amount=${@actual_amount}"
+},
+{
+	name:'handle_flag_n',
+	queryexpression:"t1.handle_flag_n=${@handle_flag_n}"
+}
+ ];
+override();
--- a/src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_authorize.lview
+++ b/src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_authorize.lview
@@ -363,24 +363,24 @@
            </a:hBox>
        </a:screenBody>
        <script type="text/javascript"><![CDATA[
-        	// //初始化临时表中数据
+        	//初始化临时表中数据
-        	// Leaf.onReady(function(){
+        	Leaf.onReady(function(){
-        	//     Leaf.Masker.mask(Ext.getBody(),'${l:HLS.EXECUTING}');
+        	    Leaf.Masker.mask(Ext.getBody(),'${l:HLS.EXECUTING}');
-        	//     Leaf.request({
+        	    Leaf.request({
-        	//         url:$('aut_owner_user_tmp_init_link').getUrl(),
+        	        url:$('aut_owner_user_tmp_init_link').getUrl(),
-        	//         success:function(){
+        	        success:function(){
-        	//             Leaf.Masker.unmask(Ext.getBody());
+        	            Leaf.Masker.unmask(Ext.getBody());
-        	//         },
+        	        },
-        	//         failure:function(){
+        	        failure:function(){
-        	//             Leaf.Masker.unmask(Ext.getBody());
+        	            Leaf.Masker.unmask(Ext.getBody());
-        	//         },
+        	        },
-        	//         error:function(){
+        	        error:function(){
-        	//           Leaf.Masker.unmask(Ext.getBody());
+        	          Leaf.Masker.unmask(Ext.getBody());
-        	//         },
+        	        },
-        	//         scope:this
+        	        scope:this
-        	//     }
+        	    }
-        	//     );
+        	    );
-        	// });
+        	});
        ]]></script>
    </a:view>
 </a:screen>
--- a/src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
+++ b/src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
@@ -73,7 +73,7 @@
                }
                //开始导入数据
-                Leaf.showConfirm('提示', '确定要导入信息吗,有错误信息的数据将不会被导入', function () {
+                Leaf.showConfirm('提示', '确定要导入信息吗,<font color="red">有错误信息的数据将不会被导入</font>', function () {
                    Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
                    Leaf.request({
                        url: $('save_import_csh_transaction_receipt_data_link_id').getUrl(),
@@ -108,6 +108,12 @@
        }
+        function change_background_color(record) {
+            if (record.get('error_message')) {
+                return 'background-color:#fc9492;';
+            }
+        }
        ]]></script>
        <a:dataSets>
@@ -157,7 +163,7 @@
                    <a:gridButton click="import_btn" text="导入"/>
                </a:screenTopToolbar>
                <a:grid id="grid_ds_id" bindTarget="tre_withdraw_subscriber_import_ds" height="340" navBar="true"
-                        width="980">
+                        width="980" rowRenderer="change_background_color">
                    <a:columns>
                        <a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
                        <a:column name="attribute_1" prompt="账号" width="80"/>

--- a/src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse.lview
+++ b/src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse.lview
@@ -80,7 +80,7 @@
        }
        function openWindow(url) {
-            new Leaf.Window({
+            var win = new Leaf.Window({
                id: 'csh_write_off_reverse_detail_link_winid',
                params: {
                    winId: 'csh_write_off_reverse_detail_link_winid'
@@ -89,6 +89,9 @@
                title: '${l:CSH514.CSH_WRITE_OFF_DETAIL}',
                fullScreen: true
            });
+            win.on('close',function(){
+                $('csh_transaction_receipt_write_off_reverse').query();
+            });
        }
        function construct_from_to() {

--- a/src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
+++ b/src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
@@ -59,7 +59,7 @@
                                        msg: '${l:HLS.SUBMIT_SUCCESS}',
                                        duration: 2000
                                    });
-                                    $('csh_transaction_receipt_write_off_reverse_result_ds').query();
+                                    // $('csh_transaction_receipt_write_off_reverse_result_ds').query();
                                    Leaf.Masker.unmask(win_body);
                                    csh514_write_off_reverse_return();
                                },
@@ -149,7 +149,7 @@
                                    msg: '${l:HLS.SUBMIT_SUCCESS}',
                                    duration: 2000
                                });
-                                $('csh_transaction_receipt_write_off_reverse_result_ds').query();
+                                // $('csh_transaction_receipt_write_off_reverse_result_ds').query();
                                Leaf.Masker.unmask(win_body);
                                csh514_write_off_reverse_return();
                            },

--- a/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
+++ b/src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
@@ -351,6 +351,9 @@
            var advanceDisplayFlag = 'N';
            var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
+            //收款核销不审批
+            approval_flag = 'N';
            if (approval_flag == 'Y') {
                readOnly = 'Y';
                if (status == 'APPROVED') {

--- a/src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview
+++ b/src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview
@@ -132,7 +132,7 @@
            param['function_usage'] = 'MODIFY';
            param['maintain_type'] = 'MODIFY';
            //param['dsid'] = 'bp_agent_grid_result_ds';
-            param['url_title'] = '代理店准入';
+            param['url_title'] = '代理店新增';
            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'bp_agent_create_link');
        }

--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_ebank_excel.lsc
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_ebank_excel.lsc
+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:task="leaf.application.task" xmlns:s="leaf.plugin.script" xmlns:dr="leaf.plugin.excelreport" xmlns:mail="leaf.plugin.mail" xmlns:msg="leaf.application.features.msg" xmlns:t="uncertain.composite.transform" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:excel="leaf.application.task.excel" trace="true">
+    <a:init-procedure>
+        <!--数据DS-->
+        <a:model-execute model="acr.ACR528.insert_atm" rootPath="atm_mulit_id"/>
+        <p:set field="/model/basic_data" setToNull="true"/>
+        <a:model-query fetchAll="true" model="acr.ACR528.acr_invoice_excel" rootPath="/model/basic_data"/>
+        <p:echo/>
+        <dr:excel-report enableTask="true" filename="${/model/basic_data/record/@file_name}.xlsx" template="${/request/@context_path/autocrud}/u01/hls/template/acr_invoice_excel.xlsx">
+            <dr:sheets>
+                <dr:sheet name="发票导出" displayGridlines="false">
+                    <dr:static-content>
+                        <dr:cell-data cell="B" row="2" type="content" value="${/model/basic_data/record/@year}"/>
+                        <dr:cell-data cell="D" row="2" type="content" value="${/model/basic_data/record/@month}"/>
+                        <dr:cell-data cell="F" row="2" type="content" value="${/model/basic_data/record/@day}"/>
+                        <dr:cell-data cell="A" row="4" type="content" value="${/model/basic_data/record/@contract_name}"/>
+                        <dr:cell-data cell="A" row="5" type="content" value="${/model/basic_data/record/@upper_principal}"/>
+                        <dr:cell-data cell="A" row="6" type="content" value="${/model/basic_data/record/@ren_principal_n}"/>
+                        <dr:cell-data cell="H" row="5" type="content" value="${/model/basic_data/record/@principal}"/>
+                    </dr:static-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+        <a:model-insert model="acr.ACR528.insert_atm"/>
+        <p:echo/>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_abc2_interface_excel_sheets.lsc
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_abc2_interface_excel_sheets.lsc
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wangwei5743  
+    $Date: 2017-8-17 上午10:38:31  
+    $Revision: 1.0  
+    $Purpose: 农行代扣接口生成csv
+-->
+<a:service xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
+    <a:init-procedure>
+        <p:echo/>
+        <s:server-script><![CDATA[
+            importPackage(Packages.java.lang);
+            importPackage(Packages.java.io);
+            //importPackage(java.util.zip);
+            importPackage(java.util.zip);
+            importPackage(java.io); /*可以传入参数*/
+            //importPackage(java.util.zip);
+            //生成.csv的具体路径，环境迁移记得修改
+			var export_path= $bm('hls_acr.hls_acr5010.get_output_abc2_file_path').queryAsMap().getChildren();
+            var fileDir = export_path[0].file_path;
+            var fileDate = export_path[0].file_date;
+            function transfer(file, os) {
+                var fis = new FileInputStream(file);
+                var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+                var len = -1;
+                while ((len = fis.read(b)) != -1) {
+                    os.write(b, 0, len);
+                }
+                fis.close();
+            }
+            function downloadAbcTxt(filePath, fileName) {
+                $ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
+                var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+                resp.setHeader("Pragma", "No-cache");
+                resp.setHeader("Cache-Control", "no-cache, must-revalidate");
+                resp.setDateHeader("Expires", 0);
+                resp.setContentType("application/x-msdownload");
+                resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(fileName, 'GBK'));
+                var os = resp.getOutputStream();
+                transfer(filePath, os);
+                os.flush();
+            }
+            function main() {
+                var fileName = '农行代扣(两方)' + fileDate;
+                //生成文件路径，文件
+                var FilePath = fileDir + fileName + '.csv';
+                //-----------------------------写文件----------------------------
+                //换行符
+                var enter = "\r\n";
+                var split = ',';
+                try {
+                    var outSTr = new FileOutputStream(new File(FilePath));
+                    var Buff = new BufferedOutputStream(outSTr);
+                } catch (e) {
+                    raise_app_error(e.message);
+                }
+	            //农行代扣（两方）信息
+				var export_data= $bm('hls_acr.hls_acr5010.hls_acr_abc_2_output_temp_for_maintain').queryAsMap().getChildren();
+                try {
+                    for (var i = 0;i < export_data.length;i++) {
+		                var f = export_data[i];
+                        var write = "";
+	                    write = f.serial_no + split //顺序号
+	                    + f.dd_bank_account_num + split //账号
+	                    + f.bp_name + split //户名
+	                    + f.due_amount + split //金额
+	                    + '' //备注
+	                    + enter;
+	                    Buff.write(new java.lang.String(write).getBytes("GBK"));
+	                }
+                    Buff.flush();
+                    Buff.close();
+                } catch (e) {
+                    raise_app_error(e.message);
+                } finally {
+                    try {
+                        Buff.close();
+                        outSTr.close();
+                    } catch (e) {
+                        raise_app_error(e.message);
+                    }
+                }
+                //---------------------------------------------------------
+                //下载文件
+                downloadAbcTxt(FilePath, fileName + '.csv');
+            }
+            main();
+        ]]></s:server-script>
+        <p:echo/>
+    </a:init-procedure>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_interface_excel_sheets.lsc
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/acr_invoice_interface_excel_sheets.lsc
+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:sel="www.shanghai-electric.com" xmlns:et="leaf.plugin.export.task" xmlns:task="leaf.application.task" xmlns:dr="leaf.plugin.excelreport" xmlns:mail="leaf.plugin.mail" xmlns:msg="leaf.application.features.msg" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <a:model-query fetchAll="true" model="hls_acr.hls_acr5010.hls_acr_ebank_output_temp_for_maintain" rootPath="/model/datasource"/>
+        <a:model-query model="hls_acr.hls_acr5010.hl_hls_acrebank_output_file_name" rootPath="file_name_path"/>
+        <dr:excel-report enableTask="false" filename="${/model/file_name_path/record/@file_name}.xls" template="${/parameter/@templet}">
+            <dr:styles>
+                <dr:cell-style name="cell1" align="ALIGN_CENTER" borderbottom="BORDER_THIN" borderleft="BORDER_THIN" borderright="BORDER_THIN" bordertop="BORDER_THIN" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell2" align="ALIGN_RIGHT" borderbottom="BORDER_THIN" borderleft="BORDER_THIN" borderright="BORDER_THIN" bordertop="BORDER_THIN" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell3" align="ALIGN_LEFT" borderbottom="BORDER_THIN" borderleft="BORDER_THIN" borderright="BORDER_THIN" bordertop="BORDER_THIN" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="宋体" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="cell4" align="ALIGN_CENTER" borderbottom="BORDER_THIN" borderleft="BORDER_THIN" borderright="BORDER_THIN" bordertop="BORDER_THIN" vertical="VERTICAL_CENTER">
+                    <dr:font bold="false" fontName="Arial" height="9"/>
+                </dr:cell-style>
+                <dr:cell-style name="header" align="ALIGN_LEFT" borderbottom="BORDER_THIN" borderright="BORDER_THIN" bordertop="BORDER_THIN" cell_style_id="2" foregroundcolor="BLACK">
+                    <dr:font bold="true" cell_style_id="2" fontname="宋体" height="10"/>
+                </dr:cell-style>
+            </dr:styles>
+            <dr:sheets>
+                <dr:sheet name="农行扣款" autoSizeColumns="0,1,2,3,4,5,6,7,8,9,10,11" displayGridlines="true">
+                    <dr:dynamic-content cell="A" dataModel="/model/datasource">
+                        <dr:columns>
+                            <dr:table-column cellStyle="cell4" field="serial_no" title="serial-no" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell1" field="pay_type" title="pay-type" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="transaction_type" title="transaction-type" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell3" field="account_no" title="account-no" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="account_name" title="account-name" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="dd_bank_account_num" title="payee-account-no" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell3" field="bp_name" title="payee-name" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="dd_bank_branch_name" title="payee-bank" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="usage" title="usage" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell2" field="fen_code" title="fen-code" titlestyle="header" type="content"/>
+                            <dr:table-column cellStyle="cell4" field="curr_flag" title="curr-flag" titlestyle="header" type="Number"/>
+                            <dr:table-column cellStyle="cell1" field="due_amount" title="amount" titlestyle="header" type="Number"/>
+                        </dr:columns>
+                    </dr:dynamic-content>
+                </dr:sheet>
+            </dr:sheets>
+        </dr:excel-report>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/excel_report_dl.lsc
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/excel_report_dl.lsc
+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
+    <a:init-procedure>
+        <s:server-script><![CDATA[
+            importPackage(java.util.zip);
+            importPackage(java.io);
+            importPackage(org.apache.tools.zip);
+            //table_name ,table_pk_value 为附件批次标识,这仅是默认值例子,正式使用请注释掉
+            //可以通过excel_report_dl.lsc?table_name=olf&table_pk_value=a的方式传参
+            //$ctx.parameter.table_name = '${/parameter/@table_name}';
+            //$ctx.parameter.table_pk_value = '${/parameter/@table_pk_value}';
+            function writeFile(zos, fn, fp) {
+                var ze = new ZipEntry(fn);
+               // zos.setEncoding("UTF-8");//如果是org.apache.tools.zip需要追加字符集
+                zos.putNextEntry(ze);
+                var fis = new FileInputStream(fp);
+                var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+                var len = -1;
+                while ((len = fis.read(b)) != -1) {
+                    zos.write(b, 0, len);
+                }
+                fis.close();
+            }
+            function get_time() {
+                var myDate = new Date();
+                var y = myDate.getFullYear();
+                var m = myDate.getMonth() + 1;
+                var d = myDate.getDate();
+                if (m < 10) {
+                    m = '0' + m;
+                }
+                if (d < 10) {
+                    d = '0' + d;
+                }
+                return y + '-' + m + '-' + d;
+            }
+            $ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
+            var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+            resp.setHeader("Pragma", "No-cache");
+            resp.setHeader("Cache-Control", "no-cache, must-revalidate");
+            var filename = 'batch_dowload_' + get_time() + ".zip"
+            resp.setHeader("Content-disposition", "attachment; filename=" + filename);
+            resp.setDateHeader("Expires", 0);
+            resp.setContentType("application/x-msdownload");
+            var zos = new ZipOutputStream(resp.getOutputStream());
+            try {
+                var attachment_for_excel_dl = $bm('hls_acr.hls_acr5010.attachment_for_excel_dl');
+                var result = attachment_for_excel_dl.queryAsMap();
+                var arr = result.getChildren();
+                for (var i = 0;i < arr.length;i++) {
+                    var f = arr[i];
+                  //  println('f.file_name:'+f.file_name+',f.file_path:'+f.file_path);
+                    if (f.file_path) {
+                        var　file_name=f.file_name;
+                        writeFile(zos, file_name, f.file_path);
+                    }
+                }
+            } catch (e) {
+                var logger = $logger("server-script");
+                logger.severe(e.message)
+            }
+            zos.close();
+        ]]></s:server-script>
+    </a:init-procedure>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_export_txt.lsc_bak
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_export_txt.lsc_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:txt="leaf.plugin.hls.export.txt" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <txt:export-txt fileName="${/parameter/@fileName}" separator="${/parameter/@separator}" sql="${/parameter/@sql}"/>
+    </a:init-procedure>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview_bak
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <a:model-query autoCount="true" defaultWhereClause="enabled_flag = &apos;Y&apos;" fetchall="true" model="gld.gld_currency" queryOrderBy="currency_code" rootpath="currency_list"/>
+        <a:model-query autoCount="false" fetchAll="true" model="hls_acr.hls_acr5010.hls_acr_ebank_output_for_init" rootPath="hls_acr_ebank_output_for_init_list"/>
+    </a:init-procedure>
+    <a:view>
+        <script type="text/javascript"><![CDATA[
+        	var file_name ;
+            function amountValidator(record, name, value){
+            	if(typeof(value) != 'undefined' && !Ext.isEmpty(value)){
+            		if (value <= 0){
+            			return '该字段只能为正数';
+            		}else{
+            			return true;
+            		}
+            	}
+            	return true;
+	        }
+ 			function submit_fun(){
+				if($('hls_acr_ebank_output_ds').validate()){
+					var data = $('hls_acr_ebank_output_ds').getJsonData(false);
+					Leaf.request( {url : 'hls_acr_ebank_output_init.lsc',
+		            				para : data,
+		            			 success : function(args) {
+		            			 			file_name = args.result.file_name;
+		            			 			$('hls_acr_ebank_output_temp_ds').query();
+		            					   },
+								   scope : this
+		            });
+		        }
+			}
+ 			function numberRenderer(value,ds,name){
+ 				return Leaf.formatNumber(value,2);
+ 			}
+			function onUpdate(ds,record,name,value,oldvalue){
+				$('hls_acr_ebank_output_temp_ds').removeAll();
+				file_name = null;
+				if(name == 'customer_type'){		
+					record.set('customer_name_display',null);
+					var customer_type = record.get("customer_type");
+					var customer_name_display = record.getMeta().getField('customer_name_display');
+					customer_name_display.setTitle('${l:CUSTOMER}');
+					customer_name_display.setReadOnly(false);
+					var url ='hls_acr.hls_acr5010.hls_prj_customer_for_lov?customer_type='+customer_type; 
+					customer_name_display.setLovService(url);
+					var mapping = [{from:"bp_id",to:"customer_id"},{from:"bp_name",to:"customer_name_display"}];
+					customer_name_display.setMapping(mapping);
+				}
+			}
+			function getNowFormatDate() {
+    			var date = new Date();
+    			var seperator1 = "-";
+				var seperator2 = ":";
+				var month = date.getMonth() + 1;
+				var strDate = date.getDate();
+				if (month >= 1 && month <= 9) {
+					month = "0" + month;
+				}
+				if (strDate >= 0 && strDate <= 9) {
+					strDate = "0" + strDate;
+				}
+			    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate + " " + date.getHours() + seperator2 + date.getMinutes() + seperator2 + date.getSeconds();
+			    return currentdate;
+			}
+ 			function output_file(){
+	 			if(!file_name){
+	 				return;
+	 			}
+	 			if($('hls_acr_ebank_output_temp_ds').getAll().length == 0){
+					return ;
+				}
+ 				var record = $('hls_acr_ebank_output_ds').getCurrentRecord();
+ 				var sql;
+ 				if (record.get('payment_method')=='04'){
+ 					sql = "select '工行导出格式尚待确认' from dual";
+ 				}else if(record.get('payment_method')=='CCB'){
+ 					//sql = "SELECT rpad(nvl(t.customer_account_number, ' '), 20, ' '),rpad(nvl(t.customer_name, ' '), 40, ' '), lpad(to_number(t.receivable_amount, '99999999999999.99'), 16, ' '),rpad(nvl(t.identity_no, ' '), 60, ' '),'','','' FROM hls_acr_ebank_output_temp t WHERE t.session_id = ${/session/@session_id} ORDER BY t.sequence_no";
+ 					sql = "SELECT nvl(t.sequence_no,''),nvl(t.dd_bank_account_num, ''),nvl(t.bp_name, ''),trim(TO_CHAR(t.due_amount, '99999999999999.99')),nvl(t.id_card_no, '') FROM hls_acr_ebank_output_temp t WHERE t.session_id = ${/session/@session_id} and t.due_amount > 0 ORDER BY t.sequence_no";
+ 				}else{
+ 				    sql = "select '其他导出格式尚待确认' from dual";
+ 				}
+ 				var url = 'hls_acr_ebank_export_txt.lsc?fileName='+getNowFormatDate() + '&separator=|&sql='+sql;
+ 				window.open(url);
+            }
+/*
+ 			function file_download(i,sql){
+ 				var separator = "|";
+                form = document.createElement("form");
+				form.target = "_blank";
+				form.method="post";
+				form.action = 'hls_acr_ebank_export_txt.lsc';
+				s = document.createElement("input");
+				s.type = 'hidden';
+				s.name = 'fileName';
+				s.value = file_name;
+				form.appendChild(s);
+				s = document.createElement("input");
+				s.type = 'hidden';
+				s.name = 'separator';
+				s.value = separator;
+				form.appendChild(s);
+				s = document.createElement("input");
+				s.type = 'hidden';
+				s.name = 'sql';
+				s.value = sql;
+				form.appendChild(s);
+				document.body.appendChild(form);
+				form.submit();
+				form.parentNode.removeChild(form);
+ 			}
+*/
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="hls_acr_payment_method_ds" lookupCode="WITHHOLD_WAYS"/>
+            <a:dataSet id="hls_customer_type_ds" lookupCode="CUSTOMER_TYPE"/>
+            <a:dataSet id="hls_generate_rules_ds" lookupCode="HLS_ACR_EBANK_GENERATE_RULES"/>
+            <a:dataSet id="hls_currency_ds" loadData="true">
+                <a:datas dataSource="/model/currency_list"/>
+            </a:dataSet>
+            <a:dataSet id="hls_acr_ebank_output_ds" autoCreate="true">
+                <a:fields>
+                    <a:field name="session_id" defaultValue="${/session/@session_id}"/>
+                    <a:field name="deadline_date" required="true"/>
+                    <a:field name="currency_name" displayField="currency_name" options="hls_currency_ds" required="true" returnField="currency_code" valueField="currency_code"/>
+                    <a:field name="payment_method_display" displayField="code_value_name" options="hls_acr_payment_method_ds" required="true" returnField="payment_method" valueField="code_value"/>
+                    <a:field name="customer_type_display" displayField="code_value_name" options="hls_customer_type_ds" required="true" returnField="customer_type" valueField="code_value"/>
+                    <a:field name="customer_name_display" lovGridHeight="300" lovHeight="450" lovWidth="550" readOnly="true"/>
+                    <a:field name="limit_amount" validator="amountValidator"/>
+                    <a:field name="generate_rules_display" displayField="code_value_name" options="hls_generate_rules_ds" required="true" returnField="generate_rules" valueField="code_value"/>
+                    <a:field name="contract_number"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="update" handler="onUpdate"/>
+                </a:events>
+            </a:dataSet>
+            <a:dataSet id="hls_acr_ebank_output_temp_ds" fetchAll="false" model="hls_acr.hls_acr5010.hls_acr_ebank_output_temp_for_maintain" pageSize="10" queryDataSet="hls_acr_ebank_output_ds" queryUrl="${/request/@context_path}/autocrud/hls_acr.hls_acr5010.hls_acr_ebank_output_temp_for_maintain/query?ORDER_FIELD=sequence_no"/>
+        </a:dataSets>
+        <a:screenBody>
+            <a:form column="2" labelWidth="120" title="代扣指令生成" width="600">
+                <a:datePicker name="deadline_date" bindTarget="hls_acr_ebank_output_ds" prompt="截至日期" renderer="Leaf.formatDate"/>
+                <a:comboBox name="currency_name" bindTarget="hls_acr_ebank_output_ds" prompt="币种"/>
+                <a:comboBox name="customer_type_display" bindTarget="hls_acr_ebank_output_ds" prompt="客户类型"/>
+                <a:lov name="customer_name_display" bindTarget="hls_acr_ebank_output_ds" prompt="客户名称"/>
+                <a:comboBox name="payment_method_display" bindTarget="hls_acr_ebank_output_ds" prompt="租金支付方式"/>
+                <a:numberField name="limit_amount" bindTarget="hls_acr_ebank_output_ds" prompt="代扣指令行限额" renderer="numberRenderer"/>
+                <a:comboBox name="generate_rules_display" bindTarget="hls_acr_ebank_output_ds" prompt="生成规则"/>
+                <a:textField name="contract_number" bindTarget="hls_acr_ebank_output_ds" prompt="合同编号"/>
+                <a:textField name="period_number" bindTarget="hls_acr_ebank_output_ds" prompt="期数"/>
+            </a:form>
+            <a:hBox>
+                <a:button click="submit_fun" text="PROMPT.OK" width="90"/>
+            </a:hBox>
+            <a:grid id="grid_id" bindTarget="hls_acr_ebank_output_temp_ds" height="301" navBar="true" width="1030">
+                <a:columns>
+                    <a:column name="sequence_no" align="center" prompt="序号" width="60"/>
+                    <a:column name="dd_bank_account_num" prompt="客户账号" width="100"/>
+                    <a:column name="bp_name" prompt="客户名称" width="150"/>
+                    <a:column name="due_amount" align="right" prompt="应扣金额" renderer="numberRenderer" width="120"/>
+                    <a:column name="id_card_no" prompt="证件号" width="150"/>
+                    <a:column name="contract_number" prompt="合同编号" width="150"/>
+                    <a:column name="times" prompt="期数" width="150"/>
+                    <a:column name="due_date" prompt="计划付款日" width="150"/>
+                </a:columns>
+            </a:grid>
+            <a:hBox>
+                <a:button click="output_file" text="导出" width="90"/>
+            </a:hBox>
+        </a:screenBody>
+    </a:view>
+</a:screen>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output_init.lsc_bak
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output_init.lsc_bak
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wubin2023 $
+    $Date: 2011/06/08 14:52:05 $
+    $Revision: 1.1 $
+    $Purpose: 
+-->
+<a:service xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:init-procedure>
+        <a:model-execute model="hls_acr.hls_acr5010.get_output_file_name"/>
+        <batch-apply sourcepath="/parameter">
+            <model-update model="hls_acr.hls_acr5010.run_ebank_output"/>
+        </batch-apply>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_tran.lview
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_tran.lview
+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query model="basic.hls_fnd_attribute_sequence" rootPath="header"/>
+        <a:import-excel header_id="${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_EBANK" user_id="${/session/@user_id}"/>
+        <a:model-query defaultWhereClause="header_id=${/model/header/record/@header_id} and TEMPLATE_CODE = &apos;HLS_EBANK&apos;" model="basic.hls_fnd_attribute_status" rootPath="status"/>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="hls_acr_ebank_import_link" url="${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview"/>
+        <a:link id="acr_invoice_import_save_data_link" model="hls_acr.HLS_ACR5040.hls_acr_import_data_insert" modelaction="execute"/>
+        <a:link id="acr_abc_2_import_save_data_link" model="hls_acr.HLS_ACR5040.hls_abc_2_ccb_import_data_insert" modelaction="execute"/>
+        <a:link id="acr_ccb_import_save_data_link" model="hls_acr.HLS_ACR5040.hls_acr_ccb_import_data_insert" modelaction="execute"/>
+        <a:link id="hls_acr_ebank_enter_link_1" url="${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview"/>
+        <script><![CDATA[
+            function loadComplete() {
+              //  alert('${/parameter/@output_id}');
+              debugger;
+                if ('${/model/status/record/@status}' == 'NEW') {
+                    var param = {};
+                    // var errorData = "";
+                     var importFlag = true;
+                    // param['session_id'] = '${/parameter/@session_id}';
+                    // param['header_id'] = '${/model/header/record/@header_id}';
+                    var payment_method = '${/parameter/@payment_method}';
+	                var url = '';
+	                var function_code = '';
+	                if (payment_method == 'ABC'){
+	                    url = $('acr_invoice_import_save_data_link').getUrl();
+	                    function_code = 'HLS_ACR5040D';
+	                }else if(payment_method == 'ABC_2'){
+	                    url = $('acr_abc_2_import_save_data_link').getUrl();
+	                    function_code = 'HLS_ACR5040F';
+	                }
+                    if (importFlag) {
+                        Leaf.request({
+                            url: url,
+                            para: {
+                               header_id:'${/model/header/record/@header_id}',
+                               output_id:'${/parameter/@output_id}'
+                            },
+                            success: function(res) {
+                 // window.location.href = $('hls_acr_ebank_import_link').getUrl()+ '?output_id=' + '${/parameter/@output_id}' + '&function_code=' + 'HLS_ACR5040D' + '&function_usage=QUERY';
+                                 var win = new Leaf.Window({
+	                id: 'acr_invoice_create_invoice',
+	                url: $('hls_acr_ebank_import_link').getUrl(),
+	                 params:{
+	                     output_id:'${/parameter/@output_id}',
+				                     payment_method:'${/parameter/@payment_method}',
+				                     function_code:function_code,
+	                     function_usage:'QUERY'
+	                 },
+	                title: '明细',
+	                fullScreen:true
+	            });  win.on('close',function(){
+	                //contractDs_grid_query();
+                  window.location.href = $('hls_acr_ebank_enter_link_1').getUrl()+ '?layout_code=' + 'HLS_ACR5030_HEADER' + '&function_code=HLS_ACR5040';
+	            });
+                            },
+                            failure: function() { 
+                            },
+                            error: function() { 
+                            },
+                            scope: this
+                        });
+                    } else {
+                        errorData = errorData.substr(0, errorData.length - 1);
+                        Leaf.showMessage('${l:PROMPT}', '${l:VERIFY_INFORMATION}');
+                    }
+                }
+            }
+          Leaf.onReady(function() {
+              loadComplete();
+             });
+        ]]></script>
+    </a:view>
+</a:screen>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_upload.lview
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_upload.lview
+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view>
+        <script><![CDATA[
+        	function saveClick(){
+        		if (document.getElementById('importFile').value){
+        			var fileName = document.getElementById('importFile').value;
+        			var fileType = fileName.substr(fileName.lastIndexOf("."));
+        			if (fileType != '.xls' && fileType != '.xlsx'){
+        				Leaf.showErrorMessage('错误','导入文件非Excel，请重新选择文件！');
+        			} else {
+        				document.getElementById('importForm').submit();
+        			}
+        		}
+        	}
+    	]]></script>
+        <a:dataSets>
+            <a:dataSet id="label_ds" autoCreate="true">
+                <a:fields>
+                    <a:field name="label2" defaultValue="1、  严格按照导入模板整理数据，检查必输事项是否缺少数据。"/>
+                    <a:field name="label3" defaultValue="2、  上传文件后，请点击导入按钮。"/>
+                    <a:field name="label4" defaultValue="3、  本导入程序只支持Office Excel。"/>
+                    <a:field name="label5" defaultValue="仔细阅读上述事项，并检查确认无误。"/>
+                    <a:field name="label6" defaultValue="导入完毕后，请在系统内核实数据是否导入成功。"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入注意事项" width="400">
+            <a:label name="label2" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
+            <a:label name="label3" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
+            <a:label name="label4" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
+            <a:label name="label5" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
+            <a:label name="label6" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
+        </a:fieldSet>
+        <a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入文件" width="400">
+            <form name="upload" id="importForm" action="hls_acr_ebank_import_tran.lview?output_id=${/parameter/@output_id}&amp;payment_method=${/parameter/@payment_method}" enctype="multipart/form-data" method="post">
+                <label style="margin-left:10px;margin-top:10px;"><![CDATA[请选择文件:]]></label>
+                <input name="CONTENT" id="importFile" style="margin-bottom:4px;width:160px;height:22px;" type="file"/>
+                <input onclick="saveClick()" style="margin-left:50px;margin-top:10px;width:60px;" type="button" value="导入"/>
+            </form>
+        </a:fieldSet>
+    </a:view>
+</a:screen>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author:Yenick  
+    $Date: 2018-5-08
+    $Revision: 1.0  
+    $Purpose:农行代扣数据导入
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure><![CDATA[
+    ]]></a:init-procedure>
+    <a:view>
+        <a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <a:link id="hls_ebank_input_detail_link" url="${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview"/>
+        <a:link id="hls_ebank_input_delete_link" model="hls_acr.HLS_ACR5040.hls_acr_import_data_delete" modelaction="delete"/>
+        <script><![CDATA[
+            //modify by wdd 20180530 for HL
+            //增加删除按钮，同时删除头行数据
+            window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+                var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_acr_ebank_output_hd_temp');
+                var hd_ds = $(ds_id);
+                var records = hd_ds.getSelected();
+                Leaf.showConfirm('${l:PROMPT}', '是否确定删除？', function() {
+                    var detail_mask = Ext.getBody();
+                    Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
+                    if (records.length) {
+                        for (var i = 0;i < records.length;i++) {
+                            var line_record = records[i];
+                            if (line_record.get('handle_flag') == 'Y') {
+                                Leaf.showErrorMessage('${l:PROMPT}', '该笔数据已被核销，不能删除!');
+                                Leaf.Masker.unmask(detail_mask);
+                                return;
+                            }
+                            var output_hd_id = line_record.get('output_hd_id');
+                            Leaf.request({
+                                url: $('hls_ebank_input_delete_link').getUrl(),
+                                para: {
+                                    output_hd_id: output_hd_id
+                                },
+                                success: function() {
+                                    Leaf.SideBar.show({
+                                        msg: '${l:HLS.SUBMIT_SUCCESS}',
+                                        duration: 2000
+                                    });
+                                    hd_ds.query(hd_ds.currentPage);
+                                    Leaf.Masker.unmask(detail_mask);
+                                },
+                                failure: function() {
+                                    Leaf.Masker.unmask(detail_mask);
+                                },
+                                error: function() {
+                                    Leaf.Masker.unmask(detail_mask);
+                                },
+                                scope: this
+                            });
+                        }
+                    }
+                });
+            };
+            //end by wdd
+            window['${/parameter/@layout_code}_upload_layout_dynamic_click'] = function() {
+                var p_sourcetype = 'hls_acr_ebank_input';
+                var p_pkvalue = '${/session/@session_id}';
+                var url = '${/request/@context_path}/modules/hls_acr/HLS_ACR5030/hls_upload_for_attachment_db_view.lview?sourcetype=' + p_sourcetype + '&' + 'pkvalue=' + p_pkvalue;
+                wd = new Leaf.Window({
+                    id: 'attachment_up_window',
+                    url: url,
+                    title: '附件上传',
+                    height: 350,
+                    width: 850
+                });
+            };
+            window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record, bp_seq) {
+                var link_function = '';
+                window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+                if (name == 'output_number' && record.get('output_hd_id')) {
+                    link_function = '${/parameter/@layout_code}_open_input_detail_window';
+                    return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + value + '</a>';
+                }
+            };
+            window['${/parameter/@layout_code}_open_input_detail_window'] = function(id, name) {
+                //debugger;
+                var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+                var param = {};
+                // alert(record.get('output_id'));
+                param['output_id'] = record.get('output_hd_id');
+                param['payment_method'] = record.get('payment_method');
+                // update panhong 20190702
+                if (record.get('payment_method') == 'ABC'){
+                    param['function_code'] = 'HLS_ACR5040D';
+                }else if (record.get('payment_method') == 'ABC_2'){
+                    param['function_code'] = 'HLS_ACR5040F';
+                }
+                param['function_usage'] = 'QUERY';
+                param['url_title'] = '明细';
+                hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'hls_ebank_input_detail_link', null, null);
+            };
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
--- a/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview
+++ b/src/main/webapp/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input_detail.lview
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author:Yenick  
+    $Date: 2018-5-08
+    $Revision: 1.0  
+    $Purpose:农行代扣数据导入明细
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure outputPath="/parameter">
+        <!--  <a:model-query model="basic.hls_fnd_attribute_sequence" rootPath="header"/>
+        <a:import-excel header_id="${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="ACR_EBANK" user_id="${/session/@user_id}"/>
+        <a:model-query defaultWhereClause="header_id=${/model/header/record/@header_id} and TEMPLATE_CODE = &apos;ACR_EBANK&apos;" model="basic.hls_fnd_attribute_status" rootPath="status"/> --><![CDATA[
+    ]]></a:init-procedure>
+    <a:view>
+        <a:link id="acr_invoice_import_update_data_link" model="hls_acr.HLS_ACR5040.hls_acr_import_data_insert" modelaction="update"/>
+        <a:link id="acr_ebank_import_link" url="${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_import_upload.lview"/>
+        <a:link id="hls_acr_ebank_enter_link" url="${/request/@context_path}/modules/hls_acr/HLS_ACR5040/hls_acr_ebank_input.lview"/>
+        <script><![CDATA[
+            window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+                debugger;
+                var payment_method = '${/parameter/@payment_method}';
+                var title = '';
+                if (payment_method == 'ABC'){
+                    title = '农行信息导入';
+                }else if(payment_method == 'ABC_2'){
+                    title = '农行（两方）信息导入';
+                }
+                var win = new Leaf.Window({
+                    id: 'upload_handle_winId',
+                    params: {
+                        output_id: '${/parameter/@output_id}',
+                        payment_method: '${/parameter/@payment_method}'
+                    },
+                    url: $('acr_ebank_import_link').getUrl(),
+                    title: title,
+                    width: 420,
+                    height: 275
+                }).on('close', function() {});
+            };
+            window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
+                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+                Leaf.request({
+                    url: $('acr_invoice_import_update_data_link').getUrl(),
+                    para: {
+                        output_id: '${/parameter/@output_id}'
+                    },
+                    success: function() {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                         window.location.href = $('hls_acr_ebank_enter_link').getUrl()+ '?layout_code=' + 'HLS_ACR5030_HEADER' + '&function_code=HLS_ACR5040';
+                     Leaf.SideBar.show({
+                            msg: '操作成功',
+                            duration: 2000
+                        });
+                    },
+                    failure: function() {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    error: function() {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    scope: this
+                });
+            };
+             window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+                  window.location.href = $('hls_acr_ebank_enter_link').getUrl()+ '?layout_code=' + 'HLS_ACR5030_HEADER' + '&function_code=HLS_ACR5040';
+            };
+            window['${/parameter/@layout_code}_upload_layout_dynamic_click'] = function() {
+                var p_sourcetype = 'hls_acr_ebank_input';
+                var p_pkvalue = '${/session/@session_id}';
+                var url = '${/request/@context_path}/modules/hls_acr/HLS_ACR5030/hls_upload_for_attachment_db_view.lview?sourcetype=' + p_sourcetype + '&' + 'pkvalue=' + p_pkvalue;
+                wd = new Leaf.Window({
+                    id: 'attachment_up_window',
+                    url: url,
+                    title: '附件上传',
+                    height: 350,
+                    width: 850
+                });
+            };
+            //查询时调用(grid,table,gridBox)
+            window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
+                qpara['output_id'] = '${/parameter/@output_id}';
+            };
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
--- a/src/main/webapp/modules/sys/SYS8110/sys_function_group_assign.lview
+++ b/src/main/webapp/modules/sys/SYS8110/sys_function_group_assign.lview
--- a/src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
+++ b/src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
@@ -217,17 +217,17 @@
            //初始化意见框内容
            function comment_text_ds_add(ds,record,index) {
-                var comment_text = '';
+                // var comment_text = '';
-                var position_code = '${/model/instance_one/record/@position_code}';
+                // var position_code = '${/model/instance_one/record/@position_code}';
-                var node_sequence_num = '${/model/instance_one/record/@node_sequence_num}';
+                // var node_sequence_num = '${/model/instance_one/record/@node_sequence_num}';
-                var workflow_code = '${/model/instance_one/record/@workflow_code}';
+                // var workflow_code = '${/model/instance_one/record/@workflow_code}';
+                //
-                if (position_code == '07' && workflow_code == 'PROJECT_APPLY' && node_sequence_num == '30') {
+                // if (position_code == '07' && workflow_code == 'PROJECT_APPLY' && node_sequence_num == '30') {
-                     comment_text = "项目结构:\n\n担保方式:\n\n资金来源:";
+                //      comment_text = "项目结构:\n\n担保方式:\n\n资金来源:";
-                } else if (position_code == '03' && workflow_code == 'PROJECT_APPLY' && node_sequence_num == '30') {
+                // } else if (position_code == '03' && workflow_code == 'PROJECT_APPLY' && node_sequence_num == '30') {
-                     comment_text = "项目结构:\n\n税收筹划:\n\n财务分析:";
+                //      comment_text = "项目结构:\n\n税收筹划:\n\n财务分析:";
-                }
+                // }
-                record.set('comment_text',comment_text);
+                // record.set('comment_text',comment_text);
            }
            function zjwfl5110_notice(){
                var comment_text = $('comment_text_ds').getAt(0).get('comment_text');