I-22424【建机】营业反冲违约金，涉及反冲会计核销的违约金和租金的不同处理追加内容改造

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm

@@ -80,6 +80,6 @@
         <bm:query-field field="write_off_id" queryOperator="="/>
         <bm:query-field field="csh_transaction_id" queryOperator="="/>
         <bm:query-field field="reversed_flag" queryOperator="="/>
-        <bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;,&apos;OPERAT_COMBINED&apos;)))"/>
+        <bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;,&apos;OPERAT_COMBINED&apos;,&apos;ADVANCE_ADVANCE_RECEIPT&apos;)))"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/csh/CSH514/get_advance_recipt_flag.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: trd
+    $Date: 2025-02-10下午03:25:19
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+      <bm:operation name="query">
+                 <bm:query-sql><![CDATA[
+            select nvl(ct.advance_recipt_flag, 'N') advance_recipt_flag
+              from csh_transaction ct, csh_transaction_wfl t
+             where ct.transaction_id = t.transaction_id
+               and t.transaction_wfl_id = ${@transaction_wfl_id}
+   ]]></bm:query-sql>
+             </bm:operation>
+    </bm:operations>
+ </bm:model>

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

@@ -180,6 +180,6 @@
         <bm:data-filter name="query" expression="(t1.returned_flag = 'NOT')"/>
         <bm:data-filter name="query" expression="(t1.write_off_flag = 'NOT')"/>
         <bm:data-filter name="query" expression="(t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED'))"/>
-        <bm:data-filter name="query" expression="((t1.transaction_type = 'DEPOSIT' and t1.ref_contract_id is  null) or (t1.collection_classes = 'REFUND' and t1.ref_contract_id is  null and t1.source_csh_trx_id is null ) or (t1.transaction_type in ('RECEIPT') and nvl(t1.collection_classes,'NON') != 'REFUND') or (t1.transaction_type = 'ADVANCE_RECEIPT' and t1.transaction_amount = (select cwo.transaction_amount from csh_transaction cwo  where cwo.transaction_id = t1.source_csh_trx_id and cwo.reversed_flag = 'N' and cwo.write_off_flag='FULL')))"/>
+        <bm:data-filter name="query" expression="((t1.transaction_type = 'DEPOSIT' and t1.ref_contract_id is  null) or (t1.collection_classes = 'REFUND' and t1.ref_contract_id is  null and t1.source_csh_trx_id is null ) or (t1.transaction_type in ('RECEIPT') and nvl(t1.collection_classes,'NON') != 'REFUND') or (t1.transaction_type = 'ADVANCE_RECEIPT' and t1.transaction_amount = (select cwo.transaction_amount from csh_transaction cwo  where cwo.transaction_id = t1.source_csh_trx_id and cwo.reversed_flag = 'N' and cwo.write_off_flag='FULL') and nvl(t1.advance_recipt_flag,'N')='N'))"/>
     </bm:data-filters>
 </bm:model>
\ No newline at end of file

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

@@ -115,6 +115,10 @@
                                 Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！");
                                 return;
                             }
+                            if(records[i].get('write_off_type')=='ADVANCE_ADVANCE_RECEIPT'){
+                                Leaf.showInfoMessage("提示", "该现金事务存在预收款核销为预收款的核销记录，不允许核销确认反冲！");
+                                return;
+                            }
                             records[i].set('reversed_date', head_record.get('reversed_date'));
                             records[i].set('description', head_record.get('description'));
                             records[i].set('_status', 'update');

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    $Author: gaoyang  
-    $Date: 2013-6-3 上午10:39:00  
-    $Revision: 1.0  
-    $Purpose: 
+    $Author: gaoyang
+    $Date: 2013-6-3 上午10:39:00
+    $Revision: 1.0
+    $Purpose:
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
     <a:init-procedure>
@@ -11,6 +11,7 @@
     <a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query>
     <a:model-query model="csh.CSH514.extend_next_month_check" rootPath="extend_month" />
     <a:model-query model="csh.CSH514.extend_gld_rent_check" rootPath="extend_gld_rent" />
+    <a:model-query model="csh.CSH514.get_advance_recipt_flag" rootPath="advance_recipt_flag" />
     </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"/>
@@ -126,6 +127,7 @@
                     <a:field name="note" readOnly="true"/>
                     <a:field name="ignore_invoice_check_flag"/>
                     <a:field name="extend_month_flag"/>
+                    <a:field name="gld_rent_flag"/>
                 </a:fields>
             </a:dataSet>
             <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true"
@@ -161,8 +163,8 @@
                                  prompt="HLS.NOTE" width="300"/>
                     <a:checkBox  name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/>
                     <a:checkBox  id="extend_month_id" name="extend_month_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="允许跨月反冲"/>
-                   <a:checkBox  id="gld_rent_id" name="gld_rent_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="反冲后不出具凭证"/>
-                 </a:hBox>
+                    <a:checkBox id="gld_rent_id"  name="gld_rent_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="反冲后不出具凭证"/>
+                  </a:hBox>
                 <a:hBox>
                     <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
                                 prompt="备注" width="600"/>
@@ -191,16 +193,26 @@
         <script><![CDATA[
                 Leaf.onReady(init);
                 function init() {
-                    var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
+                     var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
                     if ('${/model/wolkflow_path/record/@current_seq}' != '10'){
                         headers_ds.getField('ignore_invoice_check_flag').setReadOnly(true);
                     }
                     if ('${/model/extend_month/record/@check_flag}' =='N'){
                         $('extend_month_id').hide();
                      }
-                    if (('${/model/extend_month/record/@check_flag}' =='N')||('${/model/extend_month/record/@check_flag}' =='Y' && '${/model/extend_gld_rent/record/@rent_check_flag}' =='N')){
-                          $('gld_rent_id').hide();
-                    }
+
+                    if(('${/model/advance_recipt_flag/record/@advance_recipt_flag}' =='Y')||
+                       (('${/model/extend_month/record/@check_flag}' =='Y')&&('${/model/extend_gld_rent/record/@rent_check_flag}' =='Y'))){
+                        //$('gld_rent_id').setVisible(true);
+                        //document.getElementById("gld_rent_id").style.display = 'block';
+                       }else{
+                       $('gld_rent_id').hide();
+                       }
+                    if ('${/model/advance_recipt_flag/record/@advance_recipt_flag}' =='Y'){
+                      headers_ds.getField('gld_rent_flag').setReadOnly(true);
+                      document.getElementById("gld_rent_id").checked = true;
+                   }
+
                 }
 
         ]]></script>

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

@@ -104,7 +104,7 @@
         }
 
         function csh_show_message(post_data) {
-            // 
+            //
             Leaf.showConfirm('${l:PROMPT}', '存在未完全分配的收款，您确认吗？', function () {
                 do_data_confirm(post_data);
             }, function () {
@@ -112,7 +112,7 @@
         }
 
         function csh531_data_confirm() {
-            // 
+            //
             var records = $('csh531n_sap_bankflow_info_result_ds').getSelected();
             if (records.length == 0) {
                 Leaf.showMessage('${l:PROMPT}', '请选择一条记录！');
@@ -254,7 +254,7 @@
         }
 
         function csh_para_check() {
-            // 
+            //
             var record = $('auto_write_off_ds').getAt(0);
             // var record = records.getAt(0);
             var account_num = record.get('account_num');
@@ -299,7 +299,7 @@
 
 
             var auto_write_record = $('auto_write_off_ds').getAt(0);
-            // 
+            //
             var csh_bp_bank_account_num = auto_write_record.get('account_num');
             var csh_bp_bank_account_name = auto_write_record.get('bank_account_num');
             // var csh_trx_amount = auto_write_record.get('trx_amount');
@@ -350,6 +350,8 @@
             var depositDisplayFlag = 'N';
             var advanceDisplayFlag = 'N';
             var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
+            //预收款标志
+            var advanceReciptFlag ='N';
 
             //收款核销不审批
             approval_flag = 'N';
@@ -381,6 +383,10 @@
                     depositDisplayFlag = 'Y';
                 }
             }
+            //仅预收款展示预收款核销为预收款tab页
+            if(transaction_type=='ADVANCE_RECEIPT'){
+             advanceReciptFlag ='Y';
+            }
 
 
             Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
@@ -405,6 +411,7 @@
                             bp_bank_account_name: record.get('bp_bank_account_name'),
                             bp_id: record.get('bp_id'),
                             advanceDisplayFlag: advanceDisplayFlag,
+                            advanceReciptFlag:advanceReciptFlag,
                             readOnly: readOnly,
                             interfaceQueryFlag: interfaceQueryFlag,
                             approval_flag: approval_flag,

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

@@ -79,6 +79,9 @@
             if ('${/parameter/@advanceDisplayFlag}' == 'Y') {
                 document.getElementById('write_off_advance').style.display = 'block';
             }
+            if ('${/parameter/@advanceReciptFlag}' == 'Y') {
+                 document.getElementById('advance_write_off_advance').style.display = 'block';
+            }
 
             if ('${/parameter/@readOnly}' == 'Y') {
                 $('csh_grid_add_bt').setVisible(false);
@@ -1153,7 +1156,10 @@
                      defaultValue="${/model/sys_default_time/record/@now_date}"/>
         </a:fields>
     </a:dataSet>
-        </a:dataSets>
+       <a:dataSet id="advance_transaction_advanced_ds" model="csh.CSH531N.csh_transaction_plan_query" pageSize="10" autoQuery="true"
+                    queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=ADVANCE_ADVANCE_RECEIPT">
+         </a:dataSet>
+   </a:dataSets>
         <a:screenBody>
             <a:screenTopToolbar>
                 <a:screenTitle/>
@@ -1449,6 +1455,17 @@
                             </a:events>
                         </a:grid>
                     </a:tab>
+                  <a:tab id="advance_write_off_advance" tabStyle="display:none" prompt="预收款核销为预收款" width="150">
+                    <a:grid id="advance_transaction_advanced_grid" navBar="true"
+                            bindTarget="advance_transaction_advanced_ds" height="370"
+                            marginWidth="10">
+                            <a:columns>
+                            <a:column name="bp_name" prompt="商业伙伴" width="180" align="center"/>
+                            <a:column name="write_off_amount" prompt="核销金额" renderer="Leaf.formatMoney" width="180"  align="right" footerRenderer="summaryRenderer"/>
+                            <a:column name="write_off_date" prompt="核销日期" width="180" align="center" renderer="Leaf.formatDate" />
+                         </a:columns>
+                     </a:grid>
+                </a:tab>
                 </a:tabs>
             </a:tabPanel>
         </a:screenBody>