茂甲控制保证金上线代码整理和正式环境csh531f文件夹缺失填补

src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_check_wfl.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="execute">
+            <bm:update-sql><![CDATA[
+           begin
+           margin_check_req_pkg.margin_check_submit(
+           p_user_id =>${/session/@user_id},
+           p_margin_check_id => ${@margin_check_id}
+           );
+           end;
+           ]]></bm:update-sql>
+        </bm:operation>
+
+        <bm:operation name="insert">
+            <bm:parameters>
+                <bm:parameter name="margin_check_id" dataType="java.lang.Long" input="false" output="true"/>
+            </bm:parameters>
+            <bm:update-sql><![CDATA[
+        		begin
+				  margin_check_req_pkg.margin_check_save(
+				                 p_sql_type     => 'INSERT',
+				                 p_user_id     =>${/session/@user_id},
+                                 p_margin_check_id => ${@margin_check_id},
+                                 p_mar_after_status => ${@mar_after_status},
+                                 p_mar_before_status =>${@mar_before_status}
+                                 );
+				end;
+]]></bm:update-sql>
+        </bm:operation>
+
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+select Mar_After_Status as Mar_Status, mar_after_status_n
+  from (select t.mar_after_status,
+               (SELECT Code_Value_Name
+                  FROM Sys_Code_Values_v sv
+                 where sv.code = 'MARGIN_CHECK_STATUS'
+                   and sv.code_value = t.mar_after_status) mar_after_status_n
+          from Csh_Margin_Check t
+         where t.wfl_status = 'APPROVED'
+         order by t.creation_date desc)
+ where Rownum = 1
+]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
+

src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_submit.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: sc
+    $Date: 2022年12月2日11:26:37
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                cm_sh_transaction_reverse_pkg.csh_bank_recoin_submit(
+                p_transaction_id         =>${@transaction_id},
+                p_user_id                =>${/session/@user_id}
+                );
+                end;
+              ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
+

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

@@ -338,5 +338,6 @@ var enableLayoutConfig = {
 	'modules/prj/PRJ501N/prj_project_lease_import.lview:':true,
 	'modules/csh/CSH531F/csh_bank_recoi_processing.lview':true,
 	'modules/csh/CSH531F/csh_bank_recoi_processing_workflow.lview':true,
+	'modules/csh/CSH531F/csh_bank_recoi_margin_check.lview':true,
 	'modules/hsbc/HSBC130/pingan_account_hisbalance_query.lview':true
 };
\ No newline at end of file

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

@@ -9,6 +9,7 @@
           dynamiccreateenabled="true" trace="true">
     <a:init-procedure>
         <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+        <a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
         <a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/>
         <a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/>
         <s:server-script import="contract_print_path.js"><![CDATA[
@@ -607,10 +608,11 @@
                 return;
             }
             if ($(ds_id).validate()) {
-                debugger;
-                if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
-                    Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
-                    return;
+                if('${/model/wfl_status/record/@mar_status}' == 'Y'){
+                    if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
+                        Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
+                        return;
+                    }
                 }
                 // if(record.get('division')=='92'&&record.get('write_off_amount')<record.get('customer_margin')){
                 //     Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租');

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -30,6 +30,8 @@
         <!-- <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_import.lview"/>-->
 
         <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
+        <a:link id="csh_margin_check_id" url="${/request/@context_path}/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview"/>
+        <a:link id="hls_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function(){
             //console.log($('csh_transaction_receipt_maintain_result_ds'));
@@ -487,8 +489,16 @@
         function csh510_export() {
             $('csh_transaction_receipt_maintain_grid_ds')._export(null,'收款维护');
         }
+        function csh531_margin_check() {
+            var param={};
+            param['function_code']= 'CSH531F3';
+            param['function_usage'] = 'MODIFY';
+            param['url_title']='控制茂甲保证金校验';
+            hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
+        }
 
         ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
             <a:dataSet id="confirmed_flag_ds">
                 <a:datas>
@@ -711,6 +721,7 @@
                 <a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/>
                 <!--                <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>-->
                 <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
+                <a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>
                 <!--  <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
                 <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
             </a:screenTopToolbar>

src/main/webapp/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<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:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
+    </a:init-procedure>
+    <a:view>
+        <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+                <a:link id="${/parameter/@layout_code}_csh531_margin_check_submit_link_id" model="csh.CSH531F.csh_transaction_recoi_check_wfl" modelaction="execute"/>
+                <a:link id="${/parameter/@layout_code}_csh531_margin_check_save_link_id" model="csh.CSH531F.csh_transaction_recoi_check_wfl" modelaction="insert"/>
+        <script type="text/javascript"><![CDATA[
+        $L.onReady(function () {
+            if("${/parameter/@function_usage}" == 'QUERY'){
+                if(document.getElementById('${/parameter/@layout_code}_user_button1')){
+                    $jq('#${/parameter/@layout_code}_user_button1').hide();
+                }
+                var marginCheckId="${/parameter/@MARGIN_CHECK_ID}";
+                var ds_query_id= 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
+                var ds_result_id= 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
+                if($(ds_query_id)){
+                    $(ds_query_id).setQueryParameter('margin_check_id',marginCheckId);
+                    $(ds_query_id).query();
+                }
+                if($(ds_result_id)){
+                    $(ds_result_id).setQueryParameter('margin_check_id',marginCheckId);
+                    $(ds_result_id).query();
+                }
+            }else{
+                var ds_result_id= 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
+                if($(ds_result_id)){
+                    $(ds_result_id).query();
+                }
+            }
+
+            var ds_id= 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
+            var record= $(ds_id).getCurrentRecord();
+            if(Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
+                record.set('mar_before_status','Y');
+                record.set('mar_before_status_n','打开');
+            }else {
+                record.set('mar_before_status','${/model/wfl_status/record/@mar_status}');
+                record.set('mar_before_status_n','${/model/wfl_status/record/@mar_after_status_n}');
+            }
+        });
+
+
+        //自定义提交审批保存
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+            window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
+            var  ds_id = 'MARGIN_CHECK_F_QUERY_csh_margin_check_ds';
+            var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
+            var record=$(ds_id).getCurrentRecord();
+            var params = record.data;
+            var marAfterStatus= params.mar_after_status;
+            if(Ext.isEmpty(marAfterStatus)){
+                Leaf.showErrorMessage('提示', '修改后茂甲保证金校验状态不能为空!');
+                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                return false;
+            }
+            if (marAfterStatus == '${/model/wfl_status/record/@mar_status}') {
+                Leaf.showErrorMessage('提示', '请选择与修改前茂甲保证金校验不同的状态');
+                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                return false;
+            }
+
+            if($(ds_result_id)){
+                var record=$(ds_result_id).getAll();
+                    for (var i = 0; i < record.length; i++) {
+                        if (record[i].get('wfl_status') == 'APPROVING') {
+                            Leaf.showErrorMessage('提示', '当前系统中已有审批中单据，请审批结束后再提交审批');
+                            window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                            return false;
+                        }
+                    }
+            }
+            Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.ARE_YOU_SURE_TO_SUBMIT}', function() {
+                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+                Leaf.request({
+                    url: $('${/parameter/@layout_code}_csh531_margin_check_save_link_id').getUrl(),
+                    para: params,
+                    success: function(res) {
+                        var marginCheckId=res.result.margin_check_id;
+                        Leaf.request({
+                            url: $('${/parameter/@layout_code}_csh531_margin_check_submit_link_id').getUrl(),
+                            para: {
+                                margin_check_id: marginCheckId,
+                            },
+                            success: function(res) {
+                                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                                $('${/parameter/@winid}').close();
+                                Leaf.SideBar.show({
+                                    msg: '操作成功',
+                                    duration: 200
+                                });
+                            },
+                            failure: function() {
+                                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                            },
+                            error: function() {
+                                window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                            },
+                            scope: this
+                        });
+                        var ds_result_id = 'MARGIN_CHECK_F_RESULT_csh_margin_check_ds';
+                        $(ds_result_id).query();
+                        $(ds_id).query();
+                    },
+                    failure: function() {
+                        window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    error: function() {
+                        window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    scope: this
+                });
+            },function (){
+                    window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+            });
+        }
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>