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

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

@@ -19,6 +19,7 @@
         <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="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXTRA_NAM"/>
         <!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
     </bm:fields>
     <bm:features>
@@ -40,7 +41,8 @@
     <bm:data-filters>
         <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-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id  and br.enabled_flag = 'Y'   and br.bp_category in('TENANT','AGENT','RENTER','MAN_FACTURER') and br.bp_type in('TENANT','AGENT','RENTER','MAN_FACTURER')))"/>
-        <bm:data-filter name="query" expression="(exists (select 1 from con_contract_bp bp, con_contract cc  where bp.contract_id = cc.contract_id and bp.bp_id = t1.bp_id and cc.data_class = 'NORMAL' ))"/>
+		<bm:data-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT','RENTER','MAN_FACTURER') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id  and br.enabled_flag = 'Y'   and br.bp_category in('TENANT','AGENT','RENTER','MAN_FACTURER') and br.bp_type in('TENANT','AGENT','RENTER','MAN_FACTURER')))"/>
+        <!--<bm:data-filter name="query" expression="(exists (select 1 from con_contract_bp bp, con_contract cc  where bp.contract_id = cc.contract_id and bp.bp_id = t1.bp_id and cc.data_class = 'NORMAL' ))"/>-->
+       <bm:data-filter name="query" expression="(t1.sbo_bp_status=&apos;Y&apos;)"/>
     </bm:data-filters>
 </bm:model>

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

@@ -41,7 +41,7 @@
         <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-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT','VENDER','RENTER','MAN_FACTURER') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id  and br.enabled_flag = 'Y'   and br.bp_category in('TENANT','AGENT','VENDER','RENTER','MAN_FACTURER') and br.bp_type in('TENANT','AGENT','VENDER','RENTER','MAN_FACTURER')))"/>
-        <bm:data-filter name="query" expression="(exists (select 1 from con_contract_bp bp, con_contract cc  where bp.contract_id = cc.contract_id and bp.bp_id = t1.bp_id and cc.data_class = 'NORMAL' ))"/>
-
+        <!--<bm:data-filter name="query" expression="(exists (select 1 from con_contract_bp bp, con_contract cc  where bp.contract_id = cc.contract_id and bp.bp_id = t1.bp_id and cc.data_class = 'NORMAL' ))"/>-->
+       <bm:data-filter name="query" expression="(t1.sbo_bp_status=&apos;Y&apos;)"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON1380/con1380_result_query_job.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+		        begin
+		           hlcm_monthly_report_pkg.query_hlcm_monthly_report_job(
+		                                                       p_user_id  =>${/session/@user_id}
+		                             );
+		        end;
+        ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+		        begin
+		           hlcm_monthly_report_pkg.insert_hlcm_monthly_report_job(
+		                                                       p_month =>${@month},
+		                                                       p_user_id  =>${/session/@user_id}
+		                             );
+		        end;
+        ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -37,7 +37,7 @@
         <!--<bm:field name="bp_vender" expression="(select bp_name from hls_bp_master where bp_id=t1.bp_id_vender and enabled_flag=&apos;Y&apos;)" forInsert="false" forUpdate="false"/>-->
         <bm:field name="lease_organization_desc" expression="(select description from hls_lease_organization where lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/>
         <!--<bm:field name="owner_user_id_n" expression="(select description from sys_user where user_id = t1.created_by)" forInsert="false" forUpdate="false"/>-->
-        <bm:field name="is_terminate" expression="(CASE WHEN ((select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item&lt;&gt;0 and ccc.cf_item&lt;&gt;40) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item&lt;&gt;0 and ccc.cf_item&lt;&gt;40 )) = 0 THEN &apos;是&apos; ELSE &apos;否&apos; END)" forInsert="false" forUpdate="false"/>
+        <bm:field name="is_terminate" expression="(CASE WHEN ((select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item not in(0,40,911)) - (select sum(ccc.received_amount) from con_contract_cashflow ccc where ccc.contract_id = t1.contract_id AND ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item not in(0,40,911))) = 0 THEN &apos;是&apos; ELSE &apos;否&apos; END)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_total" expression="(select sum(ccc.due_amount) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and ccc.cf_item=1)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_principal" expression="(select sum(nvl(ccc.principal,0)) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos;)" forInsert="false" forUpdate="false"/>
         <bm:field name="amount_interest" expression="(select sum(nvl(ccc.interest,0)) from con_contract_cashflow ccc where ccc.contract_id=t1.contract_id and ccc.cf_status&lt;&gt;&apos;BLOCK&apos; and cf_item=1)" forInsert="false" forUpdate="false"/>

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm

@@ -701,7 +701,7 @@
                 nvl(a1.end_date, trunc(SYSDATE))
                 AND a1.user_id = a2.owner_user_id
                 AND a1.trx_category = a2.trx_category
-                AND a2.authorized_user_id = 1
+                AND a2.authorized_user_id = ${/session/@user_id}
                 AND trunc(SYSDATE) BETWEEN a2.start_date AND
                 nvl(a2.end_date, trunc(SYSDATE))))
                 And ((decode(1, 10600, 1, 2) = 1
@@ -776,6 +776,7 @@
         <!-- <bm:data-filter name="overdue_days" enforceOperations="query" expression="t1.overdue_days &gt; 0"/> -->
         <!-- <bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract_cashflow where contract_id = t1.contract_id and cf_type = 9 and due_amount != nvl(received_amount,0) and generated_source not in (&apos;CREATE&apos;))"/> -->
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
+        <bm:data-filter enforceOperations="query" expression="t1.division != &apos;95&apos;"/>
         <!--<bm:data-filter enforceOperations="query" expression="exists (select 1 from con_contract where contract_id = t1.contract_id and created_by = ${/session/@user_id})"/>-->
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_repur_query.lwm

@@ -372,7 +372,7 @@
     </bm:operations>
     <bm:query-fields>
         <bm:query-field name="contract_number"
-                        queryExpression="contract_number like &apos;%&apos;|| ${@contract_number}||&apos;%&apos;"/>
+                        queryExpression="contract_number like &apos;%&apos;|| ${@contract_number} ||&apos;%&apos;"/>
         <!--<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>-->
         <bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like &apos;%&apos;|| ${@bp_id_tenant_desc}||&apos;%&apos;"/>
         <!--        <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>-->
@@ -425,5 +425,6 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
+        <bm:data-filter enforceOperations="query" expression="t1.division != &apos;95&apos;"/>
 </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON780/get_current_date.lwm

@@ -6,6 +6,7 @@
                 SELECT
                    to_char(sysdate,'yyyy') as year,
                    to_char(sysdate,'mm') as current_month,
+                   to_char(add_months(sysdate,-1),'yyyy-mm') as last_month,
                    sysdate as current_period
                 FROM
                     dual

src/main/webapp/WEB-INF/classes/cont/CON_ET001/con_early_termination_query.lwm

@@ -135,10 +135,13 @@
                             hlc.enabled_flag  = 'Y'
                             ) lease_channel_n,
                             t.division,
-                            (SELECT  v.code_value_name
-                            FROM sys_code_values_v v
-                            where v.code = 'DIVISION'
-                            and v.code_value = t.division
+                            (SELECT
+                            t2.description
+                            FROM
+                            hls_division t2
+                            WHERE
+                            t2.enabled_flag = 'Y' AND
+                            t2.division     = t.division
                             ) division_n
                             FROM
                             con_contract t,
@@ -151,7 +154,22 @@
                             t.data_class        = 'NORMAL' AND
                             dt.document_type(+) = t.document_type AND
                             t.division != '95'
-
+                            and (t.bp_id_agent_level1 = (select t.bp_id from sys_user s, exp_employees e, exp_employee_assigns a, exp_org_position pp,hls_bp_master t
+                                                         where a.position_id = pp.position_id
+                                                           and a.employee_id = e.employee_id
+                                                           and s.employee_id = e.employee_id
+                                                           and pp.unit_id = t.unit_id
+                                                           and a.enabled_flag = 'Y'
+                                                           and e.enabled_flag = 'Y'
+                                                           and a.primary_position_flag = 'Y'
+                                                           and pp.enabled_flag = 'Y'
+                                                           and t.bp_type = 'AGENT'
+                                                           and s.user_id = ${/session/@user_id}) or  not exists (select 1
+                                                                                                                  from sys_user_role_groups g, sys_role r
+                                                                                                                 where g.role_id = r.role_id
+                                                                                                                   and g.user_id = ${/session/@user_id}
+                                                                                                                   and r.role_code in ('0018','0019')
+                                                                                                                   and trunc(sysdate) <= nvl(g.end_date, trunc(sysdate))))
                         ) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
             ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_abc_import_save.lwm

@@ -16,6 +16,8 @@
                 p_payer_number =>${@payer_number},
                 p_bank_name =>${@bank_name},
                 p_beneficiary_name =>${@beneficiary_name},
+                p_bp_id =>${@bp_id},
+                p_bp_category=>${@bp_category},
                 p_total_amount =>${@total_amount},
                 p_import_itfc_id =>${@import_itfc_id});
 

src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_import_abc_bank.lwm

@@ -23,7 +23,9 @@
                 'COMBINED',
                 '混合类',
                 'REFUND',
-                '日立为优质客户付租金') collection_classes_desc,
+                '日立为优质客户付租金',
+                'OPERAT_DEPOSIT',
+                '经营性租赁保证金类') collection_classes_desc,
                 hc.total_amount,
                 hc.zy,
                 hc.remark,
@@ -68,7 +70,9 @@
                 'COMBINED',
                 '混合类',
                 'REFUND',
-                '日立为优质客户付租金') collection_classes_desc,
+                '日立为优质客户付租金',
+                'OPERAT_DEPOSIT',
+                '经营性租赁保证金类') collection_classes_desc,
                 hc.total_amount,
                 hc.zy,
                 hc.remark,

src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_ocr_abc_bank.lwm

@@ -57,16 +57,8 @@
                 NULL AS payer_name_r,
                 NULL AS payer_bank_r,
                 NULL AS total_amount_r,
-                COALESCE((SELECT v.code_value_name
-                FROM sys_code_values_v           v,
-                csh_transaction_import_temp ct
-                WHERE v.code = 'DS_COLLECTION_CLASSES'
-                AND v.code_value = ct.collection_classes
-                and ct.bp_bank_name = hx.payer_name),
-                '非保证金类') AS collection_classes_desc,
-                (SELECT ct.guarantor_name_duty
-                FROM csh_transaction_import_temp ct
-                WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
+                null AS collection_classes_desc,
+                null guarantor_name_duty
                 FROM hlcm_ele_abc_bank_slip_trx hx
                 where hx.create_trx_flag = 'Y'
                 and not exists (select 1
@@ -127,16 +119,18 @@
                 a.payer_name payer_name_r,
                 a.bank_name payer_bank_r,
                 a.total_amount total_amount_r,
-                COALESCE((SELECT v.code_value_name
-                FROM sys_code_values_v           v,
-                csh_transaction_import_temp ct
-                WHERE v.code = 'DS_COLLECTION_CLASSES'
-                AND v.code_value = ct.collection_classes
-                and ct.bp_bank_name = hx.payer_name),
-                '非保证金类') AS collection_classes_desc,
-                (SELECT ct.guarantor_name_duty
-                FROM csh_transaction_import_temp ct
-                WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
+                decode(a.collection_classes_desc,
+                'DEPOSIT',
+                '保证金类',
+                'NON_DEPOSIT',
+                '非保证金类',
+                'COMBINED',
+                '混合类',
+                'REFUND',
+                '日立为优质客户付租金',
+                'OPERAT_DEPOSIT',
+                '经营性租赁保证金类') AS collection_classes_desc,
+                 decode(a.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty
                 FROM hlcm_ele_abc_bank_slip_trx hx, hlcm_ele_trx_import_itfc a
                 where hx.create_trx_flag = 'Y'
                 and a.receipt_no = hx.receipt_no

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm

@@ -188,6 +188,7 @@
             AND f.write_off_flag <> 'FULL'
             AND f.cf_status IN ('RELEASE', 'BLOCK')
             AND f.cf_direction = 'OUTFLOW'
+            and t.business_type<>'LEASEOPERAT'
             AND NOT EXISTS (
                SELECT 1
                  FROM csh_payment_req_ln l,csh_payment_req_hd hd

src/main/webapp/WEB-INF/classes/csh/CSH501R/csh_payment_req_comm_ln_query.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2024-3-27 下午03:50:31
+    $Revision: 1.0
+    $Purpose:佣金付款
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1"
+          baseTable="CSH_PAYMENT_REQ_LN" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+              select t.contract_id ref_doc_id,
+                     f.cashflow_id ref_doc_line_id,
+                     t.document_category ref_doc_category,
+                     hc.bp_id,
+                     t.bp_id_agent_level1,
+                     t.contract_id,
+                     f.cashflow_id,
+                     t.contract_number,
+                     t.contract_name,
+                     hc.bp_id bp_id_agent_level1,
+                     (select hbm.bp_name from hls_bp_master hbm where hbm.bp_id = hc.bp_id) bp_id_agent_level1_n,
+                     hc.finance_amount,
+                     t.lease_start_date,
+                     hc.overdue_max_days,
+                     hc.comsn_amount amount_agent,
+                     hc.comsn_amount amount,
+                     t.currency currency_code,
+                     (SELECT gc.currency_name
+                        FROM gld_currency_v gc
+                       WHERE gc.currency_code = t.currency) currency_name,
+                     (select to_char(sysdate, 'yyyy-mm') || '-20' from dual) apply_pay_date
+                FROM con_contract_cashflow f
+                join con_contract t
+                  on t.contract_id = f.contract_id
+                join hlcm_comsn_reconcilia hc
+                  on f.cashflow_id = hc.cashflow_id
+               where EXISTS (SELECT 1
+                        FROM CSH_PAYMENT_CASHFLOW_ID_TEMP tmp
+                       WHERE tmp.session_id = ${/session/@session_id}
+                         AND tmp.cashflow_id = f.cashflow_id)
+                             #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501R/csh_payment_req_comm_selected.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2024-3-26 下午03:42:50
+    $Revision: 1.0  
+    $Purpose: 对账单查询
+-->
+<bm:model xmlns:s="leaf.plugin.script" xmlns:f="leaf.database.features"
+          xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+          select * from(
+                    select hb.batch_number,
+                          hc.batch_id,
+                           hc.policy_hd_id,
+                           hc.bp_id,
+                                       (select cc.contract_number
+                                         from con_contract cc
+                                        where cc.contract_id = hc.contract_id) contract_number,
+                                      (select cc.contract_name
+                                         from con_contract cc
+                                        where cc.contract_id = hc.contract_id) contract_name,
+                                      hc.bp_id bp_id_agent_level1,
+                                      (select hbm.bp_name from hls_bp_master hbm where hbm.bp_id = hc.bp_id) bp_id_agent_level1_n,
+                                       (select h.description
+                                         from con_contract cc,hls_division h
+                                        where cc.division= h.division and cc.contract_id = hc.contract_id) division_n,
+                                       hc.finance_amount,
+                                      (select to_char(cc.lease_start_date,'yyyy/mm/dd')
+                                         from con_contract cc
+                                        where cc.contract_id = hc.contract_id) lease_start_date,
+                                      (select cc.business_type
+                                       from con_contract cc
+                                      where cc.contract_id = hc.contract_id) con_business_type,
+                                       (select cc.business_type
+                                             from con_contract cc,hls_division hd
+                                            where cc.division= hd.division and cc.contract_id = hc.contract_id) con_business_type_n,
+                                      hc.rental_re_times,
+                                      hc.overdue_max_days,
+                                      hc.comsn_rate*100||'%' comsn_rate,
+                                      hc.comsn_amount,
+                                      (select sum(i.unearned_finance_income)
+                                                from con_unearned_finance_income i
+                                               where i.contract_id = hc.contract_id) net_interest_amount,
+                                      (select ccc.net_due_amount from con_contract_cashflow ccc where ccc.cashflow_id= hc.cashflow_id) net_comm_amount,
+                                      hc.cashflow_id,
+                                      hc.contract_id,
+                                      (select hd.policy_name from hlcm_comsn_policy_hd hd where hd.policy_hd_id=hc.policy_hd_id) policy_name
+                                         from hlcm_comsn_reconcilia_batch hb, hlcm_comsn_reconcilia hc
+                                where hb.batch_id = hc.batch_id
+                                and hb.wfl_status='APPROVED'
+                                AND NOT EXISTS (
+                                       SELECT 1
+                                         FROM csh_payment_req_ln l,csh_payment_req_hd hd
+                                         WHERE l.ref_doc_line_id=hc.cashflow_id
+                                          AND l.ref_doc_category='CONTRACT'
+                                          and l.payment_req_id=hd.payment_req_id
+                                          and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN')
+                                    )
+                             AND ('Y' = 'Y' AND EXISTS
+                                    (SELECT 1
+                                       FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
+                                      WHERE a1.trx_category = 'CONTRACT'
+                                        AND a1.trx_id = hc.contract_id
+                                        AND trunc(SYSDATE) BETWEEN a1.start_date AND
+                                            nvl(a1.end_date, trunc(SYSDATE))
+                                        AND a1.user_id = a2.owner_user_id
+                                        AND a1.trx_category = a2.trx_category
+                                        AND a2.authorized_user_id = ${/session/@user_id}
+                                        AND trunc(SYSDATE) BETWEEN a2.start_date AND
+                                            nvl(a2.end_date, trunc(SYSDATE))))
+           AND NOT EXISTS (
+                   SELECT 1
+                     FROM csh_payment_req_ln l,csh_payment_req_hd hd
+                     WHERE l.ref_doc_line_id=hc.cashflow_id
+                      AND l.ref_doc_category='CONTRACT'
+                      and l.payment_req_id=hd.payment_req_id
+                      and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN')
+                )
+         AND ('Y' = 'Y' AND EXISTS
+                (SELECT 1
+                   FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
+                  WHERE a1.trx_category = 'CONTRACT'
+                    AND a1.trx_id = hc.contract_id
+                    AND trunc(SYSDATE) BETWEEN a1.start_date AND
+                        nvl(a1.end_date, trunc(SYSDATE))
+                    AND a1.user_id = a2.owner_user_id
+                    AND a1.trx_category = a2.trx_category
+                    AND a2.authorized_user_id = ${/session/@user_id}
+                    AND trunc(SYSDATE) BETWEEN a2.start_date AND
+                        nvl(a2.end_date, trunc(SYSDATE))))
+
+order by hc.overdue_max_days desc
+                                ) t1
+           #WHERE_CLAUSE#
+           #ORDER_BY_CLAUSE#
+
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+  <bm:query-fields>
+  <bm:query-field name="batch_number"
+                  queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/>
+  <bm:query-field name="contract_number"
+                    queryExpression="t1.batch_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
+  <bm:query-field name="bp_id_agent_level1_n" queryExpression="t1.bp_id_agent_level1_n like &apos;%&apos;||${@bp_id_agent_level1_n}||&apos;%&apos;"/>
+  <bm:query-field name="division_n" queryExpression="t1.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/>
+  <bm:query-field name="policy_name" queryExpression="t1.policy_name=${@policy_name}"/>
+  <bm:query-field name="overdue_max_days_f" queryExpression="t1.overdue_max_days &gt;= ${@overdue_max_days_f}"/>
+  <bm:query-field name="overdue_max_days_t" queryExpression="t1.overdue_max_days &lt;= ${@overdue_max_days_t}"/>
+   </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501R/get_bp_bank_info.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: 18083
+    $Date:  
+    $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
+                   t.bank_account_id  bp_bank_account_id,
+                   t.bank_account_code bp_bank_account_code,
+                   t.bank_account_num  bp_bank_account_num,
+                   t.bank_account_name bp_bank_account_name,
+                   t.bank_full_name bp_bank_full_name
+               from hls_bp_master_bank_account_v t
+             where t.bp_id = ${/parameter/@bp_id_agent_level1}
+               and t.enabled_flag = 'Y'
+                and rownum = 1
+
+           ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501R/sys_code_value_v_policy.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+              select * from(
+              select h.policy_hd_id,
+                     h.policy_name,
+                     h.policy_ext_name,
+                     h.division,
+                     (select d.description
+                        from hls_division d
+                       where d.division = h.division) division_n
+                from hlcm_comsn_policy_hd h
+               where h.wfl_status = 'APPROVED'
+                 and h.bp_id = ${@bp_id}) t
+                  #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="policy_hd_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="POLICY_HD_ID" prompt="佣金政策id"/>
+        <bm:field name="policy_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="220" forDisplay="true" forQuery="true" physicalName="POLICY_NAME" prompt="佣金政策"/>
+        <bm:field name="policy_ext_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="120" forDisplay="true" forQuery="true" physicalName="POLICY_NAME" prompt="佣金政策简称"/>
+        <bm:field name="division" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DIVISION" prompt="产品线"/>
+        <bm:field name="division_n" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="DIVISION_N" prompt="产品线"/>
+   </bm:fields>
+     <bm:query-fields>
+        <bm:query-field field="policy_name" queryExpression="t.policy_name like &apos;%&apos;||${@policy_name}||&apos;%&apos;"/>
+        <bm:query-field field="policy_ext_name" queryExpression="t.policy_ext_name like &apos;%&apos;||${@policy_ext_name}||&apos;%&apos;"/>
+        <bm:query-field field="division_n" queryExpression="t.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/>
+  </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH501R/upd_csh_payment_comm_flag.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2024-1-19 上午11:15:04
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+                <bm:update-sql><![CDATA[
+                begin
+                    csh_payment_comm_req_pkg.payment_comm_submit
+                    (
+                        p_payment_req_id=>${@payment_req_id},
+                        p_user_id=>${/session/@user_id}
+                    );
+                end;]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH503/csh_payment_reverse.lwm

@@ -68,7 +68,7 @@
                    and l.ref_doc_category = 'CONTRACT'
                    and l.ref_doc_id = cc.contract_id
                    and l.ref_doc_line_id = cf.cashflow_id
-                   and cf.cf_item in ('40'))) v  #WHERE_CLAUSE#
+                   and cf.cf_item in ('40','911'))) v  #WHERE_CLAUSE#
           ORDER BY transaction_date DESC, transaction_num
 
             ]]></bm:query-sql>

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

@@ -101,6 +101,7 @@
         <bm:field name="paid_byother_flag" />
         <bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" />
         <bm:field name="guarantor_name_duty" />
+        <bm:field name="operat_flag" />
 
 
     </bm:fields>

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm

@@ -174,8 +174,8 @@
 <!--        <bm:data-filter name="query" expression="(not exists(select 1 from csh_transaction t where t.transaction_type = 'RECEIPT' and t.paid_byother_flag = 'T' and t.write_off_flag = 'FULL' and t.transaction_id = t1.transaction_id))"/>-->
 <!--        <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>-->
         <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,'DEPOSIT','DEPOSIT')))  and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
-<!--        <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />-->
-        <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} in ('1','11097','10422','11099'))) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} in ('1','11097','10422','11099')))))"/>
+<!--        <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category in ('TENANT','RENTER') and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category not in ('TENANT','RENTER')) or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />-->
+        <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category in ('TENANT','RENTER')  and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} in ('1','11097','10422','11099'))) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category not in ('TENANT','RENTER') )) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} in ('1','11097','10422','11099')))))"/>
         <bm:data-filter name="collection_classes" expression="(nvl(t1.collection_classes,'NON') != 'REFUND')"/>
     </bm:data-filters>
 </bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/csh/CSH551/insert_comsn_reconcilia_temp.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: ZLF  
+    $Date: 2014-12-8 上午11:04:41  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hlcm_comsn_reconcilia_pkg.insert_comsn_reconcilia_temp(p_session_id => ${/session/@session_id},
+                                                                       p_policy_hd_id => ${@policy_hd_id},
+                                                                       p_user_id => ${/session/@user_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                select count(1) count
+                  from hlcm_comsn_reconcilia_temp t
+                 where t.session_id = ${/session/@session_id}
+                   and not exists
+                 (select 1
+                          from hlcm_comsn_reconcilia r
+                         where r.contract_id = t.contract_id
+                           and r.wfl_status in ('NEW', 'APPROVING', 'APPROVED'))
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:fields>
+        <bm:field name="count"/>
+    </bm:fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH551/submit_comsn_selected.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: ZLF  
+    $Date: 2014-12-8 上午11:04:41  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="delete">
+            <bm:update-sql><![CDATA[
+                begin
+                    delete from hlcm_comsn_reconcilia_wfl_temp t where t.session_id = ${/session/@session_id};
+                end;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hlcm_comsn_reconcilia_pkg.create_comsn_wfl_temp(p_session_id => ${/session/@session_id},
+                                                                   p_contract_id => ${@contract_id},
+                                                                   p_user_id     => ${/session/@user_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                BEGIN
+                    hlcm_comsn_reconcilia_pkg.comsn_submit(p_session_id   => ${/session/@session_id},
+                                                           p_user_id      => ${/session/@user_id});
+                END;
+            ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -108,17 +108,64 @@
         <bm:field name="acc_confirmed_by"/>
         <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
         <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
-        <bm:field name="deposit_trans_type"/>
-        <bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
+        <bm:field name="deposit_trans_type" expression="decode(t1.ref_contract_id,
+              null,
+              decode(t1.collection_classes,
+                     'OPERAT_DEPOSIT',
+                     'vender_deposit',
+                     t1.deposit_trans_type),
+              t1.deposit_trans_type)" forInsert="false" forUpdate="false" />
+        <bm:field name="deposit_trans_type_desc" expression="decode(t1.ref_contract_id,
+              null,
+              decode(t1.collection_classes,
+                     'OPERAT_DEPOSIT',
+                     (select v.code_value_name value_name
+                        from sys_code_values_v v
+                       where v.code = 'DEPOSIT_TRANS_TYPE'
+                         and v.code_value = 'vender_deposit'),
+                     (select v.code_value_name
+                        from sys_code_values_v v
+                       where v.code = 'DEPOSIT_TRANS_TYPE'
+                         and v.code_value = t1.deposit_trans_type)),
+              (select v.code_value_name
+                 from sys_code_values_v v
+                where v.code = 'DEPOSIT_TRANS_TYPE'
+                  and v.code_value = t1.deposit_trans_type))" forInsert="false" forUpdate="false"/>
+		<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
         <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
         <bm:field name="source_type"/>
         <bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
         <bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
         <bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
-        <bm:field name="business_type" expression="(select cc.business_type  from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
-        <bm:field name="business_type_desc" expression="(select hb.description  from con_contract cc,hls_business_type_v hb where cc.business_type= hb.business_type and hb.enabled_flag = 'Y' and cc.contract_id = t1.ref_contract_id)"/>
-    </bm:fields>
+        <bm:field name="business_type" expression=" decode(t1.ref_contract_id,
+              null,
+              decode(t1.collection_classes,
+                     'OPERAT_DEPOSIT',
+                     'LEASEOPERAT',
+                     (select cc.business_type
+                        from con_contract cc
+                       where cc.contract_id = t1.ref_contract_id)),
+              (select cc.business_type
+                 from con_contract cc
+                where cc.contract_id = t1.ref_contract_id))"/>
+        <bm:field name="business_type_desc" expression="decode(t1.ref_contract_id,
+              null,
+              decode(t1.collection_classes,
+                     'OPERAT_DEPOSIT',
+                     (select ht.description
+                        from hls_business_type ht
+                       where ht.business_type = 'LEASEOPERAT'),
+                     (select hb.description
+                        from con_contract cc, hls_business_type_v hb
+                       where cc.business_type = hb.business_type
+                         and hb.enabled_flag = 'Y'
+                         and cc.contract_id = t1.ref_contract_id)),
+              (select hb.description
+                 from con_contract cc, hls_business_type_v hb
+                where cc.business_type = hb.business_type
+                  and hb.enabled_flag = 'Y'
+                  and cc.contract_id = t1.ref_contract_id))"/>
+		</bm:fields>
     <bm:features>
         <f:standard-who/>
     </bm:features>
@@ -209,5 +256,5 @@
 		<bm:query-field name="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
         <bm:query-field name="vender_project_number" queryExpression="(select p.project_number  from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like  &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
         <bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
-    </bm:query-fields>
+   </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/db/gld_period_pkg/close_period.lwm

@@ -13,9 +13,13 @@
                   gld_period_pkg.close_period(${/session/@company_id},
                                               ${@period_set_code},
                                               ${@period_name},
-                                              ${/session/@user_id});
+                                              ${/session/@user_id},
+                                              ${@p_err_msg});
                 end;
             ]]></update-sql>
-        </operation>
-    </operations>
+             <parameters>
+                <parameter name="p_err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@p_err_msg"/>
+            </parameters>
+             </operation>
+      </operations>
 </model>

src/main/webapp/WEB-INF/classes/efile/EFILE1100/att_import_bank.lwm

@@ -2,6 +2,15 @@
 
 <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT *
+                FROM  hlcm_ele_abc_bank_slip_bacth b
+                WHERE  b.start_date = TO_DATE('${:@parameter_code}', 'YYYY-MM-DD')
+                and    b.slip_batch_id = nvl(${@batch_id},0)
+                ORDER BY b.slip_batch_id desc
+                ]]></bm:query-sql>
+        </bm:operation>
 
         <bm:operation name="insert">
             <bm:update-sql><![CDATA[
@@ -28,7 +37,8 @@
                 p_response_json => ${@response_json},
                 p_return_page_size => ${@return_page_size},
                 p_page_size => ${@page_size},
-                p_user_id =>${/session/@user_id}
+                p_user_id =>${/session/@user_id},
+                p_slip_batch_id => ${@slip_batch_id}
                 );
                 END;
                 ]]>

src/main/webapp/WEB-INF/classes/efile/EFILE1100/get_bank_list.lwm

@@ -6,6 +6,7 @@
                 SELECT *
                 FROM  hlcm_ele_abc_bank_slip_bacth b
                 WHERE  b.start_date = TO_DATE('${:@parameter_code}', 'YYYY-MM-DD')
+                ORDER BY b.slip_batch_id desc
                 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/WEB-INF/classes/hls/HLS303/hlcm_com_policy_wfl.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: 38823
+    $Date: 2024-03-22
+    $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
+                    hlcm_com_policy_wfl_pkg.policy_wfl_start(
+                    p_policy_hd_id =>${@policy_hd_id},
+                    p_user_id => ${/session/@user_id}
+                    );
+                end;
+            ]]></bm:update-sql>
+        </bm:operation>
+        <bm:operation name="query">
+            <bm:query-sql>
+                select hd.calc_start_date,hd.calc_end_date from hlcm_comsn_policy_hd hd where hd.bp_id=${@bp_id} and hd.division=${@division} and hd.wfl_status in ('APPROVED','APPROVING')
+            </bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

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

@@ -28,7 +28,9 @@
                     (SELECT ccli.modelcd
                      FROM con_contract_lease_item ccli
                      WHERE ccli.contract_id =
-                           ct.contract_id)                                                                                        modelcd,
+                           ct.contract_id
+                     AND ccli.equipment_type ='MAIN')                                                                                 modelcd,
+
                     --机型
                     (SELECT nvl(i.machine_number,i.machine_number_70)
                      FROM con_contract_lease_item i
@@ -785,6 +787,7 @@
   FROM con_contract ct
  WHERE ct.contract_status NOT IN ('CANCEL')
    AND ct.data_class = 'NORMAL'
+   and ct.document_type not in('PUR_ORDER')
  ORDER BY ct.bp_id_agent_level1
                 ]]></bm:query-sql>
         </bm:operation>

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

+var override_queryfields = [
+    {
+        name:'calc_start_date',
+        queryexpression:"t1.calc_start_date between to_date(${@calc_start_date},'yyyy-mm-dd') and nvl(to_date(${@calc_end_date},'yyyy-mm-dd'),t1.calc_start_date)"
+    },
+    {
+        name:'calc_end_date',
+        queryexpression:"t1.calc_end_date between nvl(to_date(${@calc_start_date},'yyyy-mm-dd'),t1.calc_end_date) and to_date(${@calc_end_date},'yyyy-mm-dd')"
+    }
+];
+var add_datafilters=[{
+    name:'bp_id',
+    expression : "t1.bp_id= ${/parameter/@bp_id}"
+}];
+add_datafilter();
+override();
\ No newline at end of file

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

+var override_queryfields = [
+    {
+        name:'inception_of_lease_from',
+        queryexpression:"t1.inception_of_lease between to_date(${@inception_of_lease_from},'yyyy-mm-dd') and nvl(to_date(${@inception_of_lease_to},'yyyy-mm-dd'),t1.inception_of_lease)"
+    },
+    {
+        name:'inception_of_lease_to',
+        queryexpression:"t1.inception_of_lease between nvl(to_date(${@inception_of_lease_from},'yyyy-mm-dd'),t1.inception_of_lease) and to_date(${@inception_of_lease_to},'yyyy-mm-dd')"
+    }
+];
+var add_datafilters=[{
+    name:'commission_month',
+    expression : "t1.commission_month= ${/parameter/@commission_month}"
+}];
+add_datafilter();
+override();
\ No newline at end of file

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

 var override_queryfields = [
-    {
-        field : 'contract_status',
-        queryoperator : "="
-    }
-
-
+		{
+			field : 'contract_status',
+			queryoperator : "="
+		}
 
 ];
 var add_datafilters = [{
     name : 'bp_id_agent_level1',
     expression : "Not Exists (Select 1 From hls_bp_master hm Where hm.bp_id = t1.bp_id_agent_level1 And nvl(hm.is_constru_unit,'N') = 'Y')"
-}];
+},
+	{
+		name : 'division',
+		expression : "t1.division!= 95"
+	}
+];
 
 override();
 add_datafilter();

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

@@ -12,7 +12,7 @@ var add_datafilters = [ {
 },
 	{
 		name : 'divisions',
-		expression : 't1.division in (${@division1},${@division2},${@division3},${@division4},${@division5},${@division6},${@division7},${@division8},{@division9},{@division10}) '
+		expression : 't1.division in (${@division1},${@division2},${@division3},${@division4},${@division5},${@division6},${@division7},${@division8},{@division9},{@division10},{@division14}) '
 	}
 ];
 

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

+
+var add_datafilters = [{
+	name : 'wfl_status',
+	expression : "t1.wfl_status in ('APPROVING','APPROVED')"
+}];
+add_datafilter();
+

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

+var override_queryfields = [
+	{
+		name : 'overdue_max_days_f',
+		queryexpression : "t1.overdue_max_days >= ${@overdue_max_days_f}"
+	},
+	{
+		name : 'overdue_max_days_t',
+		queryexpression : "t1.overdue_max_days <= ${@overdue_max_days_t}"
+	}
+];
+override();
+

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

+remove_query_field('approval_status_n');
 var override_queryfields = [
 		{
 			name : 'amount_from',
@@ -18,7 +19,11 @@ var override_queryfields = [
 		 {
 			name:'payment_req_number',
 			queryexpression:"t1.payment_req_number like '%'||${@payment_req_number}||'%'"
-		 }
+		 },
+		{
+			name:'approval_status',
+			queryexpression:"t1.approval_status = ${@approval_status}"
+		}
 ];
 var add_datafilters = [
 	{

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

+remove_query_field('approval_status_n');
+var override_queryfields = [
+		{
+			name : 'req_date_from',
+			queryexpression : "T1.req_date>=trunc(to_date(${@req_date_from},'yyyy-mm-dd'))"
+		},
+		{
+			name : 'req_date_to',
+			queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')"
+		},
+		 {
+			name:'payment_req_number',
+			queryexpression:"t1.payment_req_number like '%'||${@payment_req_number}||'%'"
+		 },
+		{
+			name:'approval_status',
+			queryexpression:"t1.approval_status = ${@approval_status}"
+		}
+];
+var add_datafilters = [
+	{
+		name : '',
+		expression : "exists(select 1\n" +
+			"          from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
+			"          where l.payment_req_id = t1.payment_req_id\n" +
+			"          and l.ref_doc_category = 'CONTRACT'\n" +
+			"          and l.ref_doc_id = cc.contract_id\n" +
+			"          and l.ref_doc_line_id = cf.cashflow_id\n" +
+			"          and cf.cf_item in ('911'))"
+
+	} ];
+add_datafilter();
+
+override();

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

@@ -12,7 +12,7 @@
 var add_datafilters = [
     {
         name : 'init_filter',
-        expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.cf_item = '40'"
+        expression : "t1.status in ('NEW','ERROR','FINISHED','SEND_MID','CONFIRM1_ERROR','CONFIRM2_FULL_ERROR') and t1.cf_item in ('40','911')"
     }
 ];
 

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

@@ -349,5 +349,12 @@ var enableLayoutConfig = {
 	'modules/csh/CSH1500/csh_asset_reconciliation.lview':true,
 	'modules/csh/CSH501C/csh_payment_asset_create_entrance.lview':true,
 	'modules/csh/CSH501C/csh_payment_asset_req.lview':true,
-	'modules/cont/CON1370/con_asset_fee_detail.lview':true
+	'modules/cont/CON1370/con_asset_fee_detail.lview':true,
+	'modules/hls/HLS303/bp_agent_bounty_create.lview':true,
+	'modules/hls/HLS303/bp_agent_bounty_detail.lview':true,
+	'modules/acp/ACP522/ap_invoice_com_detail.lview':true,
+	'modules/csh/CSH501R/csh_payment_comm_create_entrance.lview':true,
+	'modules/csh/CSH501R/csh_payment_comm_selected.lview':true,
+	'modules/csh/CSH501R/csh_payment_comm_req.lview':true,
+	'modules/cont/CON1380/con_commission_report.lview':true
 };
\ No newline at end of file

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

@@ -26,6 +26,10 @@ var override_queryfields = [
     {
         name:'bp_id_tenant',
         queryexpression: "t1.bp_id_tenant like ${@bp_id_tenant}"
+    },
+    {
+        name:'je_transaction_desc',
+        queryexpression: "t1.je_transaction_code like ${@je_transaction_desc}"
     }
 ];
 
@@ -33,7 +37,7 @@ var override_queryfields = [
 var add_datafilters=[
     {
         name:'division',
-        expression:"(t1.division not in ('70','92','95'))"
+        expression:"(t1.division not in ('70','92'))"
     },
     {
         name:'approval_status',

src/main/webapp/modules/acp/ACP522/ap_invoice_com_detail.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:view>
+        <script><![CDATA[
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

@@ -6,6 +6,8 @@
                 modelaction="update"/>
         <a:link id="ap_invoice_import_detail_link"
                 url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail.lview"/>
+        <a:link id="ap_invoice_com_detail_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_com_detail.lview"/>
         <a:link id="ap_invoice_import_detail_wfl_link"
                 url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail_wfl.lview"/>
         <a:link id="ap_invoice_import_scanning_link"
@@ -35,6 +37,9 @@
             if (name == 'items') {
                 return '<a href="javascript:ap_invoice_detail(\'' + record.id + '\',\'' + record.ds.id + '\',\'' +record.get('payment_req_id') + '\');">' + value + '</a>';
             }
+            if(name == 'com_amount'){
+                return '<a href="javascript:ap_invoice_com_detail(\'' + record.id + '\',\'' + record.ds.id + '\',\'' +record.get('payment_req_id') + '\');">' + value + '</a>';
+            }
         };
 
         function ap_invoice_import_detail(record_id,ds_id){
@@ -67,6 +72,17 @@
             // param['items'] = record.get('items');
             hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id',param,'ap_invoice_detail_link', ds_id,'AP_INVOICE_DETAILS');
         }
+        //佣金政策
+        function ap_invoice_com_detail(record_id, ds_id,payment_req_id) {
+            debugger;
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'QUERY';
+            param['function_code'] = 'ACP522_COM';
+            param['payment_req_id'] = payment_req_id;
+            param['url_title'] = '进项发票详情';
+            hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id',param,'ap_invoice_com_detail_link', ds_id,'AP_INVOICE_COM_DETAIL');
+        }
 
 
 

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -91,7 +91,7 @@
             $('acr512_invoice_result_ds').query();
             $('acr512_invoice_op_result_ds').query();
             var records = $('acr512_invoice_result_ds').getAll();
-            var record_op = $('acr512_invoice_op_result_ds').getAll();
+            var record_ops = $('acr512_invoice_op_result_ds').getAll();
             for (var i = 0; i < records.length; i++) {
                 var record = record[i];
                 var invoice_hd_id = record.get('invoice_hd_id');
@@ -112,7 +112,7 @@
             }
             $('acr512_invoice_result_ds').query();
 
-            for (var j = 0; j < record_op.length; i++) {
+            for (var j = 0; j < record_ops.length; j++) {
                 var record_op = record_op[j];
                 var invoice_hd_id = record_op.get('invoice_hd_id');
                 Leaf.request({

src/main/webapp/modules/cont/CON1380/con_commission_report.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query fetchAll="true" model="cont.CON780.get_current_date" rootPath="default_date_path"/>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="con1380_query_id" model="cont.CON1380.con1380_result_query_job" modelaction="execute"/>
+        <a:link id="query_job" model="cont.CON1380.con1380_result_query_job" modelaction="update"/>
+        <script><![CDATA[
+        $L.onReady(function(){
+            var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
+            var record = headers_ds.getCurrentRecord();
+            record.set('base_date','${/model/default_date_path/record/@last_month}');
+            record.set('base_date_n','${/model/default_date_path/record/@last_month}');
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_monthly_report_temp');
+            $(ds_id).setQueryParameter('commission_month',record.get('base_date'));
+            $(ds_id).query();
+        });
+
+        //更新全量数据
+        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
+            var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
+            var record = headers_ds.getAt(0);
+            if (Ext.isEmpty(record.get('base_date'))) {
+                $L.showMessage('提示', '请选择基准日期');
+                return;
+            }
+            Leaf.showConfirm('${l:HLS.PROMPT}', '<font color="red">该任务需执行约30分钟，请耐心等待！</font></br></br><font color="red">【特别注意】任务发起后30分钟内请勿重复点击</font>', function () {
+                Leaf.Masker.mask(Ext.getBody(), '${l:BEING_IMPLEMENTED}');
+                Leaf.request({
+                    url: $('con1380_query_id').getUrl(),
+                    para: {
+                        month: record.get('base_date')
+                    },
+                    success: function (res) {
+                        Leaf.Masker.unmask(Ext.getBody());
+                        Leaf.SideBar.show({
+                            msg: '发起成功！',
+                            duration: 2000
+                        });
+                    },
+                    error: function () {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
+                    failure: function () {
+                        Leaf.Masker.unmask(Ext.getBody());
+                    },
+                    scope: this
+                });
+            }, null, 300, 150);
+        };
+
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            var headers_ds = $('${/parameter/@layout_code}_F_QUERY__ds');
+            var record = headers_ds.getCurrentRecord();
+            if (Ext.isEmpty(record.get('base_date'))) {
+                $L.showMessage('提示', '请选择基准日期');
+                return;
+            }
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_monthly_report_temp');
+            $(ds_id).setQueryParameter('commission_month',record.get('base_date'));
+            $(ds_id).query();
+        };
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -103,11 +103,13 @@
                     //     record.getField('guarantee_letter_f_n').setReadOnly(true);
                     // }else
                     if (record.get('division')!='70'&&record.get('division')!='92'){
-                        document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
-                        document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN').style.display = 'none';
-                        if(document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt')!=null){
-                            document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt').style.display = 'none';
-                            document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT').style.display = 'none';
+                        if (record.get('division')!='93'){
+                            document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
+                            document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN').style.display = 'none';
+                            if(document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt')!=null){
+                                document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt').style.display = 'none';
+                                document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT').style.display = 'none';
+                            }
                         }
                         document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_BRAND_VALUE_prompt').style.display = 'none';
                         document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_BRAND_VALUE').style.display = 'none';

src/main/webapp/modules/cont/CON3400/contract_sales_report.lview

@@ -118,6 +118,9 @@
             };
             if(record.data.lease_name99=='Y'){//add by gzj
                 record.data.division=record.data.division+',99';
+            };
+            if(record.data.lease_name93=='Y'){//add by gzj
+                record.data.division=record.data.division+',93';
             };
                 record.data.division=record.data.division.substr(1,record.data.division.length);
             $('contract_sales_result_ds').query();
@@ -214,6 +217,7 @@
                 <a:checkBox name="lease_name91" bindTarget="contract_sales_report_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
                 <a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/>
                 <a:checkBox name="lease_name99" bindTarget="contract_sales_report_ds" prompt="工程机械"/>
+                <a:checkBox name="lease_name93" bindTarget="contract_sales_report_ds" prompt="新业务-厂商担保"/>
              </a:form>
 
             <a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview

@@ -41,6 +41,7 @@
             record.data.division10='';
             record.data.division11='';
             record.data.division12='';
+            record.data.division14='';
             if(record.data.lease_name10=='Y'){
                 record.data.division1='10';
             }
@@ -77,9 +78,12 @@
             if(record.data.lease_name99=='Y'){
                 record.data.divisio12='99';
             };
+            if(record.data.lease_name93=='Y'){
+                record.data.divisio14='93';
+            };
          //   record.data.division=record.data.division.substr(1,record.data.division.length);
             if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
-                &&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''&&record.data.division12 == ''){
+                &&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''&&record.data.division12 == ''&&record.data.division14 == ''){
                // record.data.division1='10,20,30,40,50,60,70,80';
                 record.data.division1='10';
                 record.data.division2='20';
@@ -93,6 +97,7 @@
                 record.data.division10='91';
                 record.data.division11='92';
                 record.data.division12='99';
+                record.data.division14='93';
 
             };
             param['division1']= record.data.division1;
@@ -107,6 +112,7 @@
             param['division10']= record.data.division10;
             param['division11']= record.data.division11;
             param['division12']= record.data.division12;
+            param['division14']= record.data.division14;
             param['period_name']=period_name;
             param['function_code'] = 'CON3400N';
             param['function_usage'] = 'MODIFY';

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview

@@ -75,6 +75,7 @@
 	        $(ds_id).setQueryParameter("division9",'${/parameter/@division9}');
             $(ds_id).setQueryParameter("division10",'${/parameter/@division10}');
             $(ds_id).setQueryParameter("division11",'${/parameter/@division11}');
+            $(ds_id).setQueryParameter("division14",'${/parameter/@division14}');
             $(ds_id).query();
         })
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {

src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc

@@ -123,6 +123,7 @@
 				||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ' //update by xsh35973 添加法人铁甲保证函
 				//addby xsh35973 20221017 神钢建机
                 ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG'
+                ||record_data.templet_code =='FINANCE_LEASE_BACK_CON_SG'||record_data.templet_code =='FINANCE_LEASE_BACK_CON_GUA_SG1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_SG'||record_data.templet_code =='LEASE_ORDER_SG'||record_data.templet_code =='PROOF_RECEIPT_SG'
                 //add by gzj 2022-12-23 北京卡家
                 ||record_data.templet_code =='CON_COLLECTION_PAYMENT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ_1'||record_data.templet_code =='CSH_PAYMENT_REQ_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_SURE'
                 ||record_data.templet_code =='CSH_PAYMENT_REQ_KJ_1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_FR'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_KJ'

src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview

@@ -42,8 +42,6 @@
                 url="${/request/@context_path}/modules/cont/CON620/create_content_for_collection_signatures.lsc"/>
         <a:link id="cashflow_print_signatures_link_id"
                 url="${/request/@context_path}/modules/cont/CON620/con_cashflow_print_signatures.lview"/>
-        <a:link id="con_lease_org_add_seal_print_link"
-                url="${/request/@context_path}/modules/cont/CON620/create_content_con_lease_return_add_seal.lsc"/>
         <script type="text/javascript"><![CDATA[
         Ext.ux.Lightbox.register('a[ref=img]', true);
 
@@ -99,7 +97,7 @@
         window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () {
             var contract_id = '${/parameter/@document_id}';
             var templet_code = 'LEASE_RETURN';
-            var  url=$('con_lease_org_add_seal_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
+            var  url=$('con_lease_org_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
             //var  url=$('lease_return_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
             window.open(url, '_self');
             create_message(contract_id,templet_code);

src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview

@@ -54,6 +54,9 @@
                 if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53
                     record.data.division=record.data.division+',99';
                 };
+                if(record.data.lease_name93=='Y'){//add by gzj 2022-12-19 10:17:53
+                    record.data.division=record.data.division+',93';
+                };
                 record.data.division=record.data.division.substr(1,record.data.division.length);
                 Leaf.Masker.mask(Ext.getBody(), '正在统计并查询，请稍等...');
                 Leaf.request({
@@ -166,6 +169,7 @@
                     <a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name99" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name93" uncheckedValue="N" defaultValue="N"/>
                     <a:field name="division" />
                     <a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/>
                     <a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/>
@@ -218,6 +222,7 @@
                 <a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
                 <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>
                 <a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/>
+                <a:checkBox name="lease_name93" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务-厂商担保"/>
 
 
 

src/main/webapp/modules/csh/CSH1400/agricultural_bank_import.lview

@@ -50,13 +50,12 @@
             });
             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/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
+            var url = '${/request/@context_path}/modules/csh/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&abc_ds=${/parameter/@abc_ds}&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();
+                $('${/parameter/@abc_ds}').query();
             });
         }
         ]]></script>

src/main/webapp/modules/csh/CSH1400/csh_abc_excel_import.lview

@@ -85,6 +85,8 @@
                     record.set('guarantor_name_duty',record.get('guarantor_name_duty_desc'));
                     record.set('collection_classes_desc',record.get('collection_classes_desc'));
                     record.set('extra_nam',record.get('extra_nam'));
+                    record.set('bp_id',record.get('bp_id'));
+                    record.set('bp_category',record.get('bp_category'));
 
 
                     if (record.get('collection_classes') == 'DEPOSIT') {
@@ -120,9 +122,7 @@
                             });
                             //关闭该导入的界面
                             backBtn();
-                            returnBack();
-                            // location.href = "${/request/@context_path}/modules/csh/CSH1400/csh_agricultural_bank_check.lview";
-
+                            $('${/parameter/@abc_ds}').query();
                         },
                         failure: function () {
                             Leaf.Masker.unmask(Ext.getBody());
@@ -400,7 +400,7 @@
         ]]></script>
         <a:dataSets>
             <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
-            <a:dataSet id="collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES">
+            <a:dataSet id="collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES_S">
             </a:dataSet>
             <a:dataSet id="paid_byother_flag_ds">
                 <a:datas>

src/main/webapp/modules/csh/CSH501/csh_payment_req_op_selected.lwm

@@ -137,7 +137,8 @@
                   queryExpression="t1.plan_order_date <= ${@plan_order_date_to}"/>
   <bm:query-field name="lease_item_amount"
                   queryExpression="t1.due_amount&gt;=${@lease_item_amount}"/>
-  <bm:query-field name="vender_con_number" queryExpression="t1.vender_con_number=${@vender_con_number}"/>
+  <bm:query-field name="bp_id_agent_n" queryExpression="t1.vender_name_n=${@bp_id_agent_n}"/>
+  <bm:query-field name="vender_name_n" queryExpression="t1.vender_name_n=${@vender_name_n}"/>
   <bm:query-field name="invoice_status_n"
                              queryExpression="t1.invoice_status_n like &apos;%&apos;||${@invoice_status_n}||&apos;%&apos;"/>
   <bm:query-field name="contract_number" queryExpression="t1.contract_number=${@contract_number}"/>

src/main/webapp/modules/csh/CSH501R/csh_payment_comm_create_entrance.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
+          trace="true">
+    <a:init-procedure>
+     </a:init-procedure>
+    <a:view>
+        <a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <a:link id="csh_payment_comm_create_link" url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_selected.lview"/>
+        <a:link id="csh501_csh_comm_req_link_id"
+                url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_req.lview"/>
+        <script type="text/javascript"><![CDATA[
+        //新增
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
+            var url = $('csh_payment_comm_create_link').getUrl();
+            var win = new Leaf.Window({
+                url: url,
+                params: {
+                    winid: 'csh_payment_req_comm_win_id',
+                    ds_id: ds_id
+                },
+                title: '佣金付款申请页面',
+                id: 'csh_payment_req_comm_win_id',
+                fullScreen: true
+            });
+            win.on('close', function () {
+                $(ds_id).query();
+            });
+        };
+
+        function detail_link(id, name, query_only) {
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
+            var param = {};
+            param['payment_req_id'] = record.get('payment_req_id');
+            param['bp_id'] = record.get('bp_id_agent_level1');
+            param['business_type'] = record.get('business_type');
+            param['approval_status'] = record.get('approval_status');
+            if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
+                param['function_usage'] = 'UPDATE';
+                param['function_code'] = 'CSH501D_COMM';
+             } else{
+                param['function_usage'] = 'QUERY';
+				param['maintain_type'] = 'READONLY';
+                param['function_code'] = 'SAVE_COMM';
+                param['download'] = 'Y';
+            }
+            param['winid'] = 'csh_payment_comm_update_window';
+            param['url_title'] = '佣金付款申请';
+
+            hls_doc_get_layout_code('get_layout_code_link_id', param, 'csh501_csh_comm_req_link_id', ds_id, '${/parameter/@layout_code}');
+        }
+
+        window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
+            window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+            if (name == 'payment_req_number' && value) {
+                link_function = 'detail_link';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value + '</a>';
+            }
+            return value;
+        };
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+
+    </a:view>
+</a:screen>

src/main/webapp/modules/csh/CSH501R/csh_payment_comm_pdf.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
+    <a:init-procedure>
+<a:model-update model="hls.HLS811.hls_doc_file_templet_get_atm"/>
+    <s:server-script import="contract_print_path.js"><![CDATA[
+    importPackage(java.io);
+importPackage(Packages.hls.plugin.docx4j);
+importPackage(Packages.leaf.plugin.word2pdf);
+importPackage(Packages.org.apache.commons.io);
+
+//删除文件
+
+function deleteFile(filePath) {
+    var file = new File(filePath);
+    if (file.exists()) {
+        file.delete();
+    }
+}
+
+
+//生成pdf
+function wordToPdf(word_file_path,pdf_file_path) {
+    // word转pdf
+    var pdf_file_path_new = pdf_file_path + '.pdf';
+    var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
+    wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
+    //删除word文件
+    //deleteFile(word_file_path);
+
+    return pdf_file_path_new;
+}
+
+function copyFile(fOld, fNew) {
+    var fis = new java.io.FileInputStream(fOld);
+    var fos = new java.io.FileOutputStream(fNew);
+    var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
+    var len = -1;
+    while ((len = fis.read(b)) != -1) {
+        fos.write(b, 0, len);
+    }
+    fis.close();
+    fos.close();
+}
+
+function transfer(file_path, os) {
+    println(file_path);
+    var fis = new FileInputStream(file_path);
+    var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+    var len = -1;
+    while ((len = fis.read(b)) != -1) {
+        os.write(b, 0, len);
+    }
+    fis.close();
+}
+
+function write_os_to_file(file, os) {
+    var fis = new FileInputStream(file);
+    var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+    var len = -1;
+    while ((len = fis.read(b)) != -1) {
+        os.write(b, 0, len);
+    }
+    fis.close();
+}
+
+function download_file(file_name, file_path) {
+    $ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
+    var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+    resp.setHeader("Pragma", "No-cache");
+    resp.setHeader("Cache-Control", "no-cache, must-revalidate");
+    resp.setDateHeader("Expires", 0);
+    resp.setContentType("application/x-msdownload");
+
+    resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'UTF-8'));
+    var os = resp.getOutputStream();
+    //transfer(file_path, os);
+    write_os_to_file(file_path, os);
+    os.flush();
+}
+
+//按日期创建目录
+
+function getDatePath() {
+    set_parameter_file_path();
+    var file_path = $ctx.parameter.pdf_path; //file_path = c:/hls_test_files/content_files/
+    var now = new Date()
+    y = now.getFullYear()
+    m = now.getMonth() + 1
+    m = m < 10 ? "0" + m : m
+    var datePath = file_path + y + "/" + m + "/";
+    return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
+}
+
+
+function collection_create_content() {
+    try {
+        var datePath = getDatePath();
+
+        FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
+        var attachment_batch_dl = $bm('hls.HLS811.hls_doc_file_templet_get_atm');
+        var result = attachment_batch_dl.queryAsMap({
+            document_id: $ctx.parameter.document_id,
+            document_table: $ctx.parameter.document_table,
+            batch_flag: $ctx.parameter.batch_flag,
+            content_id: $ctx.parameter.content_id
+        });
+        var from_file_data = result.getChildren();
+        for (var i = 0;i < from_file_data.length;i++) {
+            if (!$ctx.parameter.file_path) {
+                set_parameter_file_path();
+            }
+            var to_file_path = $ctx.parameter.file_path;
+            var record_data = from_file_data[i];
+
+            //if (record_data.file_exists_flag != 'Y') {
+            var to_file_name = record_data.to_file_name;
+            var from_file_path = record_data.file_path;
+            var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
+            var guid_file_name_tables = guid_file_name_path.getChildren();
+            to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'doc' + record_data.content_id;
+            copyFile(from_file_path, to_file_path);
+
+
+
+            try {
+                $bm('csh.CSH501.csh_transaction_return_print').update({
+                    document_id: $ctx.parameter.document_id,
+                    document_table: $ctx.parameter.document_table
+                });
+                var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
+                brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id.toString(), 'COMMON');
+            } catch (e) {
+                raise_app_error(e);
+            }
+
+            // word转pdf
+            var pdf_file_path=to_file_path;
+            var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
+            //var outputfilename= record_data.to_file_name +'.pdf';
+            var filename_str = record_data.to_file_name;
+            var outputfilename= filename_str.substr(0, filename_str.length - 5) +'.pdf';
+            var pdf_file = new File(outputfilepath);
+            var file_size = 0;
+            if (pdf_file.exists()) {
+                file_size = pdf_file.length();
+            }
+
+            $bm('hls.HLS811.hls_file_content_copy_update').update({
+                table_name: 'HLS_DOC_FILE_CONTENT',
+                content_id: record_data.content_id,
+                file_name: outputfilename.toString(),
+                file_path: outputfilepath.toString(),
+                source_type: $ctx.parameter.source_type
+            });
+
+            //var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+            //HlsFileUtil.downloadFile(encodeURI(to_file_path,'utf-8'),encodeURI(to_file_name,'utf-8'),resp);
+            //print(outputfilepath.toString());
+            //print(outputfilename.toString());
+            download_file(outputfilename.toString(),outputfilepath.toString());
+
+        }
+
+        $ctx.parameter.return_status = 'S';
+        $ctx.parameter.return_message = '执行成功';
+    } catch (e) {
+        $ctx.success = "true";
+        $ctx.parameter.return_status = 'E';
+        $ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
+        raise_app_error(e);
+    }
+    var result = {
+        result: $ctx.parameter.return_status,
+        message: $ctx.parameter.return_message
+    };
+    $ctx.parameter.json = JSON.stringify(result);
+}
+if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
+    collection_create_content();
+}
+]]></s:server-script>
+</a:init-procedure>
+<a:service-output/>
+</a:service>

src/main/webapp/modules/csh/CSH551/con_comsn_reconcilia_wfl.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: zhangxing5129  
+    $Date: 2014-8-1 下午02:44:52  
+    $Revision: 1.0  
+    $Purpose: 合同维护
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:view>
+        <a:link id="wfl_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <script type="text/javascript"><![CDATA[
+
+        Leaf.onReady(function () {
+            var batch_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_reconcilia_batch');
+            var comsn_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_reconcilia');
+            $(batch_ds_id).setQueryParameter('batch_id', '${/parameter/@batch_id}');
+            $(comsn_ds_id).setQueryParameter('batch_id', '${/parameter/@batch_id}');
+            $(batch_ds_id).query();
+            $(comsn_ds_id).query();
+        });
+
+        if ('${/parameter/@layout_code}' == 'CSH551WFL_M') {
+            zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function(type) {
+                var root_ds = $('${/parameter/@layout_code}_virtual_ds');
+                if (type == 'agree') {
+                    if (root_ds.validate()) {
+                        //提交先保存
+                        root_ds.submit();
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }else{
+                    return true;
+                }
+            });
+        }
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>

src/main/webapp/modules/csh/CSH551/submit_comsn_selected.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
+    <a:init-procedure>
+        <a:model-delete model="csh.CSH551.submit_comsn_selected"/>
+        <batch-apply sourcepath="/parameter">
+            <a:model-execute model="csh.CSH551.submit_comsn_selected"/>
+        </batch-apply>
+        <a:model-update model="csh.CSH551.submit_comsn_selected"/>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
\ No newline at end of file

src/main/webapp/modules/gld/FND5800/gld_period_status.lview

@@ -86,16 +86,20 @@
                     Leaf.request({
                         url: url,
                         para: record.data,
-                        success: function() {
-                           
-                            record.set('period_status_code','C');
-                            
-                           	Leaf.SideBar.enable = true;
-                            Leaf.SideBar.show({
-                                msg: '关闭成功',
-                                duration: 3000
-                            });
-            
+                        success: function(args) {
+                          if (args.result.p_err_msg) {
+                                $L.showConfirm('提示', args.result.p_err_msg, function () {
+                                   record.set('period_status_code', 'C');
+                             });
+
+                          } else {
+                              record.set('period_status_code', 'C');
+                              Leaf.SideBar.enable = true;
+                              Leaf.SideBar.show({
+                                  msg: '关闭成功',
+                                  duration: 3000
+                              });
+                          }
                         },
                         scope: this
                     });

src/main/webapp/modules/hls/HLS303/bp_agent_bounty_create.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: 38823
+    $Date: 2024-03-19
+    $Revision: 1.0
+    $purpose: 佣金政策
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script"
+          customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="${/parameter/@layout_code}commission_detail_link"
+                url="${/request/@context_path}/modules/hls/HLS303/bp_agent_bounty_detail.lview"/>
+        <script type="text/javascript"><![CDATA[
+        $L.onReady(function(){
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_policy_hd');
+            $(ds_id).setQueryParameter('bp_id','${/parameter/@bp_id}');
+            $(ds_id).query();
+        });
+        //新建
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_policy_hd');
+            var param={};
+            param['bp_id'] = '${/parameter/@bp_id}';
+            param['bp_name'] = '${/parameter/@bp_name}';
+            param['extra_nam'] = '${/parameter/@extra_nam}';
+            param['function_code'] = 'HLS303_BD';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'CREATE';
+            param['winid'] = 'open_commission_detail_window';
+            param['url_title'] = '佣金政策维护';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}commission_detail_link',ds_id);
+        };
+
+        function policy_detail(id, name, query_only){
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_policy_hd');
+            var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            var policy_hd_id=record.get('policy_hd_id');
+            var wflStatus=record.get('wfl_status');
+            var bpId=record.get('bp_id');
+            var param = {};
+            if(wflStatus=='NEW' || wflStatus=='APPROVED_RETURN'){
+                param['function_code'] = 'HLS303_BD';
+                param['function_usage'] = 'MODIFY';
+                param['maintain_type'] = 'MODIFY';
+                param['url_title'] = '佣金政策维护';
+                param['policy_hd_id'] = policy_hd_id;
+                param['bp_id'] = bpId;
+                param['extra_nam'] = record.get('extra_nam');
+            }
+            if(wflStatus=='APPROVING' || wflStatus=='APPROVED'){
+                param['function_code'] = 'HLS303_BD';
+                param['function_usage'] = 'QUERY';
+                param['maintain_type'] = 'READONLY'
+                param['url_title'] = '佣金政策维护';
+                param['policy_hd_id'] = policy_hd_id;
+                param['bp_id'] = bpId;
+            }
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}commission_detail_link', ds_id, '${/parameter/@layout_code}');
+
+        }
+       //删除
+        window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_policy_hd');
+            Leaf.showConfirm('提示', '是否确认删除', function() {
+                debugger;
+                var records = $(ds_id).getSelected();
+                if(records.length ==0){
+                    $L.showMessage('提示','请至少选择一条数据!');
+                    return;
+                }
+                for(var i=0;i<records.length;i++){
+                    if(records[i].data.wfl_status == 'APPROVED' || records[i].data.wfl_status == 'APPROVING'){
+                        $L.showMessage('提示',' 请选择审批状态为新建/审批退回的单据!');
+                        return;
+                    }
+                    $(ds_id).remove(records[i]);
+                }
+            });
+        };
+        //超链接渲染
+        window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
+            var link_function = '';
+            window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+            if (name == 'policy_name') {
+                link_function = 'policy_detail';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' +value + '</a>';
+            }
+        };
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>

src/main/webapp/modules/hls/HLS303/bp_agent_create.lview

@@ -18,6 +18,8 @@
         <a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="${/parameter/@layout_code}asset_management_link"
                 url="${/request/@context_path}/modules/hls/HLS303/bp_asset_create.lview"/>
+        <a:link id="${/parameter/@layout_code}commission_link"
+                url="${/request/@context_path}/modules/hls/HLS303/bp_agent_bounty_create.lview"/>
         <a:link id="import_upload_link" url="${/request/@context_path}/modules/hls/HLS303/bp_agent_import_upload.lview"/>
         <!--<script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/>-->
         <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
@@ -362,8 +364,32 @@
             param['url_title'] = '资产管理费组合利率定义';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}asset_management_link',ds_id);
         }
-
-
+        //佣金政策
+        window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
+            var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
+            var record = $(ds_id).getAll();
+            var bp_record = $(bp_ds_id).getCurrentRecord();
+            if(bp_record.get('bp_id') == undefined){
+                $L.showMessage('提示','请先保存！');
+                return;
+            }
+            if(record.length == 0){
+                $L.showErrorMessage('提示','请先维护租赁物信息!');
+                return;;
+            }
+            var param = {};
+            param['bp_id'] = bp_record.get('bp_id');
+            param['bp_name'] = bp_record.get('bp_name');
+            param['extra_nam'] = bp_record.get('extra_nam');
+            param['function_code'] = 'HLS303_BO';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'UPDATE';
+            param['winid'] = 'open_commission_window';
+            param['url_title'] = '佣金政策';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}commission_link');
+        };
 
 
             //超链接渲染

src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview

@@ -5,6 +5,8 @@
         <a:link id="prj500_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
         <a:link id="asset_management_link_id"
                 url="${/request/@context_path}/modules/hls/HLS303/bp_asset_create.lview"/>
+        <a:link id="${/parameter/@layout_code}commission_link"
+                url="${/request/@context_path}/modules/hls/HLS303/bp_agent_bounty_create.lview"/>
         <a:link id="hls303_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
         <a:link id="hls303_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
         <script src="${/request/@context_path}/modules/prj/PRJ500N/javascripts/input_validator.js" type="text/javascript"/>
@@ -332,6 +334,29 @@
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'asset_management_link_id',ds_id);
         }
 
+        //佣金政策
+        window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
+            debugger;
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
+            var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
+            var record = $(ds_id).getAll();
+            var bp_record = $(bp_ds_id).getCurrentRecord();
+            if(record.length == 0){
+                $L.showErrorMessage('提示','请先维护租赁物信息!');
+                return;
+            }
+            var param = {};
+            param['bp_id'] = record[0].data.bp_id;
+            param['bp_name'] = bp_record.get('bp_name');
+            param['extra_nam'] = bp_record.get('extra_nam');
+            param['function_code'] = 'HLS303_BO';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'UPDATE';
+            param['winid'] = 'open_commission_window';
+            param['url_title'] = '佣金政策';
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}commission_link');
+        };
+
         //保存submitsuccess调用
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res) {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();

src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview

@@ -1613,6 +1613,12 @@
         }
 
         function hls_hls500_save_new(nextStep, source_procedure) {
+            if ('${/parameter/@division}'==93) {
+                Leaf.SideBar.show({
+                    msg:'首付款比例不能低于15%',
+                    duration: 10000
+                })
+            }
             var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
             var H1, H54, H159, H16, H12,H99,H102,H15,H44;
             var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';

src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview

@@ -351,8 +351,13 @@
                 Leaf.request({
                     url: url,
                     para: record.data,
-                    success: function () {
+                    success: function (args) {
+                    if (args.result.p_err_msg) {
+                         $L.showConfirm('提示', args.result.p_err_msg, function () {
+                             record.set('period_status_code', 'C');
+                       });
 
+                    } else {
                         record.set('period_status_code', 'C');
 
                         Leaf.SideBar.enable = true;
@@ -360,7 +365,7 @@
                             msg: '关闭成功',
                             duration: 3000
                         });
-
+                    }
                     },
                     scope: this
                 });

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

@@ -860,10 +860,15 @@
 
                     }
                 }
+                if(division !='93'){
+                    record.getField('customer_margin').setReadOnly(true);
+                    record.getField('customer_margin_n').setReadOnly(true);
+                }
                 if (division != '70'&&division!='92' && division != '') {
-                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
-                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none'
-                    ;
+                    if(division != '93'){
+                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
+                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none';
+                    }
                     document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE').style.display = 'none';
 

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

@@ -1437,10 +1437,16 @@
 
                     }
                 }
+                if(division !='93'){
+                    record.getField('customer_margin').setReadOnly(true);
+                    record.getField('customer_margin_n').setReadOnly(true);
+                }
                 if(division!='70'&&division!='92'&&division!=''){
-                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
-                    document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none'
-                    ;
+
+                    if(division != '93'){
+                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
+                        document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none';
+                    }
                     document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_BRAND_VALUE').style.display = 'none';
 
@@ -1664,6 +1670,7 @@
 
         };
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+            debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var lease_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
             var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
@@ -1773,7 +1780,7 @@
                                         var show = down_payment_rate_new * 100;
                                         if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') {
                                             if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) {
-                                                if(current_record.get('division')!='91'){
+                                                if(current_record.get('division')!='91'&&current_record.get('division')!='93'){
                                                 window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                                                 Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
                                                 return;
@@ -1871,7 +1878,7 @@
                             var show = down_payment_rate_new * 100;
                             if ((price_list == 'HL_PRICR_E' || price_list == 'HL_PRICR_TEST' || price_list == 'HL_PRICR_NTEST' || price_list == 'HL_PRICR_EN') && secondary_lease == 'NO') {
                                 if ((div((H16 + H97), (H99 + H102 - H16)).toFixed(2) * 1) < down_payment_rate_new) {
-                                    if(current_record.get('division')!='91') {
+                                    if(current_record.get('division')!='91'&&current_record.get('division')!='93') {
                                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                                     Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于' + down_payment_rate_new * 100 + '%');
                                     return;