[refactor] 反冲功能校验改造

src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_ebank_batch.lwm

@@ -51,6 +51,7 @@
                     hls_ebank_batch_pkg.create_ebank_batch(
                                p_bank_account_id     =>${@bank_account_id},
                                p_merger_rules        =>${@merger_rules},
+                               p_pay_method          =>${@payment_method},
                                p_payment_amount_from =>${@payment_amount_from},
                                p_payment_amount_to   =>${@payment_amount_to},
                                p_due_date            =>to_date(${@due_date},'yyyy-mm-dd'),

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

@@ -76,6 +76,7 @@
         <bm:field name="auto_filt_prinicipal_interest" expression="&apos;Y&apos;" forInsert="false" forUpdate="false" prompt="CSH513.AUTO_FILT_PRINICIPAL_INTEREST"/>
         <bm:field name="returned_flag_desc" forInsert="false" forUpdate="false" prompt="CSH511.CSH_TRANSACTION.RETURNED_FLAG"/>
         <bm:field name="receipt_type"/>
+        <bm:field name="paid_byother_flag"/>
         <bm:field name="receipt_type_des" expression="(select v.code_value_name from sys_code_values_v v where v.code=&apos;RECEIPT_TYPE&apos; and v.code_value=t1.receipt_type)"/>
         <bm:field name="ref_n01"/>
     </bm:fields>

src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview

@@ -25,6 +25,7 @@
                     para: {
                         bank_account_id: record.get('bank_account_id'),
                         merger_rules: record.get('merger_rules'),
+                        pay_method: record.get('pay_method'),
                         payment_amount_from: record.get('payment_amount_from'),
                         payment_amount_to: record.get('payment_amount_to'),
                         due_date: record.get('due_date')
@@ -76,6 +77,13 @@
         }
         ]]></script>
         <a:dataSets>
+            <a:dataSet id="pay_methods_ds">
+                <a:datas>
+                    <a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/>
+                    <a:record code_value="CCB_THREE" code_value_name="建行扣款（三方）"/>
+                    <a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/>
+                </a:datas>
+            </a:dataSet>
             <a:dataSet id="hls_ccb_form_create_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550"
@@ -89,13 +97,14 @@
                             <a:map from="currency_code" to="currency"/>
                         </a:mapping>
                     </a:field>
-
+                    <a:field name="pay_method_desc" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
+                    <a:field name="pay_method"/>
                     <a:field name="bank_account_name" readOnly="true"/>
                     <a:field name="bank_name" readOnly="true"/>
                     <a:field name="currency" readOnly="true"/>
                     <a:field name="due_date" datatype="date" defaultValue="${/model/create_date_path/record/@now_date}" required="true" prompt="应收日期"/>
-                    <!--<a:field name="merger_rules" defaultValue="NONE"/>-->
-                    <a:field name="merger_rules" defaultValue="CONTRACT"/>
+                    <a:field name="merger_rules" defaultValue="NONE"/>
+<!--                    <a:field name="merger_rules" defaultValue="CONTRACT"/>-->
                 </a:fields>
             </a:dataSet>
 
@@ -112,18 +121,19 @@
                 <a:gridButton click="return_batch" text="返回"/>
             </a:screenTopToolbar>
 
-            <a:fieldSet title="本方账户" column="2">
+            <a:fieldSet title="本方账户" column="3">
                 <a:lov name="bank_account_num" bindTarget="hls_ccb_form_create_ds" prompt="银行账户"/>
                 <a:textField name="bank_account_name" bindTarget="hls_ccb_form_create_ds" prompt="账户名"/>
                 <a:textField name="bank_name" bindTarget="hls_ccb_form_create_ds" prompt="银行"/>
+                <a:comboBox name="pay_method_desc" bindTarget="hls_ccb_form_create_ds" prompt="支付方式"/>
                 <a:textField name="currency" bindTarget="hls_ccb_form_create_ds" prompt="币种"/>
             </a:fieldSet>
             <a:fieldSet title="合并规则" column="2">
                 <a:radio name="merger_rules" bindTarget="hls_ccb_form_create_ds" layout="horizontal" width="600">
                     <a:items>
-                        <!--<a:item label="不合并" value="NONE"/>-->
                         <a:item label="按合同" value="CONTRACT"/>
                         <a:item label="按期数" value="TIMES"/>
+                        <a:item label="不合并" value="NONE"/>
                     </a:items>
                 </a:radio>
             </a:fieldSet>

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview

@@ -11,8 +11,10 @@
         <a:model-query fetchAll="true" model="csh.CSH510.csh_transaction_query" rootPath="csh_value"/>
     </a:init-procedure>
     <a:view>
-        <a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/>
-        <a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>
+        <a:link id="csh_transaction_write_off_reverse_link_id"
+                url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/>
+        <a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse"
+                modelaction="batch_update"/>
         <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
         <script type="text/javascript"><![CDATA[
 
@@ -23,12 +25,13 @@
             if ($('csh_transaction_receipt_write_off_reverse_detail_head_ds').validate()) {
                 var head_record = $('csh_transaction_receipt_write_off_reverse_detail_head_ds').getAt(0);
                 var records = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getSelected();
+                var all = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
                 //var records = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
                 if (!records.length) {
                     Leaf.showMessage('${l:PROMPT}', '${l:CSH514.SELECT_REVERSE_RECORD}');
                     return;
                 }
-                if (records[0].get('history_flag') ==='Y') {
+                if (records[0].get('history_flag') === 'Y') {
                     Leaf.showConfirm('${l:PROMPT}', '该事务是历史事务，请检查是否进行了补生成凭证', function () {
                         var saveData = [];
                         for (var i = 0; i < records.length; i++) {
@@ -72,10 +75,27 @@
                             Leaf.Masker.unmask(win_body);
                             return;
                         }, null, null);
-                    },null)
+                    }, null)
 
-                }else{
+                } else {
                     var saveData = [];
+                    var receipt_type = '${/parameter/@receipt_tpye}';
+                    var paid_byother_flag = '${/parameter/paid_byother_flag}';
+                    var bp_category = '${/parameter/bp_category}';
+                    alert(receipt_type);
+                    alert(paid_byother_flag);
+                    alert(bp_category);
+                    if (receipt_type == 'WITHHOLD') { //划扣
+                        if (all.length != records.length) {
+                            Leaf.showInfoMessage("提示", "该现金事务不支付部分反冲");
+                            return;
+                        }
+                    } else {
+                        if (paid_byother_flag == 'F' && bp_category == 'TENANT') {
+                            Leaf.showInfoMessage("提示", "该现金事务不支付部分反冲");
+                            return;
+                        }
+                    }
                     for (var i = 0; i < records.length; i++) {
                         records[i].set('reversed_date', head_record.get('reversed_date'));
                         records[i].set('description', head_record.get('description'));
@@ -177,9 +197,12 @@
         <a:dataSets>
             <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_head_ds" autoCreate="true">
                 <a:fields>
-                    <a:field name="reversed_date" defaultValue="${/model/default_value/record/@now_time}" required="true"/>
-                    <a:field name="reversed_period_name" defaultValue="${/model/default_value/record/@now_period_name}" readOnly="true" required="true"/>
-                    <a:field name="transaction_date" defaultValue="${/model/csh_value/record/@transaction_date}" readOnly="true"/>
+                    <a:field name="reversed_date" defaultValue="${/model/default_value/record/@now_time}"
+                             required="true"/>
+                    <a:field name="reversed_period_name" defaultValue="${/model/default_value/record/@now_period_name}"
+                             readOnly="true" required="true"/>
+                    <a:field name="transaction_date" defaultValue="${/model/csh_value/record/@transaction_date}"
+                             readOnly="true"/>
                     <a:field name="description" defaultValue="${l:HLS.REVERSE}"/>
                 </a:fields>
                 <a:events>
@@ -187,8 +210,10 @@
                     <a:event name="add" handler="on_write_off_reverse_detail_add"/>
                 </a:events>
             </a:dataSet>
-            <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true" model="csh.CSH514.csh_write_off" pageSize="15"
-                       queryUrl="${/request/@context_path}/autocrud/csh.CSH514.csh_write_off/query?csh_transaction_id=${/parameter/@transaction_id}&amp;reversed_flag=N&amp;reverse_detail_flag=Y" selectable="true">
+            <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true"
+                       model="csh.CSH514.csh_write_off" pageSize="15"
+                       queryUrl="${/request/@context_path}/autocrud/csh.CSH514.csh_write_off/query?csh_transaction_id=${/parameter/@transaction_id}&amp;reversed_flag=N&amp;reverse_detail_flag=Y"
+                       selectable="true">
                 <a:fields>
                     <a:field name="due_date" datatype="java.util.Date"/>
                 </a:fields>
@@ -200,12 +225,19 @@
                 <a:gridButton click="csh514_write_off_reverse" text="HLS.REVERSE"/>
             </a:screenTopToolbar>
             <a:form column="4" title="CSH514.CSH_WRITE_OFF_DETAIL">
-                <a:datePicker name="reversed_date" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="HLS.REVERSE_DATE"/>
-                <a:textField name="reversed_period_name" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="HLS.REVERSE_PERIOD"/>
-                <a:datePicker name="transaction_date" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="收款日期"/>
-                <a:textField name="description" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="HLS.NOTE" width="300"/>
+                <a:datePicker name="reversed_date" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
+                              prompt="HLS.REVERSE_DATE"/>
+                <a:textField name="reversed_period_name"
+                             bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
+                             prompt="HLS.REVERSE_PERIOD"/>
+                <a:datePicker name="transaction_date"
+                              bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="收款日期"/>
+                <a:textField name="description" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
+                             prompt="HLS.NOTE" width="300"/>
             </a:form>
-            <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds" bindTarget="csh_transaction_receipt_write_off_reverse_detail_result_ds" marginHeight="170" marginWidth="50" navBar="true">
+            <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds"
+                    bindTarget="csh_transaction_receipt_write_off_reverse_detail_result_ds" marginHeight="170"
+                    marginWidth="50" navBar="true">
                 <a:columns>
                     <a:column name="write_off_type_name"/>
                     <a:column name="write_off_date" renderer="Leaf.formatDate"/>