收款反冲调整02

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

@@ -105,6 +105,7 @@
         <bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
         <bm:field name="recoi_status" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECOI_FLAG' and v.code_value =t1.recoi_status)" forInsert="false" forUpdate="false"/>
         <bm:field name="recoi_status_n" expression="(select v.code_value from sys_code_values_v v where v.code = 'RECOI_FLAG' and v.code_value =t1.recoi_status)" forInsert="false" forUpdate="false"/>
+        <bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/>
         <!--end-->
     </bm:fields>
     <bm:features>
@@ -172,9 +173,8 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} AND t1.reversed_flag = 'N' and t1.returned_flag != 'FULL')"/>
-        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT')))  and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
+        <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT')))  and t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED')) "/>
         <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} = 1))))"/>
-        <bm:data-filter name="collection_classes" expression="(nvl(t1.collection_classes,'NON') != 'REFUND')"/>
         <bm:data-filter name="write_off_flag_desc" expression="(t1.write_off_flag not in('FULL','PARTIAL'))"/>
 
     </bm:data-filters>

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

@@ -17,16 +17,6 @@
                 end;
               ]]></bm:update-sql>
         </bm:operation>
-        <bm:operation name="execute">
-            <bm:update-sql><![CDATA[
-                begin
-                cm_sh_transaction_reverse_pkg.csh_check_reverse(
-                          p_transaction_id         =>${@transaction_id},
-                          p_user_id                =>${/session/@user_id}
-                );
-                end;
-                ]]></bm:update-sql>
-        </bm:operation>
     </bm:operations>
 </bm:model>
 

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

@@ -496,6 +496,8 @@
                     <a:record code_value="ACCAUDITING" code_value_name="收款确认中"/>
                     <a:record code_value="CT_REJECTED" code_value_name="收款退回"/>
                     <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/>
+                    <a:record code_value="ACCAUDITED_RECOI" code_value_name="收款确认反冲"/>
+
                 </a:datas>
             </a:dataSet>
             <a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">

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

@@ -83,12 +83,24 @@
         function csh531f_new_write_off() {
             var record = $('csh531n_sap_bankflow_info_result_ds').getSelected()[0];
             if (record) {
+                debugger;
                 var recoi_status=record.get('recoi_status_n');
-                if(recoi_status=='RECOIING'){
-                    Leaf.showMessage('${l:PROMPT}','反冲中状态不能提交！');
+                if(recoi_status=='RECOIING') {
+                    Leaf.showMessage('${l:PROMPT}', '反冲中状态不能提交！');
                     return;
                 }
-                Leaf.showConfirm('提示', '您确认提交吗', function() {
+
+                // if(collection_classes=='REFUND' && transaction_amount!=unwrite_off_amount){
+                //     Leaf.showMessage('${l:PROMPT}','收款金额与剩余可用金额不匹配，请维护后在提交！');
+                //     return;
+                // }else if(collection_classes=='COMBINED' && transaction_type!='ADVANCE_RECEIPT'){
+                //     Leaf.showMessage('${l:PROMPT}','现金事务类型为"预收款"，才能提交！');
+                //     return;
+                // }else if(collection_classes=='DEPOSIT' && transaction_amount!=unwrite_off_amount){
+                //     Leaf.showMessage('${l:PROMPT}','收款金额与剩余可用金额不匹配，请维护后在提交！');
+                //     return;
+                // }
+                Leaf.showConfirm('提示', '是否确认进行反冲', function() {
                     Leaf.Masker.mask(Ext.getBody());
                     var transaction_id=record.get('transaction_id');
                     Leaf.request({
@@ -137,10 +149,18 @@
                     <!--                    <a:record code_value="PARTIAL" code_value_name="部分核销"/>-->
                 </a:datas>
             </a:dataSet>
+            <a:dataSet id="confirmed_flag_ds">
+                <a:datas>
+                    <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/>
+                    <a:record code_value="APPROVED" code_value_name="核销已确认"/>
+                    <a:record code_value="WF_REJECTED" code_value_name="核销退回"/>
+                </a:datas>
+            </a:dataSet>
             <a:dataSet id="receipt_type_ds" lookupCode="RECEIPT_TYPE"/>
             <a:dataSet id="recoi_flag_ds" lookupCode="RECOI_FLAG"/>
             <a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true">
                 <a:fields>
+                    <a:field name="confirmed_flag_desc"  options="confirmed_flag_ds" valueField="code_value" displayField="code_value_name" returnField="confirmed_flag"/>
                     <a:field name="write_off_flag"/>
                     <a:field name="reversed_flag" defaultValue="N"/>
                     <a:field name="cw_flag" defaultValue="Y"/>
@@ -148,8 +168,8 @@
                     <a:field name="recoi_status" options="recoi_flag_ds" valueField="code_value"
                              displayField="code_value_name" returnField="recoi_status" defaultValue="未反冲"/>
 <!--                    <a:field name="confirmed_flag" defaultValue="ACCAUDITED"/>-->
-                    <a:field name="write_off_flag_desc" displayField="code_value_name" options="con_write_off_flag_ds"
-                             returnField="write_off_flag" valueField="code_value"/>
+                    <a:field name="write_off_flag_desc"  displayField="code_value_name" options="con_write_off_flag_ds"
+                             returnField="write_off_flag" valueField="code_value" defaultValue="未核销"/>
                     <a:field name="status" displayField="code_value_name" options="status_ds"
                              returnField="status" valueField="code_value"/>
                     <a:field name="collection_classes_desc" options="csh531n_ds_collection_classes_ds"
@@ -195,7 +215,7 @@
                 <a:screenTitle/>
                 <a:gridButton click="csh531_query" text="HLS.QUERY"/>
                 <a:gridButton click="csh531_reset" text="重置"/>
-                <a:gridButton id="csh531_new_write_off_btn_id"  click="csh531f_new_write_off" text="反冲"/>
+                <a:gridButton id="csh531_new_write_off_btn_id"  click="csh531f_new_write_off" text="确认反冲"/>
             </a:screenTopToolbar>
             <a:form bindTarget="csh_transaction_receipt_write_off_query_ds" style="background:#f7f7f8" labelWidth="250">
                 <a:fieldSet labelWidth="250" title="HLS.QUERY_TITLE">
@@ -214,9 +234,13 @@
                                      prompt="现金事务编号"/>
                         <a:lov name="bp_name"
                                bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="商业伙伴"/>
-                        <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="核销状态"/>
+                        <a:comboBox name="write_off_flag_desc"  bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="核销状态"/>
                         <a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
                     </a:box>
+                    <a:box column="4">
+                        <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="单据审批状态"/>
+                        <a:comboBox name="collection_classes_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="款项用途"/>
+                    </a:box>
                 </a:fieldSet>
             </a:form>
             <a:grid id="csh_transaction_receipt_write_off_grid_ds"
@@ -232,9 +256,11 @@
                     <a:column name="transaction_date" renderer="Leaf.formatDate" align="center" lock="true"
                               prompt="收款日期" width="120"/>
                     <a:column name="description" prompt="摘要" width="180"/>
+                    <a:column name="collection_classes_desc" prompt="款项用途" align="center"/>
                     <a:column name="bp_name" prompt="商业伙伴" align="left" width="200"/>
                     <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
                     <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
+                    <a:column name="confirmed_flag_desc" prompt="单据审批状态" align="center"/>
                     <a:column name="created_user_name" prompt="制单人" width="120" align="center"/>
                     <a:column name="recoi_status" prompt="反冲状态" width="90" align="center"/>
                 </a:columns>

src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview

@@ -5,7 +5,6 @@
         <a:model-query fetchAll="true" model="csh.CSH531N.csh_transaction" rootPath="csh_transaction_path"/>
     </a:init-procedure>
     <a:view>
-        <a:link id="csh531n_submit_check_reverse_link_id" model="csh.CSH531F.csh_transaction_recoi_submit" modelaction="execute"/>
         <a:link id="csh531n_csh_confirm_data_link" model="csh.CSH531N.csh_data_confirm" modelaction="update"/>
         <a:link id="csh531n_submit_link_id" model="csh.CSH531N.csh_data_confirm" modelaction="execute"/>
         <a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
@@ -699,24 +698,6 @@
 
             var createConfirm = Leaf.showConfirm('提示', '确认提交复核吗', function () {
                 $('csh531n_write_off_submit_btn_id').disable();
-                var transaction_id ='${/parameter/@transaction_id}';
-                Leaf.Masker.mask(Ext.getBody());
-                Leaf.request({
-                    url: $('csh531n_submit_check_reverse_link_id').getUrl(),
-                    para:{
-                        transaction_id:transaction_id
-                    },
-                    success: function (res) {
-                        Leaf.Masker.unmask(Ext.getBody());
-                    },
-                    failure: function () {
-                        Leaf.Masker.unmask(Ext.getBody());
-                    },
-                    error: function () {
-                        Leaf.Masker.unmask(Ext.getBody());
-                    },
-                    scope: this
-                });
                 csh511_save_all();
             });
         }