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

# Conflicts:
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru.lview
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview

src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm

@@ -53,6 +53,7 @@
         <bm:field name="sign_contract_status_n"/>
         <bm:field name="bp_id_tenant_n"/>
         <bm:field name="bp_id_agent_level1_n"/>
+        <bm:field name="project_status"/>
     </bm:fields>
     <bm:primary-key>
         <bm:pk-field name="contract_id"/>

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

@@ -88,7 +88,9 @@
         v.write_off_date,
         v.write_off_amount,
         v.division,
-		v.finance_amount
+		v.finance_amount,
+		v.lease_item_amount,
+		v.is_buyout
   FROM (SELECT t.contract_id,
                 (SELECT hbbc.bank_account_id
                        FROM hls_bp_master_bank_account hbbc
@@ -220,7 +222,9 @@
                 from csh_write_off cwo
                  where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
                t.division,
-			   t.finance_amount
+			   t.finance_amount,
+			   t.lease_item_amount,
+			   nvl(t.is_buyout,'N') is_buyout
           FROM con_contract_cashflow f
           join con_contract t
             on t.contract_id = f.contract_id

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

@@ -60,7 +60,7 @@
               cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
 
                --应付我司金额
-               cpr.amount_agent,
+               nvl(cpr.amount_agent,0) amount_agent,
                cpr.amount_vender,
                to_char(cpr.amount_agent,'FM999,999,999,990.00')  amount_agent_print,
               to_char(cpr.amount_vender,'FM999,999,999,990.00')  amount_vender_print,
@@ -131,7 +131,8 @@
         nvl((select  sum(cwo.write_off_due_amount) write_off_amount
                 from csh_write_off cwo
                  where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
-        c.division
+        c.division,
+        nvl(c.is_buyout,'N') is_buyout
           from csh_payment_req_ln cpr,
                con_contract c,
                hls_bp_master hbm,

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

@@ -158,6 +158,11 @@
                 (select bp_name
                    from hls_bp_master
                   where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
+                --add by 18938
+                (select nvl(is_constru_unit,'N')
+                   from hls_bp_master
+                  where hls_bp_master.bp_id = t.bp_id_agent_level1) is_constru_unit,
+                 nvl(t.is_buyout,'N') is_buyout,
                 --查找厂商
                 (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
                 hli.vender_name,
@@ -255,6 +260,8 @@
         <bm:field name="con_business_type_n"/>
         <bm:field name="cdd_list_id"/>
         <bm:field name="bp_id_agent_n"/>
+        <bm:field name="is_constru_unit"/>
+        <bm:field name="is_buyout"/>
         <bm:field name="bp_id_tenant"/>
 <!--        <bm:field name="vender_name"/>-->
         <bm:field name="vender_name_n"/>

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

@@ -126,7 +126,11 @@
                 //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'
-                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ') {
+                ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ'
+                //add by 18938
+                ||record_data.templet_code == 'BUSINESS_CONTRACT_XN' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN2'  || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN' || record_data.templet_code == 'DOWN_PAYMENT_OFFSET'
+                ||record_data.templet_code == 'FINANCE_LEASEBACK_CONTRACT_XN' || record_data.templet_code == 'LEASE_ORDER_XN'  || record_data.templet_code == 'LEASE_ORDER_XN2' || record_data.templet_code == 'FINANCE_LEASE_CONTRACT_XN'
+                ||record_data.templet_code == 'CON_CONTRACT_MORTGAGE_XN') {
 
             // word转pdf
             var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;

src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview

@@ -240,6 +240,8 @@
             param['approval_status'] = record.get('approval_status');
             param['con_business_type'] = record.get('con_business_type');
             param['division'] = record.get('division');
+            //add by 18938
+            param['is_constru_unit'] = record.get('is_constru_unit');
             if (record.get('business_type') == 'PAYMENT') {
                 param['function_code'] = 'CSH501D';
             } else if (record.get('business_type') == 'PREPAYMENT') {

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -129,6 +129,9 @@
                             param['product_type_n'] = record.get('product_type_n');
                             param['product_name_write'] = record.get('product_name_write');
                         }
+                        //add by 18938
+                        param['is_constru_unit'] = record.get('is_constru_unit');
+                        param['is_buyout'] = record.get('is_buyout');
                         param['winid'] = 'csh501_csh_payment_req_link_winid';
                         param['url_title'] = '付款申请';
                         hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');

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

@@ -370,7 +370,8 @@
                         id_num: id_num,
                         recreate_H_formula: recreate_H_formula,
                         recreate_L_formula: recreate_L_formula,
-                        division:'${/parameter/@division}'
+                        division:'${/parameter/@division}',
+                        is_constru_unit: '${/parameter/@is_constru_unit}'
                     },
                     url: url,
                     title: '${l:HLS.FIN_CALCULATOR}',
@@ -1560,6 +1561,7 @@
             debugger;
             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';
             for (var i = 0; i < temp_head_records.length; i++) {
                 if (temp_head_records[i].get('column_code') == 'H1') {
                     H1 = temp_head_records[i].get('column_value') || 0;
@@ -1623,7 +1625,7 @@
                 unlock_calc_current_window();
                 return false;
             }
-            if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}'=='LEASEBACK') {
+            if ('${/parameter/@document_category}' == 'PROJECT' && '${/parameter/@business_type}'=='LEASEBACK' && is_constru_unit != 'Y') {
                 var dowm_payment = div(H16, plus(H99,H102)).toFixed(2) * 100;
                 if (dowm_payment < 15) {
                     if ('${/parameter/@division}'!=91) {

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

@@ -149,7 +149,8 @@
                                     id_num: 0,
                                     calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
                                     recreate_L_formula: calc_recreate_L_formula,
-                                    division:'${/parameter/@division}'
+                                    division:'${/parameter/@division}',
+                                    is_constru_unit: 'Y'
                                 },
                                 url: url,
                                 fullScreen: true,
@@ -205,7 +206,8 @@
                                 id_num: 0,
                                 calc_type: '${/parameter/@calc_type}',
                                 recreate_L_formula: 'N',
-                                division:'${/parameter/@division}'
+                                division:'${/parameter/@division}',
+                                is_constru_unit: 'Y'
                             },
                             url: url,
                             fullScreen: true,
@@ -253,7 +255,8 @@
                                         id_num: 0,
                                         calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
                                         recreate_L_formula: calc_recreate_L_formula,
-                                        division:'${/parameter/@division}'
+                                        division:'${/parameter/@division}',
+                                        is_constru_unit: 'Y'
                                     },
                                     url: url,
                                     fullScreen: true,

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

@@ -19,7 +19,7 @@
 
         Leaf.onReady(function() {
             var status='${/parameter/@project_status}';
-            if (('${/parameter/@hide_flag}' == 'Y' || status=='APPROVING' || status=='CLOSED' || status=='CONTRACT_CREATED') && ("${/model/role_info/record/@role_code}"!="0019")) {
+            if (('${/parameter/@hide_flag}' == 'Y' || status=='APPROVING' || status=='CLOSED' || status=='CONTRACT_CREATED')) {
                 $('PROJECT_LEASE_IMPORT_user_button1').hide();
                 $('PROJECT_LEASE_IMPORT_user_button2').hide();
                 $('PROJECT_LEASE_IMPORT_user_button4').hide();

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

@@ -187,7 +187,8 @@
                                     id_num: 1,
                                     calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
                                     recreate_L_formula: calc_recreate_L_formula,
-                                    division:division
+                                    division:division,
+                                    is_constru_unit: 'Y'
                                 },
                                 url: url,
                                 fullScreen: true,
@@ -230,7 +231,8 @@
                                 id_num: 1,
                                 calc_type: '${/parameter/@calc_type}',
                                 recreate_L_formula: 'N',
-                                division:division
+                                division:division,
+                                is_constru_unit: 'Y'
                             },
                             url: url,
                             fullScreen: true,
@@ -591,7 +593,7 @@
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
             if(lease_item_ds_id == ds.id &&lease_item_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(division!='30' && division!='50'&& division!='99'){
+                if(division!='30' && division!='50'){
                     $(gridId).hideColumn('machine_number_n');
                 }
                 if((division=='70'||division=='92')&&division!=''){
@@ -1181,7 +1183,7 @@
                     record.getField('modelcd').setReadOnly(true);
                 }
 
-                if(division=='30'||division=='50'||division=='80'||division=='99'){
+                if(division=='30'||division=='50'||division=='80'){
                     record.getField('set_number').setRequired(true);
                 }else{
                     record.getField('set_number').setReadOnly(true);

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

@@ -17,6 +17,7 @@
         <a:link id="prj_project_bp_parameter_link" url="${/request/@context_path}/modules/prj/PRJ501/prj_project_bp_parameter.lview"/>
 <!--        <a:link id="car_modify_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_readonly.lview"/>-->
         <a:link id="car_modify_link_readonly" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
+        <a:link id="car_modify_link_readonly_c" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_constru.lview"/>
         <a:link id="car_modify_mananger_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_manager.lview"/>
         <a:link id="prj_project_close_link_id" model="prj.PRJ501.prj_project_close" modelaction="update"/>
         <a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ500N/prj_project_create_special.lview"/>
@@ -27,17 +28,27 @@
             function open_project_modify_win(record_id, ds_id) {
 
                 var record = $(ds_id).findById(record_id);
+                var url;
                 //项目类layout_code
 
                         maintain_type = 'QUERY';
                         param = record.data;
                         param['document_id'] = record.get('project_id');
-                        param['function_code'] = 'PRJ501Q';
+
                         param['function_usage'] = 'MODIFY';
                         param['bp_class'] = 'NP';
                         param['maintain_type'] = maintain_type;
                         param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
-                        hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link_readonly', ds_id);
+                        //add by 18938
+                        if(record.get('is_constru_unit') == 'Y'){
+                            param['function_code'] = 'PRJ501Q_CONSTRU';
+                            url = 'car_modify_link_readonly_c';
+                        }else{
+                            param['function_code'] = 'PRJ501Q';
+                            url = 'car_modify_link_readonly';
+                        }
+                        //end
+                        hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, url, ds_id);
 
             }
             

src/main/webapp/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_node_approve_history.lview

@@ -3,7 +3,7 @@
     <a:init-procedure>
         <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_service_display" rootPath="workflow_service_record"/>
         <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_workflow_instance" rootPath="instance_simple_record"/>
-        <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_node_info_display" rootPath="node_info_record"/>
+        <a:model-query defaultWhereClause="t1.instance_id=${/parameter/@instance_id}" model="zjwfl.zj_wfl_node_info_display" rootPath="node_service_record"/>
     </a:init-procedure>
     <a:view>
         <script type="text/javascript"><![CDATA[
@@ -17,9 +17,9 @@
                     <div style="color:red;"><![CDATA[自定义页面获取失败]]></div>
                 </a:case>
                 <a:case value="*">
-                <a:switch test="/model/node_service_info/record/@workflow_code">
+                <a:switch test="/model/node_service_record/record/@workflow_code">
                     <a:case value="PROJECT_WFL">
-                        <a:switch test="/model/node_service_info/record/@is_constru_unit">
+                        <a:switch test="/model/node_service_record/record/@is_constru_unit">
                             <a:case value="Y">
                                 <a:screen-include screen="${/model/workflow_service_record/record/@service_url_constru}"/>
                             </a:case>