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

# Conflicts:
#	src/main/database/Register_function/REGISTER_CON_REPO001.sql

src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_CSH_TRANSATION.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
+
+set feedback off
+set define off
+
+<!--系统代码取值-->
+
+begin
+sys_code_pkg.delete_sys_code('CONFIRMED_FLAG');
+sys_code_pkg.insert_sys_code('CONFIRMED_FLAG', '单据状态', '单据状态', '单据状态', 'ZHS', '');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','NEW','未提交','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','APPROVED','新增确认','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','REJECTED','新增退回','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增确认中','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','ACCAUDITING','会计新增确认中','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','CANCELLED','已作废','ZHS','');
+sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','RETURNED','已退款','ZHS','');
+
+sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG');
+sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', '');
+sys_code_pkg.insert_sys_code_value('PAID_BYOTHER_FLAG','T','是','ZHS','');
+sys_code_pkg.insert_sys_code_value('PAID_BYOTHER_FLAG','F','否','ZHS','');
+
+sys_code_pkg.delete_sys_code('WRITE_OFF_FLAG');
+sys_code_pkg.insert_sys_code('WRITE_OFF_FLAG', '核销状态', '核销状态', '核销状态', 'ZHS', '');
+sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','NOT','未核销','ZHS','');
+sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','FULL','全部核销','ZHS','');
+sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','DEPOSIT','保证金','ZHS','');
+sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','ADVRECEIVED','预收款','ZHS','');
+sys_code_pkg.insert_sys_code_value('WRITE_OFF_FLAG','DISABLED','不可用','ZHS','');
+end;
+/
+commit;
+set feedback on
+set define on
+
+
+spool off
+
+exit
\ No newline at end of file

src/main/database/Init/Sys_prompt/CSH_TRANSACTION_PROMPT.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool CSH_TRANSACTION_PROMPT.log
+
+set feedback off
+set define off
+begin
+
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM',
+                                  p_language => 'ZHS',
+                                  p_description => '收款金额从',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO',
+                                  p_language => 'ZHS',
+                                  p_description => '收款金额到',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME',
+                                  p_language => 'ZHS',
+                                  p_description => '我方账户户名',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.MY_BANK_NAME',
+                                  p_language => 'ZHS',
+                                  p_description => '我方银行名称',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME',
+                                  p_language => 'ZHS',
+                                  p_description => '我方账户账号',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.BANK_CASH_CODE',
+                                  p_language => 'ZHS',
+                                  p_description => '银行流水号',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME',
+                                  p_language => 'ZHS',
+                                  p_description => '对方账户户名',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.YOUR_BANK_NAME',
+                                  p_language => 'ZHS',
+                                  p_description => '对方银行名称',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME',
+                                  p_language => 'ZHS',
+                                  p_description => '对方账户账号',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.BUSINESS_PARTNER',
+                                  p_language => 'ZHS',
+                                  p_description => '商业伙伴',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.BILL_STATUS',
+                                  p_language => 'ZHS',
+                                  p_description => '单据状态',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS',
+                                  p_language => 'ZHS',
+                                  p_description => '核销状态',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS',
+                                  p_language => 'ZHS',
+                                  p_description => '款项用途',
+                                  p_created_by => 1);
+  sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.RECEIVE_MONEY_IMPORT_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '收款导入',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.MONEY_HAND_ADD_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '收款手动新增',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.APPLY_NEW_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '新增申请',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.DROP_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '作废',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'HLS.DOCUMENT_CONFIRMED_BY',
+                                  p_language => 'ZHS',
+                                  p_description => '确认人',
+                                  p_created_by => 1);
+ sys_message_pkg.delete_message('E_NO_THIS_ACCOUNT');
+  sys_message_pkg.insert_message('E_NO_THIS_ACCOUNT',
+                                 '错误',
+                                 '我方没有此银行账号！','ZHS');
+end;
+/
+commit;
+set feedback on
+set define on
+
+spool off
+
+exit

src/main/database/Register_function/REGISTER_CON_REPO001.sql

@@ -20,7 +20,7 @@ SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CON_REPO001','回购申请创建','
 sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON_REPO001/con_contract_repo_create_entrance.lview');
 sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON500/con_contract_authority_list_validate.lview');
 sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON500/con_contract_get_layout_code.lview');
-sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON505/con_contract_modify.lview'); 
+sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON505/con_contract_modify.lview');
 sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON_REPO001/con_contract_change_repo_detail.lview');
 sys_function_assign_pkg.func_service_load('CON_REPO001','modules/cont/CON501N/con_contract_modify.lview');
 

src/main/database/Register_function/REGISTER_CSH510.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_CON_REPO001.log
+
+set feedback off
+set define off
+
+begin
+
+--分配bm
+sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp');
+sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov');
+sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update');
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Register_function/REGISTER_CSH_TRANSACTION_RECEIPT_CONFIRM.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_CON_REPO001.log
+
+set feedback off
+set define off
+
+begin
+
+--页面注册
+sys_function_assign_pkg.service_load('modules/csh/CSH509/csh_transaction_receipt_confirm.lview','收款确认',1,1,0);
+
+--功能定义 EXERCISES001 是功能号
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CSH509','收款确认','收款确认','30','','','modules/csh/CSH509/csh_transaction_receipt_confirm.lview','ZHS',-1);
+SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('CSH509','收款确认','收款确认','30','','','modules/csh/CSH509/csh_transaction_receipt_confirm.lview','US',-1);
+
+--分配页面   将页面分配给哪个功能号
+
+sys_function_assign_pkg.func_service_load('CSH509','modules/csh/CSH509/csh_transaction_receipt_confirm.lview');
+--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
+sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CSH_MANAGE',p_function_code=>'CSH509',p_enabled_flag=>'Y',P_USER_ID=>-1);
+
+end;
+
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

src/main/database/Table/CON_CONTRACT.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool CON_CONTRACT.log
+
+PROMPT
+PROMPT CREATING TABLE TRAIN_CONFIG
+PROMPT ============================
+PROMPT
+WHENEVER SQLERROR CONTINUE
+ DROP TABLE CON_CONTRACT;
+WHENEVER SQLERROR EXIT FAILURE ROLLBACK
+
+alter table CON_CONTRACT add (OBJECT_HANDINGO varchar2(2000));
+alter table CON_CONTRACT add (RECOVERY_MATHOD_GOL varchar2(2000));
+alter table CON_CONTRACT add (SUBJECT_MATTER_RESCISSIO varchar2(2000));
+alter table CON_CONTRACT add (REPURCHASE_TYPES   varchar2(2000));
+alter table CON_CONTRACT add (REPURCHASE_CONTRACT_NUMBER   varchar2(2000));
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_FLAG VARCHAR2(100));
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_DATE DATE);
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_BY NUMBER);
+alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10));
+alter table CON_CONTRACT add (LAST_RENT_DUE_DATE date);
+alter table CON_CONTRACT add (REPURCHASE_DATE date);
+alter table CON_CONTRACT add (PAYMENGT_DEADLINEDATE date);
+
+comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
+  IS '确认时间';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG
+  IS '单据状态';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_BY
+  IS '确认人';
+comment on column CON_CONTRACT.REPURCHASE_CONTRACT_NUMBER
+  is '回购合同编号';
+comment on column CON_CONTRACT.OBJECT_HANDINGO
+  is '物件处理';
+comment on column CON_CONTRACT.RECOVERY_MATHOD_GOL
+  is '解约金回收方法';
+comment on column CON_CONTRACT.SUBJECT_MATTER_RESCISSIO
+  is '解约事由';
+comment on column CON_CONTRACT.REPURCHASE_TYPES
+  is '回购类型';
+
+comment on column CON_CONTRACT.LAST_RENT_DUE_DATE is '前期租金支付约定日';
+comment on column CON_CONTRACT.REPURCHASE_DATE is '解约回购日';
+comment on column CON_CONTRACT.PAYMENGT_DEADLINEDATE is '支付预定期限（第1期）';
+
+SPOOL OFF
+
+EXIT
\ No newline at end of file

src/main/database/Table/CSH_TRANSACTION.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool CON_CONTRACT.log
+
+PROMPT
+PROMPT CREATING TABLE TRAIN_CONFIG
+PROMPT ============================
+PROMPT
+WHENEVER SQLERROR CONTINUE
+ DROP TABLE CON_CONTRACT;
+WHENEVER SQLERROR EXIT FAILURE ROLLBACK
+
+
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_FLAG VARCHAR2(100));
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_DATE DATE);
+ALTER TABLE CSH_TRANSACTION ADD (CONFIRMED_BY NUMBER);
+alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10));
+alter table csh_transaction add (MKT_CONFIRMED_DATE  date);
+alter table csh_transaction add (ACC_CONFIRMED_DATE   date);
+alter table csh_transaction add (MKT_CONFIRMED_BY   varchar2(100));
+alter table csh_transaction add (ACC_CONFIRMED_BY    varchar2(100));
+
+comment on  column csh_transaction.MKT_CONFIRMED_DATE is '营业确认时间';
+comment on  column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间';
+comment on  column csh_transaction.MKT_CONFIRMED_BY is '营业确认人';
+comment on  column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 ';
+comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
+  IS '确认时间';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG
+  IS '单据状态';
+COMMENT ON column CSH_TRANSACTION.CONFIRMED_BY
+  IS '确认人';
+
+
+
+SPOOL OFF
+
+EXIT
\ No newline at end of file

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_lov.lwm

@@ -37,7 +37,7 @@
         <!-- <bm:query-field name="contract_bp_flag" queryExpression="(exists (select 1           from con_contract_bp b          where b.contract_id in (${:@contract_id})            and b.bp_id = t1.bp_id            and b.bp_category in (&apos;VENDER&apos;,&apos;TENANT&apos;,&apos;TENANT_SEC&apos;)            )or nvl(${@contract_bp_flag},&apos;N&apos;) != &apos;Y&apos; )"/> -->
     </bm:query-fields>
     <bm:data-filters>
-        <!-- <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> -->
+        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
         <bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_for_lov.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sf
+    $Date: 2019-9-11 下午01:13:07
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="csh_transaction">
+    <bm:fields>
+        <bm:field name="transaction_id" databaseType="number" datatype="java.lang.Long" physicalName="transaction_id" forDisplay="false"/>
+        <bm:field name="bp_bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="bp_bank_account_name" prompt="对方账户户名" forQuery="true" forDisplay="true"/>
+        <bm:field name="opposite_band_na" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="opposite_band_na" prompt="对方银行信息"/>
+        <bm:field name="bp_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="bp_bank_account_num" prompt="对方账户账号"/>
+       <!-- <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
+        <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
+        <bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
+        <bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
+        <bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
+        <bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME"/>
+        <bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
+        <bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
+        <bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>-->
+        <!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+        <s:bm-script><![CDATA[
+            var cx = Packages.leaf.javascript.Context.getCurrentContext();
+            Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
+        ]]></s:bm-script>
+    </bm:features>
+    <bm:query-fields>
+
+        <bm:query-field field="bp_bank_account_name" queryExpression="t1.bp_bank_account_name like &apos;%&apos;||${@bp_bank_account_name}||&apos;%&apos;"/>
+        <bm:query-field field="opposite_band_na" queryExpression="t1.opposite_band_na like &apos;%&apos;||${@opposite_band_na}||&apos;%&apos;"/>
+        <bm:query-field field="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like &apos;%&apos;||${@bp_bank_account_num}||&apos;%&apos;"/>
+       <!--<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>-->
+        <!-- <bm:query-field field="bp_category" queryOperator="="/> -->
+        <!--<bm:query-field field="bp_category" queryExpression="(t1.bp_category = ${@bp_category} or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id     and br.bp_category = ${@bp_category} and br.bp_type = ${@bp_category}))"/>-->
+        <!-- <bm:query-field name="contract_bp_flag" queryExpression="(exists (select 1           from con_contract_bp b          where b.contract_id in (${:@contract_id})            and b.bp_id = t1.bp_id            and b.bp_category in (&apos;VENDER&apos;,&apos;TENANT&apos;,&apos;TENANT_SEC&apos;)            )or nvl(${@contract_bp_flag},&apos;N&apos;) != &apos;Y&apos; )"/> -->
+    </bm:query-fields>
+    <bm:data-filters>
+        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
+        <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
+    </bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_list_tmp.lwm

@@ -21,7 +21,7 @@
                li.attribute_2,
                li.attribute_3,
                li.attribute_4,
-                li.attribute_5,
+               li.attribute_5,
                li.attribute_6,
                li.attribute_7,
                li.attribute_8,

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    $Author: gaoyang  
-    $Date: 2013-5-14 下午01:23:36  
+    $Author: sf
+    $Date: 2019-9-9 下午01:23:36
     $Revision: 1.0  
     $Purpose: 
 -->
@@ -82,12 +82,17 @@
         <bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
         <bm:field name="collection_classes"/>
         <bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" forInsert="false" forUpdate="false"/>
+        <bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/>
+        <bm:field name="written_off_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'WRITE_OFF_FLAG' and v.code_value =t1.WRITE_OFF_FLAG)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
+        <bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
         <bm:field name="opposite_band_na"/>
         <bm:field name="banka"/>
         <bm:field name="purpose"/>
         <bm:field name="gsber"/>
         <bm:field name="sus_belnr"/>
         <bm:field name="bp_virtual_bank_account"/>
+        <bm:field name="confirmed_flag" />
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -100,8 +105,11 @@
         <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
     </bm:data-filters>
     <bm:query-fields>
+        <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
+        <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
         <bm:query-field field="bp_bank_account_name" queryOperator="like"/>
         <bm:query-field field="receipt_type" queryOperator="="/>
+        <bm:query-field field="opposite_band_na" queryOperator="="/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num_from" queryExpression="t1.bank_slip_num &gt;= ${@bank_slip_num_from}"/>

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sf
+    $Date: 2019-9-12 下午07:57:46
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            begin
+                 csh_transaction_pkg.update_confirmed_flag(
+                                p_transaction_id        =>${@transaction_id},
+                                p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
+                                p_user_id               =>${session/@user_id}
+                                );
+             end;
+        ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: chenlingfeng
+    $Date: 2019-01-14 16:29:48
+    $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 t1.*
+  FROM (SELECT li.line_id,
+               li.error_message,
+               li.status,
+               li.header_id,
+               li.line_number,
+               hd.created_by,
+               li.source_table,
+               li.attribute_1,
+               li.attribute_2,
+               li.attribute_3,
+               li.attribute_4,
+                li.attribute_5,
+               li.attribute_6,
+               li.attribute_7,
+               li.attribute_8,
+               li.attribute_9,
+               li.attribute_10,
+               li.attribute_11,
+               li.attribute_12,
+               li.attribute_13,
+               li.attribute_14,
+               li.attribute_15,
+               li.attribute_16,
+               li.attribute_17,
+               li.attribute_18,
+               li.attribute_19,
+               li.attribute_20,
+               li.attribute_21,
+               li.attribute_22,
+               li.attribute_23,
+               li.attribute_24,
+               li.attribute_25,
+               li.attribute_26
+          FROM fnd_interface_headers hd,
+               fnd_interface_lines   li
+         WHERE hd.header_id = li.header_id
+           AND hd.template_code = 'CSH_TRX_BANK'
+           AND li.line_number >0
+        AND HD.CREATED_BY = ${/session/@user_id}
+        ) t1
+ #WHERE_CLAUSE#
+   order by t1.line_number
+
+]]></bm:query-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            begin
+              csh_transaction_pkg.csh_transaction_import_check(
+                 p_header_id => ${/model/header/record/@header_id},
+                 p_user_id => ${/session/@user_id}
+              );
+
+            end;
+        ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="insert">
+            <bm:update-sql><![CDATA[
+        begin
+          DS_IMPORT_CORE_PKG.csh_trx_bank_import(
+                                    p_header_id   =>${/parameter/@header_id},
+                                    p_user_id     =>${/session/@user_id});
+        end;
+        ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+	            begin
+                   csh_transaction_pkg.get_bank_account_id(p_bank_account_num    =>${@bank_account_num},
+                                                           p_bp_bank_account_num =>${@bp_bank_account_num},
+                                                           p_bank_account_id     =>${@bank_account_id},
+                                                           p_bp_category         =>${@bp_category},
+                                                           p_bp_id               =>${@bp_id},
+                                                           p_csh_bp_name         =>${@csh_bp_name},
+                                                           p_user_id             =>${session/@user_id}
+                                                           );
+	            end;
+	        ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="bank_account_id" dataType="java.lang.Long" output="true" outputPath="@bank_account_id"/>
+                <bm:parameter name="bp_category" dataType="java.lang.String" output="true" outputPath="@bp_category"/>
+                <bm:parameter name="bp_id" dataType="java.lang.Long" output="true" outputPath="@bp_id"/>
+                <bm:parameter name="csh_bp_name" dataType="java.lang.String" output="true" outputPath="@csh_bp_name"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+
+
+    <bm:query-fields>
+        <bm:query-field name="header_id" queryExpression="t1.header_id=${@header_id}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_manual_receipt_save.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sf
+    $Date: 2019-9-10 下午06:42:00
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="insert">
+            <bm:update-sql><![CDATA[
+            	begin
+                     csh_transaction_pkg.save_csh_transaction_data(
+                                            p_transaction_date       =>${@transaction_date},
+                                            p_cashflow_amount        =>${@cashflow_amount},
+                                            p_bank_slip_num          =>${@bank_slip_num},
+                                            p_paid_byother_flag      =>${@paid_byother_flag},
+                                            p_bp_id                  =>${@bp_id},
+                                            p_collection_classes     =>${@collection_classes},
+                                            p_description            =>${@description},
+                                            p_bp_bank_account_id     =>${@bp_bank_account_id},
+                                            p_bp_bank_name           =>${@bp_bank_name},
+                                            p_bp_bank_account_num    =>${@bp_bank_account_num},
+                                            p_bank_account_id        =>${@bank_account_id},
+                                            p_user_id                =>${session/@user_id}
+                        );
+            	end;
+            ]]></bm:update-sql>
+          <!--  <bm:parameters>
+                <bm:parameter name="transaction_id" dataType="java.lang.Long" input="false" inputPath="@transaction_id" output="true" outputPath="/parameter/@transaction_id"/>
+            </bm:parameters>-->
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm

@@ -70,7 +70,12 @@
                                    p_purpose                =>${@purpose},
                                    p_gsber                   =>${@gsber},
                                    p_sus_belnr              =>${@sus_belnr},
-                                   p_bp_virtual_bank_account              =>${@bp_virtual_bank_account},p_zuonr=>${@bank_slip_num});
+                                   p_bp_virtual_bank_account              =>${@bp_virtual_bank_account},
+                                   p_zuonr=>${@bank_slip_num},
+            	          p_paid_byother_flag   =>${@paid_byother_flag},
+            	          p_ref_v05             =>${@ref_v05}
+            	       );
+
             	end;
             ]]></bm:update-sql>
             <bm:parameters>

src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_history_display.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: LIJINGJING
+    $Date: 2019-09-10 下午4:38:18
+    $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 tt.*  from (       	SELECT t1.project_number,
+       t1.contract_number,
+       t1.bp_code,
+       t1.bp_name,
+       t1.overdue_max_days,
+       t1.overdue_max_amount,
+       t1.bp_type,
+        t1.bp_class,
+       t1.bp_id,
+       t1.description,
+       t1.project_id,
+       t1.contract_id
+  FROM prj_project_history_lv t1
+WHERE t1.bp_id = ${@bp_id}
+and  t1.project_id <> ${@project_id})   tt
+#WHERE_CLAUSE#
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js

@@ -64,8 +64,8 @@ var override_queryfields = [
 //	queryoperator : "="
 //},
 {
-	name:'status_not_in',
-	queryexpression : "((t1.project_status in('NEW','PRE_APPROVING','APPROVED_RETURN')) Or (t1.project_status in('PRE_APPROVED','APPROVED_RETURN') and t1.pjd_instance_status in ('PRE_APPROVING','APPROVED'))) and t1.document_type='CARLS'"
+	name:'project_status',
+	queryexpression : "(t1.project_status in ('NEW','PRE_APPROVING','APPROVED_RETURN')"
 }
 
 

src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: chenlingfeng
+    $Date: 2015-04-09 上午10:07:29
+    $Revision: 1.0
+    $Purpose:
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="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="CSH_TRX_BANK" user_id="${/session/@user_id}"/>
+        <a:model-query defaultWhereClause="header_id=${/model/header/record/@header_id} and TEMPLATE_CODE = &apos;CSH_TRX_BANK&apos;" model="basic.hls_fnd_attribute_status" rootPath="status"/>
+        <a:model-update model="csh.CSH510N.csh_transaction_list_tmp"/>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="execute"/>
+        <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
+        <script type="text/javascript"><![CDATA[
+
+        function backBtn() {
+            parent._input_window.close();
+        }
+        var import_flag=0;
+        function import_btn() {
+            var ds = $('tre_withdraw_subscriber_import_ds');
+            var records = ds.getAll();
+            var saveData=[];
+            if(import_flag==0){
+                for (var i = 0;i < records.length;i++) {
+                    var record=records[i];
+                    if (record.get('status') == 'ERROR') {
+                        Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误，请查看错误信息！');
+                        return;
+                    }
+                    //获得周期时间
+                    var r_date = record.get('attribute_3');
+                    r_date = Leaf.formatDate(r_date);
+                    Leaf.request({
+                        url: $('get_period_name_id').getUrl(),
+                        para: {
+                            p_date: r_date
+                        },
+                        success: function(res){
+                            var period_name = res.result.record.period_name,
+                                internal_period_num = res.result.record.internal_period_num;
+                            if (period_name) {
+                                record.set('period_name', period_name);
+                                record.set('internal_period_num', internal_period_num);
+                            } else {
+                                record.set('period_name', '');
+                                record.set('internal_period_num', '');
+                                if (record.get('transaction_date')) {
+                                    record.set('transaction_date', '');
+                                    Leaf.showMessage('${l:PROMPT}', '${l:CSH511.PERIOD_ERROR}');
+                                }
+                            }
+                        },
+                        scope: this
+                    });
+                    //否则的话添加必要的字段
+                    record.set('receipt_type','import');
+                    record.set('transaction_date',record.get('attribute_3'));
+                    record.set('bank_slip_num',record.get('attribute_5'));
+                    record.set('currency_code', 'CNY');
+                    record.set('transaction_amount',record.get('attribute_14'));
+                    record.set('exchange_rate',1);
+                    record.set('bp_bank_account_num',record.get('attribute_8'));
+                    record.set('bp_bank_account_name',record.get('attribute_9'));
+                    record.set('opposite_band_na',record.get('attribute_10'));
+                    record.set('description',record.get('attribute_23'));
+                    record.set('ref_v05',record.get('attribute_24'));
+                    record.set('paid_byother_flag','F');
+                    record.set('write_off_flag','DISABLED');
+                    record.set('_status','insert');
+                    //根据银行卡号设置我方的银行账号
+                    Leaf.request({
+                        url: $('import_csh_transaction_receipt_data_link_id').getUrl(),
+                        para: {
+                            bank_account_num:record.get('attribute_1'),
+                            bp_bank_account_num:record.get('attribute_8')
+                        },
+                        success: function(res){
+                            record.set('bank_account_id',res.result.bank_account_id);
+                            //根据对方的银行卡号获取商业伙伴信息
+                            record.set('bp_category',res.result.bp_category);
+                            record.set('bp_id',res.result.bp_id);
+                            record.set('csh_bp_name',res.result.csh_bp_name);
+                        },
+                        scope: this
+                    });
+
+
+                    saveData.push(record.data);
+
+                }
+                //开始导入数据
+                Leaf.showConfirm('提示', '确定要导入信息吗？', function() {
+
+                    Leaf.request({
+                        url: '${/request/@context_path}/autocrud/csh.CSH511.csh_transaction_receipt_save/batch_update',
+                        para: saveData,
+                        scope: this,
+                        success: function () {
+                            import_flag = import_flag + 1;
+                            $('tre_withdraw_subscriber_import_ds').query();
+                            Leaf.SideBar.show({
+                                msg: '操作成功',
+                                duration: 2000
+                            });
+
+                          //  backBtn();
+                        }
+                    });
+                });
+            }else{
+                Leaf.showMessage('${l:PROMPT}', '数据已导入不能重复导入！');
+                return;
+            }
+        }
+
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="tre_withdraw_subscriber_import_ds" autoQuery="true" fetchAll="true" model="csh.CSH510N.csh_transaction_list_tmp" queryUrl="${/request/@context_path}/autocrud/csh.CSH510N.csh_transaction_list_tmp/query?header_id=${/model/header/record/@header_id}">
+                <a:fields>
+                    <a:field name="error_message" readOnly="true"/>
+                    <a:field name="attribute_4" readOnly="true"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:form id="success_form" height="400" title="THE_IMPORTED_DATA" width="980">
+                <a:screenTopToolbar>
+                    <a:gridButton click="backBtn" text="退出"/>
+                    <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">
+                    <a:columns>
+                        <a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
+                        <a:column name="attribute_1" prompt="账号" width="80"/>
+                        <a:column name="attribute_2" prompt="货币" width="80"/>
+                        <a:column name="attribute_3" prompt="交易日期" width="80"/>
+                     <!--   <a:column name="attribute_4" prompt="交易时间" width="80"/>-->
+                        <a:column name="attribute_5" prompt="日志号" width="80"/>
+                        <a:column name="attribute_8" prompt="对方账号" width="80"/>
+                        <a:column name="attribute_9" prompt="对方账号户名" width="80"/>
+                        <a:column name="attribute_10" prompt="对方银行名称" width="80"/>
+                        <a:column name="attribute_14" prompt="收款金额" width="80"/>
+                        <a:column name="attribute_23" prompt="摘要" width="80"/>
+                        <a:column name="attribute_24" prompt="附言" width="80"/>
+
+                    </a:columns>
+                    <a:editors>
+                        <a:textArea id="textArea_e" height="50" width="240"/>
+                    </a:editors>
+                </a:grid>
+            </a:form>
+        </a:screenBody>
+        <script type="text/javascript"><![CDATA[
+
+	  	]]></script>
+    </a:view>
+</a:screen>

src/main/webapp/modules/csh/CSH510N/csh_transaction_import.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sf
+    $Date: 2015-4-8 上午09:03:15
+    $Revision: 1.0
+    $Purpose: excel导入收款
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:init-procedure/>
+    <a:view>
+        <script type="text/javascript"><![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' && fileType != '.xlsm') {
+                    alert('${l:SELECT_CORRECT_IMPORT_FILE}');
+                } else {
+                    doSubmit();
+                }
+            }
+        }
+        var _input_window;
+
+        function doSubmit() {
+            _input_window = new $L.Window({
+                title: '${l:HLS.IMPORT}',
+                width: 1050,
+                height: 500
+            });
+            new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%"  width="100%"  style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true);
+            var form = document.getElementById('importForm');
+            var url = '${/request/@context_path}/modules/csh/CSH510N/csh_transaction_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
+            form.action = url;
+            form.submit();
+            $('${/parameter/@winid}').close();
+
+            _input_window.on('close', function() {
+                //  $('${/parameter/@parent_ds_id}').setQueryParameter('batch_id','${/parameter/@batch_id}');
+                $('${/parameter/@parent_ds_id}').query();
+            });
+        }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="label_ds" autoCreate="true">
+                <a:fields>
+                    <!--<a:field name="label1" defaultValue="注意："/>-->
+                    <a:field name="label2" defaultValue="${l:STRICT_IMPORTED_TEMPLATE_DATA}"/>
+                    <a:field name="label3" defaultValue="${l:PRODUCT_MASTER_DATA_IMPORT}"/>
+                    <a:field name="label4" defaultValue="${l:IMPORTER_ONLY_SUPPORTS}"/>
+                    <a:field name="label5" defaultValue="${l:READ_THE_ABOVE_CAREFULLY}"/>
+                    <a:field name="label6" defaultValue="${l:THE_IMPORT_IS_COMPLETE}"/>
+                </a:fields>
+            </a:dataSet>
+        </a:dataSets>
+        <a:fieldSet style="margin-left:10px;margin-top:10px;" title="IMPORT_CONSIDERATIONS" width="400">
+            <!--<a:label name="label1" bindTarget="label_ds" width="380"/>-->
+            <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="TMPLT_IMPORT_FILE" width="400">
+            <form name="upload" id="importForm" action="modules/prj/PRJ501N/prj_lease_item_trans_upload.lview?session_id=${/parameter/@session_id}&amp;project_id=${/parameter/@project_id}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post" target="_input_window">
+                <label style="margin-left:10px;margin-top:10px;font-size:13px"><![CDATA[${l:PLEASE_SELECT_A_FILE}]]></label>
+                <input name="CONTENT" id="importFile" style="font-size:15px" type="file"/>
+                <!-- <input onclick="downloadFile()" style="margin-left:10px;margin-top:10px;width:60px;height:23px" type="button" value="模板下载"/> -->
+                <input onclick="saveClick()" style="margin-left:25px;margin-top:10px;width:60px;height:23px" type="button" value="${l:TMPLT_IMPORT}"/>
+            </form>
+        </a:fieldSet>
+    </a:view>
+</a:screen>

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -19,8 +19,8 @@
                 url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
         <a:link id="hls213_sap_eai_create_vender_link"
                 url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
-        <a:link id="Identity_ccx_link"
-                url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>
+      <!--  <a:link id="Identity_ccx_link"
+                url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
         <script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/>
         <a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/>
         <script type="text/javascript"><![CDATA[
@@ -129,7 +129,7 @@
                 //身份证验证
                 if (ds.fields.id_card_no) {
 
-                    ds.fields.id_card_no.pro.validator = id_card_no_validate;
+                    //ds.fields.id_card_no.pro.validator = id_card_no_validate;
                 }
 
                 if (ds.fields.parent_id) {
@@ -157,9 +157,9 @@
                 //由于中诚信测试环境只能测试张三，所以这里限定身份证号为张三的123456199001011233
 //            if(value=='123456199001011233'){
 //
-                var url1 = $('identity_query_link').getUrl();
-                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
-                Leaf.request({
+               // var url1 = $('identity_query_link').getUrl();
+               // window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+           /*     Leaf.request({
                     url: url1,
                     para: {
                         id_card_no: value,//身份证号码
@@ -229,7 +229,7 @@
                     },
                     scope: this,
                     sync: true
-                });
+                });*/
             }
 
             if (value.length == 18) {

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -269,6 +269,7 @@
             var lease_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
                var project_record = $(project_ds_id).getCurrentRecord();
 
+
             if (prj_record.get('project_number')) {
                 return true;
             }
@@ -285,6 +286,7 @@
                     ka_prj_id: prj_record.get('ka_prj_id')
                 },
                 success: function (res) {
+                    debugger;
                     var document_number = res.result.document_number;
                     prj_record.set('project_number', document_number);
                     check_flag = true;
@@ -350,14 +352,17 @@
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+            var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1','prj_project');
+
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP','prj_project_bp');
-            var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_TENANT_INFO', 'prj_project_bp');
+            var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
             var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
             var virtual_ds_id =  '${/parameter/@layout_code}_virtual_ds';
             if (ds_id==ds.id || virtual_ds_id==ds.id) {
                 $(cdd_item_ds_id).query();
-                $(tenant_ds_id).query();
                 $(bp_ds_id).query();
+                $(tenant_ds_id).query();
+
             }
 
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -422,8 +427,8 @@
 
         //加载时调用(grid,table,gridBox)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
+            debugger;
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
-
             if (bp_ds_id == ds.id && bp_ds_id) {
                 if (record.get('bp_category') == 'TENANT') {
                     record.getField('bp_category_n').setReadOnly(true);
@@ -435,7 +440,12 @@
                 }
             }
         };
-
+      /*  Leaf.onReady(function(){
+            var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
+            var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
+            $(bp_ds_id).setQueryUrl(url);
+            $(bp_ds_id).query();
+        })*/
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/prj/PRJ500N/prj_project_create_create_tree_n.lview

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    $Author: gaoyang  
-    $Date: 2013-6-24 下午03:23:39  
-    $Revision: 1.0  
-    $Purpose: 
+    $Author: gaoyang
+    $Date: 2013-6-24 下午03:23:39
+    $Revision: 1.0
+    $Purpose:
 -->
 <a:screen xmlns:c="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true" trace="true">
     <a:init-procedure>
@@ -33,10 +33,10 @@
                 contentWindow = document.getElementById('mainFrame2_id').contentWindow,
                 tree_loading_flag = false,
                 first_loading_flag = true;
-            
-            
+
+
             // 获取项目编号
-            
+
             function get_project_number() {
                 var ds_id;
                 var base_table_temp = 'prj_project_ds';
@@ -47,7 +47,7 @@
                         ds_id = dsId;
                     }
                 }
-            
+
                 lock_tree_window();
                 var root_ds = contentWindow.$(ds_id);
                 var record = root_ds.getCurrentRecord();
@@ -79,7 +79,7 @@
                     scope: this
                 });
             }
-            
+
             function prj500_project_save(nextStep) {
                 var root_ds = contentWindow.$('${/parameter/@layout_code}_virtual_ds');
                 if (root_ds.validate()) {
@@ -105,7 +105,7 @@
                     }
                 });
             }
-            
+
             function prj501_get_windows_parameter(param_name) {
                 var value;
                 if (param_name == 'prj_report_read_flag') {
@@ -121,24 +121,24 @@
                 }
                 return value;
             }
-            
+
             function prj500_project_exit() {
                 $('${/parameter/@winid}').close();
             }
-            
+
             function prj500_project_save_exit() {
                 prj500_project_save(prj500_project_exit);
             }
-            
+
             function lock_tree_window() {
                 Leaf.Masker.mask($('${/parameter/@winid}').wrap, '${l:HLS.EXECUTING}');
             }
-            
+
             function unlock_tree_window() {
                 Leaf.Masker.unmask($('${/parameter/@winid}').wrap);
             }
             var ajax_flag = 'N';
-            
+
             function prj500n_project_submit_step() {
                 var ds_id = get_dsid_by_basetable(contentWindow.window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
                 var record = contentWindow.$(ds_id).getCurrentRecord();
@@ -185,7 +185,7 @@
                     unlock_tree_window();
                 });
             }
-            
+
             function prj500_project_submit() {
                 lock_tree_window();
                 var ds_id = get_dsid_by_basetable(contentWindow.window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
@@ -225,7 +225,7 @@
                         },
                         scope: this
                     });
-            
+
                 });
                 confirm_win.on('close', function() {
                     if (ajax_flag == 'N') {
@@ -233,10 +233,10 @@
                     }
                 });
             }
-            
-            
-              
-   /*          
+
+
+
+   /*
             function prj500_project_user_button_2() {
                  var url = $('downloadFile_id').getUrl() + '?table_name=PRJ_PROJECT_LEASE_ITEM&header_id=1';
                 new Leaf.Window({
@@ -246,17 +246,17 @@
                     width: 850,
                     height: 400
                 });
-               
+
             }
-            
+
              */
-            
-            
+
+
             function prj500_define_button(btn) {
                 var root_ds = contentWindow.$('${/parameter/@layout_code}_virtual_ds');
                 contentWindow.prj_define_button(btn, root_ds);
             }
-            
+
             function bind(para) {
                 var params = para.split('?');
                 var data = [];
@@ -267,11 +267,11 @@
                 }
                 return data.join('');
             }
-            
+
             function linkrenderer(text, record, node) {
                 return bind("<span style='cursor:pointer'>?</span>", text);
             }
-            
+
             function on_tree_click(tree, record) {
                 if (first_loading_flag) {
                     tree_loading_flag = false;
@@ -286,11 +286,11 @@
                     jump2(code);
                 }
             }
-            
+
             function jump2(id, parentId) {
                 mainIFrame2.open_tree_code_child(id, parentId);
             }
-            
+
             function jump(id, acc, index) {
                 if (mainIFrame2.open_tree_code) {
                     mainIFrame2.open_tree_code(id, acc, index);
@@ -303,7 +303,7 @@
                     });
                 }
             }
-            
+
             function on_accordion_beforeselect(acc, index) {
                 var code = acc.bodys.item(index).child('div[_data]').getAttribute('_data');
                 if (isLoaded) {
@@ -319,7 +319,7 @@
                 }
             }
 
-            
+
             function open_render_window(id, params, url, url_title) {
                 new Leaf.Window({
                     id: id,
@@ -426,12 +426,12 @@
 	            	record.set('cdd_list_id','${/parameter/@cdd_list_id}');
 	            	record.set('maintain_type','${/parameter/@maintain_type}');
 	            	record.set('default_value_dsid','${/parameter/@default_value_dsid}');
-	            	
+
 	            	if('${/parameter/@bp_id}'){
 	            	    record.set('bp_id_tenant','${/parameter/@bp_id}');
 	            	    record.set('bp_id_tenant_n','${/parameter/@bp_id_n}');
 	            	}
-	            	
+
 	            	record.set('declare_flag','Y');
 	            	record.set('_vh',vh);
 	            	record.set('_vw',vw);

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -36,7 +36,8 @@
         <a:link id="${/parameter/@layout_code}hls_bp_master_query_link"
                 url="${/request/@context_path}/modules/hls/HLS215N/hls_bp_master_query.lview"/>
 
-
+        <a:link id="${/parameter/@layout_code}contract_number_query_link"
+                url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <a:link id="${/parameter/@layout_code}_hls_fin_calc_get_base_rate_link_id"
                 model="hls.HLS500.hls_fin_calc_get_base_rate" modelaction="update"/>
         <a:link id="${/parameter/@layout_code}_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
@@ -50,7 +51,6 @@
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
         <script type="text/javascript"><![CDATA[
 
-
         window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
             Leaf.showConfirm('提示', '是否确认生成合同?', function () {
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
@@ -312,7 +312,30 @@
             hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}hls_bp_master_query_link', record.ds.id, '${/parameter/@layout_code}');
         }
 
-
+function prj501n_project_number_renderer(id, name, query_only){
+    var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+    var param = {};
+    param['bp_id'] = record.get('project_id');
+    param['bp_class'] = record.get('bp_class');
+    param['function_code'] = 'PRJ501D';
+    param['function_usage'] = 'QUERY';
+    param['maintain_type'] = 'READONLY';
+    param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
+    param['prj_bp_id'] = record.get('prj_bp_id');
+
+    hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}project_number_query_link', record.ds.id, '${/parameter/@layout_code}');
+}
+function prj501n_contract_number_renderer(id, name, query_only){
+    var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+    var param = {};
+    param['contract_id'] = record.get('contract_id');
+    param['function_code'] = 'CON301';
+    param['function_usage'] = 'QUERY';
+    param['winid'] = '${/parameter/@layout_code}_project_number_win_id';
+    param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+    hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}contract_number_query_link', record.ds.id, '${/parameter/@layout_code}');
+
+}
 
         //超链接渲染
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
@@ -345,7 +368,7 @@
                     return url;
 
                 }*/
-                if (value != null) {
+                if (value != null ) {
                     var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
                     var str = value.split(';;');
                     var url = '';
@@ -369,10 +392,17 @@
                     return url;
 
                 }
-            } else if (name = 'bp_link') {
+            } else if (name == 'bp_link' && !record.isNew) {
                 link_function = 'prj501n_bp_code_renderer';
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' +  config_record.get('prompt') + '</a>';
 
+            }else if(name=='project_number'){
+                link_function = 'prj501n_project_number_renderer';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
+
+            }else if(name =='contract_number'){
+                link_function = 'prj501n_contract_number_renderer';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value+ '</a>';
             }
         };
 
@@ -380,14 +410,17 @@
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+            var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1','prj_project');
+
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP','prj_project_bp');
-            var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_TENANT_INFO', 'prj_project_bp');
+            var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
             var cdd_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
             var virtual_ds_id =  '${/parameter/@layout_code}_virtual_ds';
             if (ds_id==ds.id || virtual_ds_id==ds.id) {
                 $(cdd_item_ds_id).query();
-                $(tenant_ds_id).query();
                 $(bp_ds_id).query();
+                $(tenant_ds_id).query();
+
             }
 
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -419,7 +452,9 @@
         //加载时调用(grid,table,gridBox)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
-
+          /*  var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_HISTORY_INFO_1', 'prj_project_bp');
+            $(bp_ds_ids).setQueryParameter('bp_id','${/parameter/@bp_id_tenant}');
+            $(bp_ds_ids).query();*/
             if (bp_ds_id == ds.id && bp_ds_id) {
                 if (record.get('bp_category') == 'TENANT') {
                     record.getField('bp_category_n').setReadOnly(true);
@@ -430,6 +465,8 @@
                     record.getField('bp_id_n').setReadOnly(true);
                 }
             }
+
+
         };
 
         //pdf预览  add by zhuxianfei
@@ -450,6 +487,41 @@
             });
         }
 
+
+        Leaf.onReady(function(){
+            var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
+       var  url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
+            $(bp_ds_id).setQueryUrl(url);
+            $(bp_ds_id).query();
+        })
+        //序号自增  add by lijingjing
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
+            //租赁物序号
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
+            if (ds_id == ds.id && ds_id) {
+                //设置序号
+                var measure_records = ds.getAll(),
+                    seq_num = 0;
+                if (measure_records.length) {
+                    for (var j = 0;j < measure_records.length;j++) {
+                        var measure_record = measure_records[j],
+                            rk = measure_record.get('lease_item_seq');
+                        if (seq_num <= rk) {
+                            seq_num = rk;
+                        }
+                    }
+                }
+                var rk_value = seq_num + 1;
+                record.set('lease_item_seq', rk_value);
+            }
+        };
+        //客户评分
+        window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function() {
+
+
+
+        }
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview

@@ -28,7 +28,6 @@
 
         function open_project_modify_win(record_id, ds_id) {
             var record = $(ds_id).findById(record_id);
-
             var project_status = record.get('project_status');
             //项目类layout_code
             if (record.get('document_type') == 'PRJ') {
@@ -42,12 +41,9 @@
                 param['maintain_type'] = maintain_type;
                 param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
                 param['layout_debugger_flag'] = 'Y';
-
                 hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
             } else if (record.get('document_type') == 'CARLS') {
                 if (record.get('project_status') != 'PRE_APPROVING') {
-
-
                     maintain_type = 'UPDATE';
                     param = record.data;
                     param['document_id'] = record.get('project_id');
@@ -55,15 +51,15 @@
                     param['function_usage'] = 'MODIFY';
                     param['bp_class'] = 'NP';
                     param['maintain_type'] = maintain_type;
+                    param['bp_id'] = record.get('bp_id');
                     param['prj_bp_id'] = record.get('prj_bp_id');
+                    param['bp_id_tenant'] = record.get('bp_id_tenant');
                     param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
                     hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
-
                 } else {
-
-
                     maintain_type = 'READONLY';
                     param = record.data;
+                    param['bp_id_tenant'] = record.get('bp_id_tenant');
                     param['document_id'] = record.get('project_id');
                     param['function_code'] = 'PRJ501D';
                     param['function_usage'] = 'QUERY';
@@ -72,14 +68,11 @@
                     param['prj_bp_id'] = record.get('prj_bp_id');
                     param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
                     hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
-
                 }
-
             }
         }
 
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
-
             if (name == 'project_number' && value) {
                 return '<a href="javascript:open_project_modify_win(\'' + record.id + '\',\'' + record.ds.id + '\')">' + value + '</a>';
             }