Merge branch 'feature/con_change_feature_v5' into develop

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

@@ -18,6 +18,9 @@ sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两
 sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','ZHS','');
 sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','US','');
 
+sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_F_NUMBER','一式四份','ZHS','');
+sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_F_NUMBER','一式四份','US','');
+
 end;
 /
 commit;

src/main/database/Package/cus_con_change_req_pkg.pck

@@ -175,7 +175,7 @@ create or replace package body cus_con_change_req_pkg is
     if p_req_type = 'LEASE_CHAG' then
       cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
                                                           p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
-                                                          p_instruments_types   => '权力义务转让文本',
+                                                          p_instruments_types   => '权利义务转让文本',
                                                           p_common_seal         => 'Y',
                                                           p_corporate_visa_seal => 'Y',
                                                           p_legal_seal          => 'N',

src/main/database/Package/cus_con_contract_repo_pkg.pck

@@ -199,7 +199,7 @@ create or replace package body cus_con_contract_repo_pkg is
                                                         p_con_special_seal    => 'N',
                                                         p_financial_seal      => 'N',
                                                         p_supervisio_seal     => 'N',
-                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_seal_number         => 'SEAL_O_F_NUMBER',
                                                         p_user_id             => p_user_id);
     cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id       => v_change_req_id,
                                                         p_document_table      => 'CON_CONTRACT_CHANGE_REQ',
@@ -210,7 +210,7 @@ create or replace package body cus_con_contract_repo_pkg is
                                                         p_con_special_seal    => 'N',
                                                         p_financial_seal      => 'N',
                                                         p_supervisio_seal     => 'N',
-                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_seal_number         => 'SEAL_O_F_NUMBER',
                                                         p_user_id             => p_user_id);
     p_change_req_id := v_change_req_id;
   end;

src/main/database/Package/cus_con_et_pkg.pck

@@ -117,7 +117,7 @@ create or replace package body cus_con_et_pkg is
                                                         p_con_special_seal    => 'N',
                                                         p_financial_seal      => 'N',
                                                         p_supervisio_seal     => 'N',
-                                                        p_seal_number         => 'SEAL_O_TW_NUMBER',
+                                                        p_seal_number         => 'SEAL_O_F_NUMBER',
                                                         p_user_id             => p_user_id);
     p_change_req_id := v_change_req_id;
   end create_change_req_et;
@@ -177,6 +177,7 @@ create or replace package body cus_con_et_pkg is
        and f.cf_type = 1
        and f.contract_id = p_contract_id;
     --上一次完全核销现金流
+    begin
       select (p_et_date - f.due_date + 1) fund_possession_time
         into v_fund_possession_time
         from con_contract_cashflow f
@@ -186,6 +187,10 @@ create or replace package body cus_con_et_pkg is
          and f.cf_type = 1
          and f.cf_direction != 'NONCASH'
          and f.contract_id = p_contract_id;
+    exception
+      when no_data_found then
+        v_fund_possession_time := 1;
+    end;
     v_fund_possession_cost := v_sum_unreceived_principal *
                               nvl(v_fund_possession_time, 1) *
                               NVL(p_et_interest_rate,

src/main/database/Register_function/REGISTER_CON_ET003.sql

@@ -30,6 +30,7 @@ sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_et_date_am
 sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_cashflow');
 sys_function_assign_pkg.func_bm_load('CON_ET003','basic.hls_division_for_lov');
 sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.submit_change_req');
+sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON701.hls_bp_master_v_all_lov');
 
 --分配菜单
 sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET003',p_enabled_flag=>'Y',P_USER_ID=>-1);

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -175,24 +175,43 @@
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
                 $('${/parameter/@layout_code}_submit_approval').disable();
             var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+            var req_ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
             var req_record = $(req_ds_id).getAt(0);
             var case_type = '';
             var document_type = '${/parameter/@document_type}';
             var calc_session_id = req_record.get('calc_session_id');
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-                if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
+                if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable()) && $(req_ds_id2).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
                     // if (req_record.dirty) {
                     //     Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
                     //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     //     return;
                     // }
+                        // 回款賬戶變更
+                        if('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY'){
+                               var bank_account_num_s =req_record.get('bank_account_num_s');
+                               var bank_account_num_c =req_record.get('bank_account_num_c');
+                               if(bank_account_num_s == bank_account_num_c){
+                                       Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
+                                       return;
+                               }else{
                                        $('${/parameter/@layout_code}_submit_approval').disable();
                                        $('${/parameter/@layout_code}_save').disable();
-                        if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
+                                       if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
                                                $('${/parameter/@layout_code}_quote').disable();
                                        }
                                        $('${/parameter/@layout_code}_user_button1').disable();
                                        setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
+                               }
+                        }else {
+                                $('${/parameter/@layout_code}_submit_approval').disable();
+                                $('${/parameter/@layout_code}_save').disable();
+                                if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
+                                        $('${/parameter/@layout_code}_quote').disable();
+                                }
+                                $('${/parameter/@layout_code}_user_button1').disable();
+                                setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
+                        }
                 } else {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                 }
@@ -485,7 +504,7 @@
                 }
             }else if (name == 'description') {
                 if (record.get('important_flag') == 'Y') {
-                    return '<font color="RED">' + value + '</font>';
+                    return '<span style="color: RED; ">' + value + '</span>';
                 }
                 return value;
             }

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

@@ -218,15 +218,6 @@
                 }
             }
         };
-        //查询时调用(grid,table,gridBox)
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
-            var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
-            if (ds == $(ds_us_id)) {debugger
-                $(ds).setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
-                $(ds).setQueryParameter('change_req_id','${/parameter/@change_req_id}');
-                $(ds).query();
-            }
-        };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

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

@@ -341,7 +341,7 @@
                 return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
             }else if (name == 'description') {
                 if (record.get('important_flag') == 'Y') {
-                    return '<font color="RED">' + value + '</font>';
+                    return '<span style="color: RED; ">' + value + '</span>';
                 }
                 return value;
             }
@@ -366,9 +366,9 @@
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
             var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
             if (ds == $(ds_us_id)) {debugger
-                $(ds).setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
-                $(ds).setQueryParameter('change_req_id','${/parameter/@change_req_id}');
-                $(ds).query();
+                ds.setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
+                ds.setQueryParameter('change_req_id','${/parameter/@change_req_id}');
+                ds.query();
             }
         };
         ]]></script>