Skip to content

L
leaf-hlcm
Commit f0a6a123 authored by taoruidan18083's avatar taoruidan18083
Browse files
Options

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

parent f6c6b396
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 17 deletions
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ f0a6a123
...@@ -80,6 +80,6 @@ ...@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/> <bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/> <bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" 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:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH514/get_advance_recipt_flag.lwm 0 → 100644
View file @ f0a6a123
<?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
View file @ f0a6a123
...@@ -180,6 +180,6 @@ ...@@ -180,6 +180,6 @@
<bm:data-filter name="query" expression="(t1.returned_flag = 'NOT')"/> <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.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.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:data-filters>
</bm:model> </bm:model>
\ No newline at end of file
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
View file @ f0a6a123
...@@ -115,6 +115,10 @@ ...@@ -115,6 +115,10 @@
Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！"); Leaf.showInfoMessage("提示", "请选择同一批次号的记录反冲！");
return; 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('reversed_date', head_record.get('reversed_date'));
records[i].set('description', head_record.get('description')); records[i].set('description', head_record.get('description'));
records[i].set('_status', 'update'); records[i].set('_status', 'update');
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_wfl.lview
View file @ f0a6a123
...@@ -11,6 +11,7 @@ ...@@ -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.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_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.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:init-procedure>
<a:view> <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="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 @@ ...@@ -126,6 +127,7 @@
<a:field name="note" readOnly="true"/> <a:field name="note" readOnly="true"/>
<a:field name="ignore_invoice_check_flag"/> <a:field name="ignore_invoice_check_flag"/>
<a:field name="extend_month_flag"/> <a:field name="extend_month_flag"/>
<a:field name="gld_rent_flag"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true" <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true"
...@@ -198,9 +200,19 @@ ...@@ -198,9 +200,19 @@
if ('${/model/extend_month/record/@check_flag}' =='N'){ if ('${/model/extend_month/record/@check_flag}' =='N'){
$('extend_month_id').hide(); $('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')){
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(); $('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> ]]></script>
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ f0a6a123
...@@ -350,6 +350,8 @@ ...@@ -350,6 +350,8 @@
var depositDisplayFlag = 'N'; var depositDisplayFlag = 'N';
var advanceDisplayFlag = 'N'; var advanceDisplayFlag = 'N';
var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N'; var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
//预收款标志
var advanceReciptFlag ='N';
//收款核销不审批 //收款核销不审批
approval_flag = 'N'; approval_flag = 'N';
...@@ -381,6 +383,10 @@ ...@@ -381,6 +383,10 @@
depositDisplayFlag = 'Y'; depositDisplayFlag = 'Y';
} }
} }
//仅预收款展示预收款核销为预收款tab页
if(transaction_type=='ADVANCE_RECEIPT'){
advanceReciptFlag ='Y';
}
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}'); Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
...@@ -405,6 +411,7 @@ ...@@ -405,6 +411,7 @@
bp_bank_account_name: record.get('bp_bank_account_name'), bp_bank_account_name: record.get('bp_bank_account_name'),
bp_id: record.get('bp_id'), bp_id: record.get('bp_id'),
advanceDisplayFlag: advanceDisplayFlag, advanceDisplayFlag: advanceDisplayFlag,
advanceReciptFlag:advanceReciptFlag,
readOnly: readOnly, readOnly: readOnly,
interfaceQueryFlag: interfaceQueryFlag, interfaceQueryFlag: interfaceQueryFlag,
approval_flag: approval_flag, approval_flag: approval_flag,
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ f0a6a123
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
if ('${/parameter/@advanceDisplayFlag}' == 'Y') { if ('${/parameter/@advanceDisplayFlag}' == 'Y') {
document.getElementById('write_off_advance').style.display = 'block'; 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') { if ('${/parameter/@readOnly}' == 'Y') {
$('csh_grid_add_bt').setVisible(false); $('csh_grid_add_bt').setVisible(false);
...@@ -1153,6 +1156,9 @@ ...@@ -1153,6 +1156,9 @@
defaultValue="${/model/sys_default_time/record/@now_date}"/> defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<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:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
...@@ -1449,6 +1455,17 @@ ...@@ -1449,6 +1455,17 @@
</a:events> </a:events>
</a:grid> </a:grid>
</a:tab> </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:tabs>
</a:tabPanel> </a:tabPanel>
</a:screenBody> </a:screenBody>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment