Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

 Conflicts:
	src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
	src/main/webapp/modules/cont/CON505/con_contract_modify.lview
	src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
	src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

src/main/database/Init/Layout_db_object/INITIALIZE_LAYOUT_DB_OBJECT.sql

@@ -22,6 +22,9 @@ values ('CONTRACT', 'CON_CONTRACT_REPO_MODIFY_LV', 'VIEW', -1, sysdate, -1, sysd
 insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
 values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate);
 
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate);
+
 end;
 /
 commit;

src/main/database/Register_function/REGISTER_ZJWFL5110.sql

@@ -9,6 +9,9 @@ set define off
 begin
 
     sys_function_assign_pkg.func_bm_load('ZJWFL5110','zjwfl.ZJWFL5110.cus_zj_wfl_instance_node_recipient');
+    sys_function_assign_pkg.func_bm_load('ZJWFL5110','basic.hls_bp_master_v_for_agent_lov');
+    sys_function_assign_pkg.func_bm_load('acr.ACR515.acr515_invoice_hd_v','acr.ACR515.acr515_invoice_hd_v');
+
 
 end;
 /

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm

@@ -13,6 +13,7 @@
         <bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID"/>
         <bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/>
         <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME" prompt="HLS.PROJECT_NAME"/>
+        <bm:field name="product_name_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME_DESC" forInsert="false" forUpdate="false"/>
         <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID"/>
         <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/>
         <bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME" prompt="HLS.CONTRACT_NAME"/>
@@ -91,7 +92,8 @@
 				       (select i.description
 				          from hls_cashflow_item i
 				         where i.cf_item = t.cf_item) as cf_item_desc,
-						decode(t.cf_item,250,'设备款','融资租赁费') as product_name,
+						decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费') as product_name,
+						decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费') as product_name_desc,
 				       con.contract_status contract_status,
 				       cf.cf_status cf_status,
 				       t.invoice_kind_type,

src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm

@@ -22,6 +22,7 @@
                           al.cashflow_id,
                           al.cf_item,
                           ah.document_number,
+
                           (Select c.contract_number
                            From con_contract c
                            Where c.contract_id = ah.contract_id)              contract_number,
@@ -100,15 +101,32 @@
                              and ctr.paid_byother_flag='T'
                              and cw.cf_item<>2
                              and nvl(ctr.guarantor_name_duty,'N')='N')paid_byother_sum_flag,
+                            (select aw.product_name from acr_invoice_batch_ln_wfl aw
+                            where ah.invoice_hd_wfl_id = aw.invoice_hd_wfl_id
+                             and rownum =1) product_name_n,
+                           (select v.code_value_id from sys_code_values_v v
+                           where
+                            v.code = 'ACR510_PRODUCT_NAME'
+                           And v.code_value = (select aw.product_name from acr_invoice_batch_ln_wfl aw
+                            where ah.invoice_hd_wfl_id = aw.invoice_hd_wfl_id
+                             and rownum =1)
+                           and v.code_enabled_flag = 'Y'
+                           and v.code_value_enabled_flag = 'Y') product_name_order,
                              null attachment
+
                       From acr_invoice_apply aa,
                           acr_invoice_hd_wfl ah,
                           acr_invoice_ln_wfl al,
-                          con_contract_cashflow cwo
+                          con_contract_cashflow cwo,
+                          sys_code_values_v v
                       Where aa.invoice_apply_id = ah.invoice_apply_id
                             And ah.invoice_hd_wfl_id = al.invoice_hd_wfl_id
                             And al.cashflow_id = cwo.cashflow_id(+)
-                      order by cwo.contract_id desc, cwo.times asc) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
+                            and  v.code = 'ACR510_PRODUCT_NAME'
+                           And v.code_value = al.product_name
+                           and v.code_enabled_flag = 'Y'
+                           and v.code_value_enabled_flag = 'Y'
+                      order by product_name_order asc,cwo.contract_id desc,cwo.times asc) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
 
                 ]]></bm:query-sql>
         </bm:operation>
@@ -127,6 +145,7 @@
         <bm:query-field name="bp_code" queryExpression="t1.bp_code = ${@bp_code}"/>
         <bm:query-field name="journal_month" queryExpression="t1.journal_month = ${@journal_month}"/>
         <bm:query-field name="paid_byother_flag_n" queryExpression="t1.paid_byother_flag = ${@paid_byother_flag}"/>
+        <bm:query-field name="product_name_n" queryExpression="t1.product_name_n = ${@product_name_n}"/>
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="t1.invoice_apply_id = ${@invoice_apply_id}"/>

src/main/webapp/WEB-INF/classes/check_after_save_bm/check_prj_lease_item.lwm

 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+        <!--
             $Author: lijingjing
             $Date: 2018-11_03 上午11:00:06
             $Revision: 3.0
             $Purpose:
--->
+        -->
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
-    <bm:operations>
+<bm:operations>
     <bm:operation name="update">
         <bm:update-sql><![CDATA[
                 begin
                     prj_project_check_pkg.check_prj_lease_item(
+                    p_project_id =>${@project_id},
                     p_machine_number =>${@machine_number},
                     p_user_id => ${/session/@user_id}
                     );
@@ -18,5 +19,5 @@
             ]]></bm:update-sql>
     </bm:operation>
 
-    </bm:operations>
+</bm:operations>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON731/get_bp_tenant_rate_detail.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<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.bp_birth, 'yyyy-mm-dd') bp_birth,
+       t.BP_MARRIAGE,
+       bp_marriage_n,
+       t.BP_HEALTH,
+       t.BP_HEALTH_n,
+       t.BP_BORN,
+       t.BP_BORN_n,
+       t.PROPERTY_BELONG,
+       t.PROPERTY_BELONG_n,
+       t.OWN_PROPERTY_ADDRESS,
+       t.HOUSE_AREA,
+       t.HOUSE_VALUE,
+       t.OWN_MONEY,
+       t.BANK_CREDIT_APPROVAL,
+       t.BANK_CREDIT_APPROVAL_n,
+       t.OTHER_OWN_ASSETS,
+       t.FAMILY_SOURCE_INCOME,
+       t.FAMILY_AVG_INCOME,
+       t.FAMILY_MONTH_AVG_OUTCOME,
+       t.BANK_LOAN,
+       t.OTHER_LOAN,
+       t.FIXED_ASSETS,
+       t.CAPITAL,
+       t.CAPITAL_PLACE,
+       t.CAR_TYPE,
+       t.CAR_BRAND,
+       t.CAR_NUM,
+       t.CAR_BUY_DATE,
+       t.CAR_BUY_MONEY,
+       t.WORK_EXPERIENCE,
+       t.WORK_EXPERIENCE_n,
+       t.WORK_OPERATOR,
+       t.WORK_OPERATOR_n,
+       t.WORK_TYPE,
+       t.WORK_TYPE_n,
+       t.WORK_AVG_MONTH_INCOME,
+       t.WORK_AVG_MONTH_OUTCOME,
+       t.OTHER_DESCRIPTION,
+       t.PAYMENT_SOURCE,
+       t.E_PLACE,
+       t.E_CONTRACT_AMOUNT,
+       t.CONTRACT_COPY,
+       t.CONTRACT_COPY_n,
+       t.E_CON_AUTHENTICITY,
+       t.E_CON_AUTHENTICITY_n,
+       t.SURVEY_FIT,
+       t.SURVEY_FIT_n,
+       t.DAILY_CREDIT,
+       t.DAILY_CREDIT_n,
+       t.BORROW_SITUATION,
+       t.BORROW_SITUATION_n,
+       t.RENT_REPAYMENT,
+       t.RENTAL_BALANCE,
+       t.LIQUIDATED_DAMAGES,
+       t.GUAR_MORTGAGE_STATUS,
+       t.GUAR_MORTGAGE_STATUS_n,
+       t.PAST_CONT_EXE_STATUS,
+       t.PAST_CONT_EXE_STATUS_n,
+       t.INDUSTRY_JUDGEMENT,
+       t.INDUSTRY_JUDGEMENT_n,
+       t.THIRD_PARTY_GUARANTEE,
+       t.THIRD_PARTY_GUARANTEE_n,
+       t.THIRD_PARTY_CREDIBILITY,
+       t.THIRD_PARTY_CREDIBILITY_n,
+       t.E_PLACE_n,
+       t.BP_AGE,
+       t.score_name,
+       t.third_guar_score
+  from (select a.*
+          from (select t1.bp_birth,
+                       t1.BP_MARRIAGE,
+                       t1.bp_marriage_n,
+                       t1.BP_HEALTH,
+                       t1.BP_HEALTH_n,
+                       t1.BP_BORN,
+                       t1.BP_BORN_n,
+                       t1.PROPERTY_BELONG,
+                       t1.PROPERTY_BELONG_n,
+                       t1.OWN_PROPERTY_ADDRESS,
+                       t1.HOUSE_AREA,
+                       t1.HOUSE_VALUE,
+                       t1.OWN_MONEY,
+                       t1.BANK_CREDIT_APPROVAL,
+                       t1.BANK_CREDIT_APPROVAL_n,
+                       t1.OTHER_OWN_ASSETS,
+                       t1.FAMILY_SOURCE_INCOME,
+                       t1.FAMILY_AVG_INCOME,
+                       t1.FAMILY_MONTH_AVG_OUTCOME,
+                       t1.BANK_LOAN,
+                       t1.OTHER_LOAN,
+                       t1.FIXED_ASSETS,
+                       t1.CAPITAL,
+                       t1.CAPITAL_PLACE,
+                       t1.CAR_TYPE,
+                       t1.CAR_BRAND,
+                       t1.CAR_NUM,
+                       t1.CAR_BUY_DATE,
+                       t1.CAR_BUY_MONEY,
+                       t1.WORK_EXPERIENCE,
+                       t1.WORK_EXPERIENCE_n,
+                       t1.WORK_OPERATOR,
+                       t1.WORK_OPERATOR_n,
+                       t1.WORK_TYPE,
+                       t1.WORK_TYPE_n,
+                       t1.WORK_AVG_MONTH_INCOME,
+                       t1.WORK_AVG_MONTH_OUTCOME,
+                       t1.OTHER_DESCRIPTION,
+                       t1.PAYMENT_SOURCE,
+                       t1.E_PLACE,
+                       t1.E_CONTRACT_AMOUNT,
+                       t1.CONTRACT_COPY,
+                       t1.CONTRACT_COPY_n,
+                       t1.E_CON_AUTHENTICITY,
+                       t1.E_CON_AUTHENTICITY_n,
+                       t1.SURVEY_FIT,
+                       t1.SURVEY_FIT_n,
+                       t1.DAILY_CREDIT,
+                       t1.DAILY_CREDIT_n,
+                       t1.BORROW_SITUATION,
+                       t1.BORROW_SITUATION_n,
+                       t1.RENT_REPAYMENT,
+                       t1.RENTAL_BALANCE,
+                       t1.LIQUIDATED_DAMAGES,
+                       t1.GUAR_MORTGAGE_STATUS,
+                       t1.GUAR_MORTGAGE_STATUS_n,
+                       t1.PAST_CONT_EXE_STATUS,
+                       t1.PAST_CONT_EXE_STATUS_n,
+                       t1.INDUSTRY_JUDGEMENT,
+                       t1.INDUSTRY_JUDGEMENT_n,
+                       t1.THIRD_PARTY_GUARANTEE,
+                       t1.THIRD_PARTY_GUARANTEE_n,
+                       t1.THIRD_PARTY_CREDIBILITY,
+                       t1.THIRD_PARTY_CREDIBILITY_n,
+                       t1.E_PLACE_n,
+                       t1.BP_AGE,
+                       t1.score_name,
+                       t1.third_guar_score,
+                       t1.tj_score
+                  from bp_tenant_rate_detail_v t1
+                 where exists
+                 (select 1
+                          from prj_project p
+                         where p.project_id = t1.PROJECT_ID
+                           and p.bp_id_tenant = ${@bp_id}
+                           and p.project_status not in ('CLOSED'))
+                 order by t1.project_id desc) a
+         where rownum = 1
+        union
+        SELECT h.date_of_birth bp_birth,
+               h.marital_status bp_marriage,
+               (SELECT code_value_name
+                  FROM sys_code_values_v
+                 WHERE code LIKE 'MARITAL_STATUS'
+                   AND code_value_enabled_flag = 'Y'
+                   AND code_value = h.marital_status) bp_marriage_n,
+               null BP_HEALTH,
+               null BP_HEALTH_n,
+
+               null BP_BORN,
+               null BP_BORN_n,
+               null PROPERTY_BELONG,
+               null PROPERTY_BELONG_n,
+               null OWN_PROPERTY_ADDRESS,
+               null HOUSE_AREA,
+               null HOUSE_VALUE,
+               null OWN_MONEY,
+               null BANK_CREDIT_APPROVAL,
+               null BANK_CREDIT_APPROVAL_n,
+               null OTHER_OWN_ASSETS,
+               null FAMILY_SOURCE_INCOME,
+               null FAMILY_AVG_INCOME,
+               null FAMILY_MONTH_AVG_OUTCOME,
+               null BANK_LOAN,
+               null OTHER_LOAN,
+               null FIXED_ASSETS,
+               null CAPITAL,
+               null CAPITAL_PLACE,
+               null CAR_TYPE,
+               null CAR_BRAND,
+               null CAR_NUM,
+               null CAR_BUY_DATE,
+               null CAR_BUY_MONEY,
+               null WORK_EXPERIENCE,
+               null WORK_EXPERIENCE_n,
+               null WORK_OPERATOR,
+               null WORK_OPERATOR_n,
+               h.industry work_type,
+               (SELECT code_value_name
+                  FROM sys_code_values_v
+                 WHERE code LIKE 'INDUSTRY_HL'
+                   AND code_value_enabled_flag = 'Y'
+                   AND code_value = h.industry) WORK_TYPE_n,
+               null WORK_AVG_MONTH_INCOME,
+               null WORK_AVG_MONTH_OUTCOME,
+               null OTHER_DESCRIPTION,
+               null PAYMENT_SOURCE,
+               null E_PLACE,
+               null E_CONTRACT_AMOUNT,
+               null CONTRACT_COPY,
+               null CONTRACT_COPY_n,
+               null E_CON_AUTHENTICITY,
+               null E_CON_AUTHENTICITY_n,
+               null SURVEY_FIT,
+               null SURVEY_FIT_n,
+               null DAILY_CREDIT,
+               null DAILY_CREDIT_n,
+               null BORROW_SITUATION,
+               null BORROW_SITUATION_n,
+               null RENT_REPAYMENT,
+               null RENTAL_BALANCE,
+               null LIQUIDATED_DAMAGES,
+               null GUAR_MORTGAGE_STATUS,
+               null GUAR_MORTGAGE_STATUS_n,
+               null PAST_CONT_EXE_STATUS,
+               null PAST_CONT_EXE_STATUS_n,
+               null INDUSTRY_JUDGEMENT,
+               null INDUSTRY_JUDGEMENT_n,
+               null THIRD_PARTY_GUARANTEE,
+               null THIRD_PARTY_GUARANTEE_n,
+               null THIRD_PARTY_CREDIBILITY,
+               null THIRD_PARTY_CREDIBILITY_n,
+               null E_PLACE_n,
+               null BP_AGE,
+               DECODE(h.bp_class, 'NP',h.bp_name, 'ORG', h.legal_person) score_name,
+               null third_guar_score,
+               null tj_score
+          FROM hls_bp_master h
+         where h.bp_id = ${@bp_id}) t
+ where rownum = 1
+
+
+]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+
+
+</bm:model>

src/main/webapp/WEB-INF/classes/layout/server_layout_common.lwm

@@ -110,6 +110,15 @@
                 }
             }
 
+            function remove_query_field(name) {
+                importClass(Packages.uncertain.composite.CompositeUtil);
+                var qf_root = $this.getObjectContext().getChild("query-fields");
+                var query_field = CompositeUtil.findChild(qf_root, "query-field", "field", name);
+                if (query_field) {
+                    qf_root.removeChild(query_field);
+                }
+            }
+            
             function import_server_bm_tplt() {
                 var cx = Packages.leaf.javascript.Context.getCurrentContext();
                 try {
@@ -255,7 +264,7 @@
             /*   println('===============================');
              println($ctx.parameter.authority_flag);
              println('===============================');
-             println($this.getObjectContext().toXML()); */
+             println($this.getObjectContext().toXML());*/
         ]]></s:bm-script>
     </bm:features>
     <bm:relations/>

src/main/webapp/WEB-INF/classes/prj/PRJ500D/bp_tenant_old_r_query.lwm

@@ -92,6 +92,9 @@
                                NULL,
                                NULL,
                                NULL,
+                               NULL,
+                               NULL,
+                               NULL,
                                NULL
                         FROM hls_bp_master h)
                   ORDER BY bp_detail_id DESC) t1

src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm

@@ -681,7 +681,84 @@
                 WHERE v.code = 'BRANCH_CODE_SZMP'
                 AND v.code_enabled_flag = 'Y'
                 AND v.code_value_enabled_flag = 'Y'
-                AND v.code_value = ct.branch_code) branch_code_n
+                AND v.code_value = ct.branch_code) branch_code_n,
+                (select decode(bp.bp_class, 'NP', '自然人', '法人')
+    from con_contract_bp bp
+   where bp.contract_id = ct.contract_id
+     and bp.bp_category = 'TENANT') bp_class_n,
+ (select b.description
+    from hls_business_type b
+   where b.business_type = ct.business_type) business_type_n,
+ NVL((Select h1.code_value_name value_name
+       From sys_code_values_v h1
+      Where h1.code = 'SECONDARY_LEASE'
+        And h1.code_enabled_flag = 'Y'
+        And h1.code_value_enabled_flag = 'Y'
+        AND H1.code_value = CT.SECONDARY_LEASE),
+     '否') SECONDARY_LEASE_N,
+ (select d.description from hls_division d where d.division = ct.division) division_n,
+ nvl((select '是'
+       from con_contract_change_req ccr
+      where ccr.contract_id = ct.contract_id
+        and ccr.req_status = 'APPROVED'
+        and ccr.document_type = 'LEASE_CHAG'
+        and rownum = 1),
+     '否') tenant_change_flag_n,
+     nvl((select '是'
+             from dual
+            where not exists (select 1
+                     from con_contract_cashflow ccc
+                    where ccc.cf_item = 1
+                      and ccc.times <= 12
+                      and ccc.contract_id = ct.contract_id
+                      and ccc.write_off_flag != 'FULL'
+                      and ccc.cf_direction = 'INFLOW')
+              and exists (select 1
+                     from con_contract_cashflow ccc
+                    where ccc.cf_item = 1
+                      and ccc.times = 12
+                      and ccc.contract_id = ct.contract_id
+                      and ccc.write_off_flag = 'FULL'
+                      and ccc.cf_direction = 'INFLOW')),
+           '否') rental_12_pay_flag,
+ nvl((select '是'
+             from con_contract_cashflow ccc
+            where ccc.cf_item = 9
+              and ccc.cf_direction = 'INFLOW'
+              and ccc.contract_id = ct.contract_id
+              and (ccc.due_amount > 0 or exists
+                   (select 1
+                      from CON_CONTRACT_CASE_RECORD    cr,
+                           CON_CONTRACT_PENALTY_REDUCE pr,
+                           CON_CONTRACT_PENALTY_INFO   pi
+                     where cr.record_id = pr.record_id
+                       and pr.penalty_reduce_id = pi.penalty_reduce_id
+                       and pr.contract_id = ccc.contract_id
+                       and pi.penalty_reduce_amount > 0
+                       and cr.status = 'APPROVED'))
+              and rownum = 1),
+           '否') cf_9_exists_flag,
+       nvl((select '是'
+             from con_contract_cashflow ccc
+            where ccc.cf_item = 9
+              and ccc.cf_direction = 'INFLOW'
+              and ccc.contract_id = ct.contract_id
+              and (ccc.due_amount > 0 or exists
+                   (select 1
+                      from CON_CONTRACT_CASE_RECORD    cr,
+                           CON_CONTRACT_PENALTY_REDUCE pr,
+                           CON_CONTRACT_PENALTY_INFO   pi,
+                           con_contract_cashflow       cf
+                     where cr.record_id = pr.record_id
+                       and pr.penalty_reduce_id = pi.penalty_reduce_id
+                       and pr.contract_id = ccc.contract_id
+                       and pi.penalty_reduce_amount > 0
+                       and cr.status = 'APPROVED'
+                       and pi.cashflow_id = cf.cashflow_id
+                       and cf.times > 1))
+              and ccc.times > 1
+              and rownum = 1),
+           '否') cf_9_notfirsttime_exists_flag
                     FROM con_contract ct
                     WHERE ct.contract_status NOT IN ('CANCEL')
                     AND ct.data_class = 'NORMAL'
@@ -753,6 +830,14 @@
         <bm:field name="residual_date"/>
         <bm:field name="terminate_date"/>
         <bm:field name="is_buyout_n"/>
+        <bm:field name="bp_class_n"/>
+        <bm:field name="business_type_n"/>
+        <bm:field name="division_n"/>
+        <bm:field name="tenant_change_flag_n"/>
+        <bm:field name="rental_12_pay_flag"/>
+        <bm:field name="cf_9_exists_flag"/>
+        <bm:field name="cf_9_notfirsttime_exists_flag"/>
+        <bm:field name="secondary_lease_n"/>
 
     </bm:fields>
     <!--    <bm:query-fields>-->

src/main/webapp/WEB-INF/classes/sys/SYS403/reminder_repayment_t5_sms_loop.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="SYS_SMS_LIST">
+    <bm:fields>
+        <bm:field name="sms_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SMS_ID" prompt="SYS_SMS_LIST.SMS_ID"/>
+        <bm:field name="sms_date" databaseType="DATE" datatype="java.util.Date" physicalName="SMS_DATE" prompt="SYS_SMS_LIST.SMS_DATE"/>
+        <bm:field name="priority" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PRIORITY" prompt="SYS_SMS_LIST.PRIORITY"/>
+        <bm:field name="phone_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PHONE_NUMBER" prompt="SYS_SMS_LIST.PHONE_NUMBER"/>
+        <bm:field name="text" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TEXT" prompt="SYS_SMS_LIST.TEXT"/>
+        <bm:field name="error_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ERROR_STATUS" prompt="SYS_SMS_LIST.ERROR_STATUS"/>
+        <bm:field name="error_msg" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ERROR_MSG" prompt="SYS_SMS_LIST.ERROR_MSG"/>
+        <bm:field name="status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="STATUS" prompt="SYS_SMS_LIST.STATUS"/>
+        <bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID" prompt="SYS_SMS_LIST.PROJECT_ID"/>
+        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="SYS_SMS_LIST.CONTRACT_NUMBER"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_NAME" prompt="SYS_SMS_LIST.BP_NAME"/>
+        <bm:field name="sms_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SMS_TYPE" prompt="SYS_SMS_LIST.SMS_TYPE"/>
+        <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID" prompt="SYS_SMS_LIST.CONTRACT_ID"/>
+        <bm:field name="batch_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BATCH_ID" prompt="SYS_SMS_LIST.BATCH_ID"/>
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+    </bm:features>
+    <bm:primary-key>
+        <bm:pk-field name="sms_id"/>
+    </bm:primary-key>
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            begin
+            hls_payment_msm_send_pkg.after_sys_sms_send_loop(p_sms_id =>${@sms_id},
+          										    p_send_result =>${@result},
+          											p_user_id =>${/session/@user_id});
+          											end;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters>
+        <bm:data-filter name="query" enforceOperations="query" expression="t1.status = &apos;NEW&apos; and t1.batch_id=${@batch_id}"/>
+    </bm:data-filters>
+</bm:model>

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

+remove_query_field('CONTRACT_ID');
+remove_datafilter('contract_id');
+var add_datafilters=[
+	{
+		name:'bp_id',
+		expression:'(t1.bp_id = ${@bp_id})'
+	}
+];
+
+add_datafilter();
\ No newline at end of file

src/main/webapp/WEB-INF/weblogic.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app">
-    <session-descriptor>
-        <cookie-name>JSESSIONID1</cookie-name>
-        <persistent-store-type>replicated_if_clustered</persistent-store-type>
-    </session-descriptor>
-    <container-descriptor>
-        <!--<prefer-web-inf-classes>true</prefer-web-inf-classes>-->
-        <prefer-application-packages>
-            <package-name>oracle.*</package-name>
-        </prefer-application-packages>
-        <show-archived-real-path-enabled>true</show-archived-real-path-enabled>
-    </container-descriptor>
-
-    <virtual-directory-mapping>
-        <local-path>/u01</local-path>
-        <url-pattern>/hls_file/*</url-pattern>
-    </virtual-directory-mapping>
-</weblogic-web-app>
\ No newline at end of file

src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview

@@ -81,9 +81,9 @@
             }
 
             var datas = ds.getJsonData();
-            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
+            Leaf.showConfirm('${l:HLS.PROMPT}','是否确认开票？',function()
             {
-                Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
+                Leaf.Masker.mask(Ext.getBody(),'${l:HLS.EXECUTING}');
                 Leaf.request({
                     url: $('svcLink_create_invoice').getUrl(),
                     para: datas,
@@ -92,7 +92,7 @@
                         createScreen_close();
                         contractDs_grid_query();
                     },
-                    failure: function() {
+                    failure: function(){
                         Leaf.Masker.unmask(Ext.getBody());
 
                     },
@@ -154,6 +154,7 @@
             <a:dataSet id="invoiceKindDs">
                 <a:datas dataSource="/model/acr512_invoice_kind_type"/>
             </a:dataSet>
+            <a:dataSet id="product_name_ds" lookupCode="ACR510_PRODUCT_NAME"/>
             <a:dataSet id="headDs" autoCreate="true">
                 <a:fields>
                     <a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
@@ -166,7 +167,9 @@
             <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
                 <a:fields>
                     <a:field name="billing_amount" required="true"/>
-                    <a:field name="product_name" required="true"/>
+<!--                    <a:field name="product_name" required="true"/>-->
+
+                    <a:field name="product_name" displayField="code_value_name" options="product_name_ds" returnField="p_name" valueField="code_value"/>
                     <!--<a:field name="invoice_kind"/>
                     <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>-->
                     <a:field name="invoice_kind_type"/>
@@ -199,7 +202,7 @@
                                 <a:column name="contract_number" width="150"/>
                                 <a:column name="times" align="right" width="40"/>
                                 <a:column name="cf_item_desc"/>
-                                <a:column name="product_name" editor="selectedDs_grid_editor_tf" width="150"/>
+                                <a:column name="product_name" editor="selectedDs_grid_editor_tf_box" width="150"/>
                                 <!--<a:column name="invoice_kind_desc" editor="selectedDs_grid_editor_comb"/>-->
                                 <a:column name="invoice_kind_type_n" editorFunction="" editor="selectedDs_grid_editor_comb" width="150"/>
                                 <a:column name="billing_object_name" width="150"/>
@@ -219,6 +222,7 @@
                                     </a:events>
                                 </a:comboBox>
                                 <a:textField id="selectedDs_grid_editor_tf"/>
+                                <a:comboBox id="selectedDs_grid_editor_tf_box"/>
                                 <a:numberField id="selectedDs_grid_editor_nf"/>
                             </a:editors>
                         </a:grid>

src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview

@@ -359,7 +359,7 @@
                 <a:datas dataSource="/model/acr515_currency_list"/>
             </a:dataSet>
 
-            <a:dataSet id="acr515_invoiceVatParaDs" autoCreate="true" model="acr.acr_invoice_hd_v">
+            <a:dataSet id="acr515_invoiceVatParaDs" autoCreate="true" model="acr.ACR515.acr515_invoice_hd_v">
                 <a:fields>
                     <a:field name="currency_desc" displayField="currency_name" options="acr515_currencyDs"
                              returnField="currency" valueField="currency_code"/>
@@ -443,7 +443,7 @@
                     <a:event name="update" handler="onUpdate_acr515_invoiceVatParaDs"/>
                 </a:events>
             </a:dataSet>
-            <a:dataSet id="acr515_invoiceVatDs" autoPageSize="true" maxPageSize="10000" model="acr.acr_invoice_hd_v"
+            <a:dataSet id="acr515_invoiceVatDs" autoPageSize="true" maxPageSize="10000" model="acr.ACR515.acr515_invoice_hd_v"
                        queryDataSet="acr515_invoiceVatParaDs" selectable="true">
                 <a:fields><![CDATA[
                     ]]></a:fields>

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -69,6 +69,15 @@
                     record.getField('signer_n').setRequired(false);
                     record.set('signer_n','');
                 }
+                if(record.get('division')=='70'){
+                    record.getField('deposit_deduct').setRequired(true);
+                }else {
+                    debugger;
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCT').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_LEFT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_LEFT').style.display = 'none';
+                }
             }
         };
 
@@ -102,10 +111,24 @@
                         }, 5);
                         return;
                     }
-                    record.set('et_total_amount', plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), value));
+                    var deposit_deduct =record.get('deposit_deduct')||0;
+                    var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), value);
+                    record.set('et_total_amount',minus(et_total_amount_result,deposit_deduct));
 
                 }
-
+                if(name == 'deposit_deduct'){
+                    var ccr_penalty =record.get('ccr_penalty')||0;
+                    var deposit_left=record.get('deposit_left')||0;
+                    if (value >deposit_left || value < 0  || value == NaN || value == undefined) {
+                        Leaf.showMessage('${l:HLS.PROMPT}', '保证金抵扣金额不能超过保证金余额！');
+                        setTimeout(function () {
+                            record.set('deposit_deduct',0);
+                        }, 5);
+                        return;
+                    };
+                    var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), ccr_penalty);
+                    record.set('et_total_amount',minus(et_total_amount_result,value));
+                }
                 if (name == 'termination_date' && value) {
                     // 根据结清日计算结清相关金额字段
                     Leaf.request({
@@ -126,7 +149,8 @@
                         },
                         success: function (res) {
                             //record.set('et_fee', res.result.et_fee);
-                            record.set('et_total_amount', res.result.et_total_amount);
+                            var deposit_deduct =record.get('deposit_deduct')||0;
+                            record.set('et_total_amount', minus(res.result.et_total_amount,deposit_deduct));
                             record.set('et_due_amount', res.result.et_due_amount);
                             record.set('overdue_amount', res.result.overdue_amount || 0);
                             record.set('penalty', res.result.penalty || 0);

src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview

@@ -47,6 +47,15 @@
         };
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            if (ds.id == ds_id) {
+                if(record.get('division')=='70'){
+                    record.getField('deposit_deduct').setRequired(true);
+                }else{
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEPOSIT_DEDUCT_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEPOSIT_DEDUCT').style.display = 'none';
+                }
+            }
             if('${/parameter/@function_code}'=='CON_REPO001D') {
 
                 var repurchase_types = record.get('repurchase_types');
@@ -230,7 +239,8 @@
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
                     repurchase_tatal_amount=plus(repurchase_tatal_amount,value||0);
-                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 // 手续费
@@ -238,7 +248,25 @@
                     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, value || 0), record.get('fund_possession_cost') || 0);
-                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
+                    record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                }
+                //保证金抵扣金额
+                if(name =='deposit_deduct'&&value>=0){
+                    var deposit_left=record.get('deposit_left') || 0;
+                    if (value >deposit_left || value == NaN || value == undefined) {
+                        Leaf.showMessage('${l:HLS.PROMPT}', '保证金抵扣金额不能超过保证金余额！');
+                        setTimeout(function () {
+                            record.set('deposit_deduct',old_value);
+                        }, 5);
+                        return;
+                    };
+                    var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
+                        , record.get('residual_value') || 0);
+                    var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 // 资金占用费value
@@ -246,7 +274,8 @@
                     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), value || 0);
-                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 //逾期租金
@@ -254,7 +283,8 @@
                     var repurchase_count_amount = plus(plus(plus(value || 0, record.get('ccr_due_amount') || 0), record.get('sum_unreceived_principal') || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 //剩余本金
@@ -262,11 +292,11 @@
                     var repurchase_count_amount = plus(plus(plus(record.get('sum_overdue_amount') || 0, record.get('ccr_due_amount') || 0), value || 0)
                         , record.get('residual_value') || 0);
                     var repurchase_tatal_amount = plus(plus(repurchase_count_amount, record.get('repurchase_service_charges') || 0), record.get('fund_possession_cost') || 0);
-                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
+                    var deposit_deduct_tatol_amount=plus(depoist_remaining_amount,record.get('deposit_deduct') || 0);
+                    record.set('repurchase_tatal_amount', minus(repurchase_tatal_amount, deposit_deduct_tatol_amount));
                     record.set('repurchase_count_amount', minus(repurchase_tatal_amount, depoist_remaining_amount));
                 }
                 if (name == 'repurchase_date' && value) {
-                    debugger;
                     Leaf.request({
                         url: $('con_repo001_calc_repo_date_amount_link').getUrl(),
                         para: {
@@ -274,7 +304,6 @@
                             repurchase_date: value
                         },
                         success: function (res) {
-                            debugger;
                             //add by lihh 20210329原合同应收剩余金额取值
                             var rec_residue_amount;
                             record.set('last_rent_due_date', res.result.last_rent_due_date);
@@ -322,7 +351,6 @@
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
             // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            debugger;
             // var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract');
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
             var req_reason_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract_change_req');
@@ -389,7 +417,6 @@
 
         //报价计算
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
-            debugger;
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var ds_id_head = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'con_contract');
             var cashflow_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
@@ -440,7 +467,6 @@
                             'contract_id': record.get('contract_id')
                         },
                         success: function(res) {
-                               debugger;
                             window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                             if (calc_session_id) {
                                 //直接进入报价页面

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

@@ -11,7 +11,7 @@
         <!-- <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv" rootPath="user_name_path"/> -->
         <a:model-query fetchAll="true" model="hls.HLS303.hls_bp_agentemployee_id" rootPath="employee_id_path"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.amount_check" rootPath="amount_check"/>
-        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
+        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;,&apos;0019&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
         <s:server-script import="contract_print_path.js"><![CDATA[
@@ -292,7 +292,11 @@
                 if('${/model/role_flag_path/record/@sys_role_flag}' == 'Y') {
                     url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                 }else{
+                    if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
                         url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    } else {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                 }
                 var win = new Leaf.Window({
                     url: url,
@@ -384,6 +388,18 @@
             }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
+                    if(division!='70'){
+                        //非铁甲排除铁甲必填
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'contract_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&& key != 'tj_score' ) {
+                            if(!bp_tenant_detail_r.get(key)){
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
+                        }
+                    }else{
                         if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'contract_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score' ) {
                             if(!bp_tenant_detail_r.get(key)){
                                 Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
@@ -394,6 +410,8 @@
                             }
                         }
                     }
+
+                }
             }
             if(!bp_rate_flag){
                 return false;
@@ -443,7 +461,7 @@
             window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
                 link_function = 'prj501n_upload_file';
-                if(record.get('cdd_item') == 'ADD_ATTACH'){
+                if(record.get('cdd_item') == 'ADD_ATTACH'||record.get('cdd_item') == 'TJ_SCORE_SHEET'){
                     link_function = 'prj501n_upload_file_new';
                 }
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
@@ -695,14 +713,13 @@
                 //获取员工类型
                 var description = '${/model/description/record/@employee_type_code}';
                 var bp_code='${/model/user_agent_description/record/@bp_code}';
-                if(division=='80'){
+                if(division=='80'||division=='30'||division=='50'){
                     record.set('credit_line','TENANT');
                     record.set('credit_line_n','承租人');
-                }
-                if(!Ext.isEmpty(description) && description == 'AGENT'){
+                }else if(!Ext.isEmpty(description) && description == 'AGENT'){
                     if(!Ext.isEmpty(bp_code)){
-                        if(bp_code !== 'D00000029' && bp_code !== 'D00000031' && bp_code !== 'D00000026' && bp_code !== 'D00000030'){
-                            if(bp_code =='X00010005' || bp_code =='J00010006'){
+                        if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){
+                            if(bp_code =='D00010001'){
                                 record.set('credit_line','TENANT');
                                 record.set('credit_line_n','承租人');
                                 record.getField('credit_line').setRequired(false);
@@ -730,9 +747,18 @@
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
                     record.getField('deduction_limit').setRequired(false);
                 }
-            }
                 document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
                 document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
+            }
+
+            //add by wangwei 非铁甲业务隐藏铁甲评分
+            var bp_tenant_rate_detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'bp_tenant_rate_detail');
+            if (bp_tenant_rate_detail_ds_id == ds.id && bp_tenant_rate_detail_ds_id) {
+                if (division != '70' && division != '') {
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
+                }
+            }
         };
 
         //更新时调用
@@ -970,7 +996,6 @@
             }
             document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
             document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
-
         };
 
 

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

@@ -10,7 +10,7 @@
     <a:init-procedure>
         <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv"
                        rootPath="user_name_path"/>
-        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
+        <a:model-query defaultWhereClause="v.role_id = ${/session/@role_id} and v.role_code in (&apos;HAND&apos;,&apos;0017&apos;,&apos;0019&apos;)" model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
         <s:server-script import="contract_print_path.js"><![CDATA[
             $ctx.parameter.file_path = con_print_path['con_print_path'];
             $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
@@ -251,7 +251,11 @@
                 if('${/model/role_flag_path/record/@sys_role_flag}' == 'Y') {
                     url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
                 }else{
+                    if (query_only == 'Y' || '${/parameter/@function_usage}' == 'QUERY') {
                         url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    } else {
+                        url = $('${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id').getUrl() + '?table_name=PRJ_CDD_ITEM_CHECK&header_id=' + record.get('check_id');
+                    }
                 }
                 var win = new Leaf.Window({
                     url: url,
@@ -302,7 +306,7 @@
             window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
                 link_function = 'prj501n_upload_file';
-                if(record.get('cdd_item') == 'ADD_ATTACH'){
+                if(record.get('cdd_item') == 'ADD_ATTACH'||record.get('cdd_item') == 'TJ_SCORE_SHEET'){
                     link_function = 'prj501n_upload_file_new';
                 }
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';

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

@@ -326,16 +326,30 @@
             }
             if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
                 for (var key in bp_tenant_detail_r.data) {
-                    if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n') {
+                    if(division!='70'){
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score'&&key != 'tj_score') {
                             //if(!bp_tenant_detail_r.get(key)){
-                        if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)=== "") {
-                            Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方信用度\"外，其他都为必输字段，请填写！");
+                            if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
                                 bp_rate_flag = false;
                                 break;
                             }else{
                                 bp_rate_flag = true;
                             }
                         }
+                    } else{
+                        if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' &&  key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score') {
+                            //if(!bp_tenant_detail_r.get(key)){
+                            if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
+                                Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
+                                bp_rate_flag = false;
+                                break;
+                            }else{
+                                bp_rate_flag = true;
+                            }
+                        }
+                    }
+
                 }
             }
             if(!bp_rate_flag){
@@ -541,15 +555,18 @@
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
             if(lease_item_ds_id == ds.id &&lease_item_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(division=='70'){
+                if(division=='70'&&division!=''){
                     debugger;
                     if(record!=''){
                         record.getField('lease_name_n').setRequired(true);
                         record.getField('brand_value').setRequired(true);
+                        record.getField('produce_date').setReadOnly(false);
                         record.getField('produce_date').setRequired(true);
                         record.getField('using_hour').setRequired(true);
                         record.getField('modelcd').setReadOnly(false);
                         record.getField('modelcd').setRequired(true);
+                        record.getField('ownership_flag_n').setRequired(true);
+                        record.getField('residual_value_amount').setRequired(true);
                         record.getField('full_name').setRequired(false);
                         record.getField('full_name_n').setRequired(false);
                     }else {
@@ -562,7 +579,7 @@
                     $(gridId).hideColumn('item_type_n');
                     $(gridId).hideColumn('equipment_type_n');
                     $(gridId).hideColumn('machine_number');
-                }else {
+                }else if(division!=''){
                     $(gridId).hideColumn('machine_number_70');
                     $(gridId).hideColumn('lease_name_n');
                     $(gridId).hideColumn('brand_value');
@@ -772,9 +789,16 @@
         }
         var division='';
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
-           debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
+            //add by wangwei 非铁甲业务隐藏铁甲评分
+            var bp_tenant_rate_detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'bp_tenant_rate_detail');
+            if (bp_tenant_rate_detail_ds_id == ds.id && bp_tenant_rate_detail_ds_id) {
+                if (division != '70' && division != '') {
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
+                    document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
+                }
+            }
             if (ds_id == ds.id && ds_id) {
                 division=record.get('division');
                 if (record.get('pay_method') == 'WIRE_TRANSFER') {
@@ -858,7 +882,7 @@
                 var credit_record = $(ds_id).getCurrentRecord();
                 if(!Ext.isEmpty(create_bp_code)){
                     debugger;
-                        if(create_bp_code == 'D00000029' || create_bp_code == 'D00000026' || create_bp_code == 'D00000030' || create_bp_code == 'D00000031'){
+                    if(create_bp_code == 'C00010180' || create_bp_code == 'C00010175' || create_bp_code == 'C00010176' || create_bp_code == 'C00010187'){
                         if('${/parameter/@editable_flag}' == 'Y' || '${/parameter/@editable_flag}' == 'YE'){
                             credit_record.getField('credit_line').setReadOnly(false);
                             credit_record.getField('credit_line_n').setReadOnly(false);
@@ -868,7 +892,7 @@
                         }else {
                             document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
                         }
-                        }else if(create_bp_code =='X00010005' || create_bp_code =='J00010006') {
+                    }else if(create_bp_code =='D00010001') {
                         credit_record.getField('credit_line').setReadOnly(true);
                         credit_record.getField('credit_line_n').setReadOnly(true);
                         credit_record.getField('credit_line').setRequired(false);
@@ -959,9 +983,9 @@
             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
             if('${/parameter/@function_usage}' == 'QUERY' && '${/parameter/@editable_flag}' != 'YE' && '${/parameter/@editable_flag}' != 'Y' ){
-                debugger;
                 document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
             }
+
         };
         if('${/parameter/@editable_flag}' == 'Y' || '${/parameter/@editable_flag}' == 'YE'){
             zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
@@ -993,15 +1017,20 @@
                 if(division=='70'){
                     record.getField('lease_name_n').setRequired(true);
                     record.getField('brand_value').setRequired(true);
+                    record.getField('produce_date').setReadOnly(false);
                     record.getField('produce_date').setRequired(true);
-                    record.getField('machine_number_70').setRequired(true);
                     record.getField('using_hour').setRequired(true);
+                    record.getField('machine_number_70').setRequired(true);
                     record.getField('modelcd').setReadOnly(false);
                     record.getField('modelcd').setRequired(true);
                     record.getField('full_name').setRequired(false);
                     record.getField('full_name_n').setRequired(false);
+                    record.getField('ownership_flag_n').setRequired(true);
+                    record.getField('residual_value_amount').setRequired(true);
                     if(name=='lease_name_n'){
                         record.data.type_name=value;
+                    }else if(name=='modelcd'){
+                        record.data.pattern=value;
                     }
                 }else {
                     record.getField('modelcd').setReadOnly(true);
@@ -1185,6 +1214,15 @@
                         record.set('bp_age', jsGetAge(value.format('yyyy-mm-dd').toString()));
                     }
                 }
+                if(name=='third_guar_score'&&!Ext.isEmpty(value)){
+                    if(value<0||value>10){
+                        setTimeout(function () {
+                            record.set('third_guar_score', '');
+                        }, 0);
+                        Leaf.showInfoMessage("提示", "第三方担保附件分数范围为0-10，请重新输入！");
+
+                    }
+                }
             }
             var device_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_SCORE_DEVICE', 'bp_tenant_rate_item');
             if (device_ds_id == ds.id) {

src/main/webapp/modules/rpt/RPT5012/rpt5012_repory_query.lview

@@ -191,6 +191,48 @@
                         </a:columns>
                     </a:grid>
                 </a:tab>
+
+                <a:tab prompt="租金余额表" width="150">
+                    <a:grid id="con_contract_rental_result_add_grid" bindTarget="con_contract_rental_result_ds" marginHeight="115" navBar="true" marginWidth="30">
+                        <a:columns>
+                            <a:column name="agent_extra_name" align="center" prompt="代理店" width="120"/>
+                            <a:column name="bp_tenant_name" align="center" prompt="客户名称" width="120"/>
+                            <a:column name="contract_number" align="center" prompt="合同编号" width="100"/>
+                            <a:column name="lease_start_date" align="center" prompt="租赁期开始日" width="80"/>
+                            <a:column name="branch_code_n" align="center" prompt="分公司"  width="100"/>
+                            <a:column name="large_balance_n" align="center" prompt="大额尾款"  width="100"/>
+                            <a:column name="is_buyout_n" align="center" prompt="是否买断机"  width="100"/>
+                            <a:column name="modelcd" align="center" prompt=" 机型" width="180"/>
+                            <a:column name="machine_number" align="center" prompt="机器号码"  width="80"/>
+                            <a:column name="int_rate_display" exportDataFormat="" align="center" prompt="利率"  width="80"/>
+                            <a:column name="int_rate_display" align="center" prompt="基准利率"  width="80"/>
+                            <a:column name="lease_times" align="center" prompt="租赁期间"  width="80"/>
+                            <a:column name="down_payment_ratio" align="center" prompt="首付款比率" width="80"/>
+                            <a:column name="lease_item_amount" align="center" prompt="代理店销售金额" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="residual_amount" align="center" prompt="留购价格" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="contract_amount" align="center" prompt="合同总金额" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="down_payment" align="center" prompt="首付款" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="month_due_amount_after" align="center" prompt="当月末应收款余额（合计）" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="month_due_principal_after" align="center" prompt="当月末本金余额（合计）" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="month_interest_after" align="center" prompt="当月末利息余额（合计）" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="month_residual" align="center" prompt="当月末留购金余额" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="business_due_times_after" align="center" prompt="逾期期数"  width="80"/>
+                            <a:column name="business_due_amount_after" align="center" prompt="当月末逾期金额（合计）" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="deposit_amount" align="center" prompt="保证金" renderer="Leaf.formatMoney" width="80"/>
+                            <a:column name="contract_status_n" align="center" prompt="合同状态"  width="80"/>
+                            <a:column name="residual_date" align="center" prompt="合同终了"  width="80"/>
+                            <a:column name="terminate_date" align="center" prompt="结清年月"  width="80"/>
+                            <a:column name="bp_class_n" align="center" prompt="商业伙伴分类"  width="80"/>
+                            <a:column name="business_type_n" align="center" prompt="业务类型"  width="80"/>
+                            <a:column name="division_n" align="center" prompt="租赁物"  width="80"/>
+                            <a:column name="secondary_lease_n" align="center" prompt="二次租赁"  width="80"/>
+                            <a:column name="tenant_change_flag_n" align="center" prompt="承租人变更"  width="80"/>
+                            <a:column name="rental_12_pay_flag" align="center" prompt="是否已履约12期及以上"  width="160"/>
+                            <a:column name="cf_9_exists_flag" align="center" prompt="是否有违约金记录产生"  width="160"/>
+                            <a:column name="cf_9_notfirsttime_exists_flag" align="center" prompt="除第1期外是否有违约金记录产生"  width="160"/>
+                        </a:columns>
+                    </a:grid>
+                </a:tab>
             </a:tabs>
             </a:tabPanel>
         </a:screenBody>

src/main/webapp/modules/sys/SYS403/reminder_repayment_t5_sms_list.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:p="uncertain.proc"
+           xmlns:a="http://www.leaf-framework.org/application"
+           xmlns:s="leaf.plugin.script"
+           trace="true">
+
+    <a:init-procedure>
+        <s:server-script><![CDATA[
+            importPackage(Packages.java.util)
+            importPackage(Packages.com.hand.hls.hlcm.emay);
+            importPackage(Packages.com.hand.hap.system.dto)
+
+            //step2 发送短信
+            function sendsms() {
+                // 查询待发送短信表
+                var contract_collection = $bm('sys.SYS403.reminder_repayment_t5_sms_list');
+                contract_collection.update();
+
+                var sms_list_bm = $bm('sys.SYS403.reminder_repayment_t5_sms_loop');
+
+                var sms_result = sms_list_bm.queryAsMap({
+                         batch_id: $ctx.parameter.batch_id
+                    });
+                var sms_list_records = sms_result.getChildren();
+
+                for (var i = 0; i < sms_list_records.length; i++) {
+                    var Phones = sms_list_records[i].phone_number;
+                    var content = sms_list_records[i].text;
+                    var sms_id = sms_list_records[i].sms_id;
+                    try {
+                        var example = new Example();
+                        var result = example.setSingleSms(content, Phones);
+                        var req_response = result.toString();
+                    } catch (e) {
+                        println("抛出异常：" + e);
+                    }
+                    //发送后请求更新
+                    $bm('sys.SYS403.reminder_repayment_t5_sms_loop').update({
+                                                            sms_id: sms_id,
+                                                            result: req_response
+                    });
+                }
+            }
+            sendsms();
+        ]]></s:server-script>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
\ No newline at end of file

src/main/webapp/modules/sys/SYS403/sms_batch_send.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:p="uncertain.proc"
+           xmlns:a="http://www.leaf-framework.org/application"
+           xmlns:s="leaf.plugin.script"
+           trace="true">
+
+    <a:init-procedure>
+        <s:server-script><![CDATA[
+            importPackage(Packages.java.util);
+            importPackage(Packages.com.hand.hls.hlcm.emay);
+            importPackage(Packages.com.hand.hap.system.dto);
+
+            //step2 发送短信
+            function sendsms() {
+                // 查询待发送短信表
+                var sms_list_bm = $bm('sys.SYS403.reminder_repayment_t5_sms_loop');
+                var sms_list_result = sms_list_bm.queryAsMap({
+                                            "batch_id": $ctx.parameter.batch_id
+                                        });
+                var sms_list_records = sms_list_result.getChildren();
+                for (var i = 0; i < sms_list_records.length; i++) {
+                    var Phones = sms_list_records[i].phone_number;
+                    var content = sms_list_records[i].text;
+                    var sms_id = sms_list_records[i].sms_id;
+                    try {
+                        var example = new Example();
+                        var result = example.setSingleSms(content, Phones);
+                        var req_response = result.toString();
+                    } catch (e) {
+                        println("抛出异常：" + e);
+                    }
+                    //发送后请求更新
+                    $bm('sys.SYS403.reminder_repayment_t5_sms_loop').update({
+                                                            sms_id: sms_id,
+                                                            result: req_response
+                    });
+                }
+            }
+            sendsms();
+    ]]></s:server-script>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
\ No newline at end of file