合同签约前变更提交=>龚镇江

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

@@ -25,6 +25,12 @@ values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate);
 insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
 values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate);
 
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'con_contract_con733_lv', 'VIEW', -1, sysdate, -1, sysdate);
+
+insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
+values ('CONTRACT', 'CON_CONTRACT_LEASE_ITEM_CCR_LV', 'VIEW', -1, sysdate, -1, sysdate);
+
 end;
 /
 commit;

src/main/database/Register_function/CON733_ADD.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool REGISTER_ACP522.log
+
+set feedback off
+set define off
+
+begin
+  --页面注册
+  sys_function_assign_pkg.service_load('modules/cont/CON731/hls_before_sign_change_detail.lview','签约前合同变更',1,1,0);
+  --功能定义
+--分配页面
+  sys_function_assign_pkg.func_service_load('CON733','modules/cont/CON731/hls_before_sign_change_detail.lview');
+  sys_function_assign_pkg.func_service_load('CON736','modules/cont/CON731/hls_before_sign_change_detail.lview');
+  sys_function_assign_pkg.func_service_load('ZJWFL5110','modules/cont/CON731/hls_before_sign_change_detail.lview');
+    sys_function_assign_pkg.func_service_load('CON733','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
+  sys_function_assign_pkg.func_service_load('CON736','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
+  sys_function_assign_pkg.func_service_load('ZJWFL5110','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
+
+  --分配bm
+  sys_function_assign_pkg.func_bm_load('CON733','check_after_save_bm.check_change_con_lease_item');
+  sys_function_assign_pkg.func_bm_load('CON736','check_after_save_bm.check_change_con_lease_item');
+  sys_function_assign_pkg.func_bm_load('ZJWFL5110','check_after_save_bm.check_change_con_lease_item');
+
+end;
+/
+commit;
+
+set feedback on
+set define on
+
+spool off
+exit
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+            $Author: wangwei
+            $Date: 2022-12_06 上午11:00:06
+            $Revision: 3.0
+            $Purpose:合同变更租赁物保存校验
+        -->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+<bm:operations>
+    <bm:operation name="update">
+        <bm:update-sql><![CDATA[
+                begin
+                    con_contract_workflow_pkg.check_change_con_lease_item(
+                    p_contract_id =>${@contract_id},
+                    p_machine_number =>${@machine_number},
+                    p_user_id => ${/session/@user_id}
+                    );
+                end;
+            ]]></bm:update-sql>
+    </bm:operation>
+
+</bm:operations>
+</bm:model>
+

src/main/webapp/modules/cont/CON732/hls_ccr_modify_entrance.lview

@@ -10,6 +10,7 @@
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON501N/con_contract_modify.lview"/>
         <a:link id="con_contract_change_link" url="${/request/@context_path}/modules/cont/CON731/hls_con_contract_change_detail.lview"/>
+        <a:link id="con_contract_sign_before_change_link" url="${/request/@context_path}/modules/cont/CON731/hls_before_sign_change_detail.lview"/>
         <a:link id="hls_ccr_modify_wfl_msg_link" url="${/request/@context_path}/modules/cont/CON732/hls_ccr_modify_wfl_msg_detail.lview"/>
         <a:link id="con_contract_change_req_link" url="${/request/@context_path}/modules/cont/CON701/con_contract_et_print.lsc"/>
         <script type="text/javascript"><![CDATA[
@@ -118,8 +119,19 @@
                     param['function_code'] = 'CON733BPB';
                     param['url_title'] = '变更申请-合同回款账户变更';
                 }
+                else if (record.get('ccr_document_type') == 'CCR_BEFORE_SIGN') {
+                    param['function_code'] = 'CON733CBSIGN';
+                    param['url_title'] = '变更申请-签约前合同变更';
+                }
                 param['document_type'] = record.get('ccr_document_type');
-                hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
+                if (record.get('ccr_document_type') == 'CCR_BEFORE_SIGN') {
+                    //签约前变更换个页面，方便后续新人代码阅读 wangwei
+                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_sign_before_change_link', ds_id);
+                }else{
+                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
+                }
+
+
             };
             
             //变更申请打印单

src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview

@@ -18,6 +18,7 @@
                 url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
         <a:link id="con_contract_change_link"
                 url="${/request/@context_path}/modules/cont/CON731/hls_con_contract_change_detail.lview"/>
+        <a:link id="con_contract_sign_before_change_link" url="${/request/@context_path}/modules/cont/CON731/hls_before_sign_change_detail.lview"/>
         <a:link id="con733_create_change_link" model="cont.CON733.create_change_req" modelaction="execute"/>
         <a:link id="con_contract_change_req_link"
                 url="${/request/@context_path}/modules/cont/CON701/con_contract_et_print.lsc"/>
@@ -68,6 +69,10 @@
                     $(ds_id).setQueryParameter('contract_status', '');
                     $(ds_id).query();
                 }
+                if (value == 'CCR_BEFORE_SIGN') {
+                    $(ds_id).setQueryParameter('contract_status', 'NEW');
+                    $(ds_id).query();
+                }
             }
         };
 
@@ -101,7 +106,6 @@
             var head_record = $(head_ds_id).getAt(0);
             var record = records[0];
             var ccr_document_type = head_record.get('ccr_document_type');
-            debugger;
             if ($(head_ds_id).validate($('${/parameter/@layout_code}_user_button1').enable())) {
                 //售后回租 无法进行承租人变更和回款账户变更
                 if (record.get('business_type') == 'LEASEBACK' && (ccr_document_type == 'LEASE_CHAG' || ccr_document_type == 'ACC_CHAG')) {
@@ -113,6 +117,10 @@
                     Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!');
                     return;
                 }
+                /*if(record.get('division') != '70' && ccr_document_type == 'CCR_BEFORE_SIGN'){
+                    Leaf.showErrorMessage('${l:PROMPT}', '仅铁甲业务可操作此项变更!');
+                    return;
+                }*/
                 Leaf.showConfirm('特别注意', '<span style="color: #ff0000; ">该操作将导致合同在变更期间无法进行后续操作，请谨慎操作！！！如果需要取消变更，请一定点击取消变更按钮！！！</span>', function () {
 
                     var contract = record.get('contract_id');
@@ -151,8 +159,18 @@
                                 param['function_code'] = 'CON733BPB';
                                 param['url_title'] = '变更申请-合同回款账户变更';
                                 param['winid'] = 'con733_bpb_change_detail_winid';
+                            }else if (ccr_document_type == 'CCR_BEFORE_SIGN') {
+                                param['function_code'] = 'CON733CBSIGN';
+                                param['url_title'] = '变更申请-签约前合同变更';
+                                param['winid'] = 'con733_before_sign_change_detail_winid';
                             }
+                            if(ccr_document_type == 'CCR_BEFORE_SIGN') {
+                            //签约前变更换个页面，方便后续新人代码阅读 wangwei
+                            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_sign_before_change_link', ds_id);
+                            }else{
                             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_change_link', ds_id);
+                             }
+
                         },
                         failure: function () {
                             //   $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
@@ -176,8 +194,7 @@
             }
         };
         ]]></script>
-        <a:screen-include
-                screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON733"/>
+        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON733"/>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>