Skip to content

L
leaf-hlcm
Commit badcb828 authored by 18083's avatar 18083
1 Browse files
Options

预收款跨月核销反冲改造

parent 68309d13
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 25 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ badcb828
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<!-- <!--
$Author: sf $Author: sf
$Date: 2019-9-9 下午01:23:36 $Date: 2019-9-9 下午01:23:36
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_id desc" needAccessControl="false"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_id desc" needAccessControl="false">
<bm:fields> <bm:fields>
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/> <bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
<bm:field name="import_source"/> <bm:field name="import_source"/>
<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="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:fields> <bm:field name="extend_receipt_pre_flag" expression="nvl(t1.extend_receipt_pre_flag,&apos;N&apos;)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
</bm:features> </bm:features>
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/> <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/> <bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/> <bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED')))"/> <bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED','ACCAUDITED_RECOI')))"/>
<bm:query-field field="opposite_band_na" queryOperator="="/> <bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field name="transaction_num" queryExpression="t1.transaction_num like ${@transaction_num}"/> <bm:query-field name="transaction_num" queryExpression="t1.transaction_num like ${@transaction_num}"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/> <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_query.lwm
View file @ badcb828
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: gaoyang $Author: gaoyang
$Date: 2013-5-14 下午01:23:36 $Date: 2013-5-14 下午01:23:36
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.creation_date desc,t1.transaction_num desc"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.creation_date desc,t1.transaction_num desc">
<bm:fields> <bm:fields>
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<!-- <bm:data-filter name="query" expression="(t1.posted_flag=&apos;Y&apos;)"/>--> <!-- <bm:data-filter name="query" expression="(t1.posted_flag=&apos;Y&apos;)"/>-->
<bm:data-filter name="approval_status" enforceOperations="query" expression="('APPROVED' != decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/> <bm:data-filter name="approval_status" enforceOperations="query" expression="('APPROVED' != decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
</bm:data-filters> <bm:data-filter name="query" expression=" not exists (select 1 from csh_transaction ct where ct.source_csh_trx_id = t1.transaction_id and ct.reversed_flag = 'N' and ct.transaction_amount = t1.transaction_amount and ct.transaction_type = 'ADVANCE_RECEIPT' and ct.write_off_flag = 'NOT' and t1.write_off_flag='FULL' and t1.transaction_type = 'RECEIPT')"/>
</bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="receipt_type" queryOperator="="/> <bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/> <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_query.lwm
View file @ badcb828
...@@ -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'))"/> <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-filters> </bm:data-filters>
</bm:model> </bm:model>
\ No newline at end of file
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ badcb828
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！'); Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return; return;
} }
} */ }*/
// Leaf.Masker.mask(Ext.getBody()); // Leaf.Masker.mask(Ext.getBody());
// Leaf.request({ // Leaf.request({
// url: $('csh510_update_bp_info_link').getUrl(), // url: $('csh510_update_bp_info_link').getUrl(),
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
} }
function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) { function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
if (name == 'bp_id'&& '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') { if (name == 'bp_id'&& '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD' && '${/parameter/@extend_receipt_pre_flag}' != 'Y') {
if (value != oldvalue) { if (value != oldvalue) {
record.set('bp_bank_account_id', ''); record.set('bp_bank_account_id', '');
record.set('bp_bank_account_code', ''); record.set('bp_bank_account_code', '');
...@@ -855,6 +855,24 @@ ...@@ -855,6 +855,24 @@
record.getField('bank_account_name').setReadOnly(true); record.getField('bank_account_name').setReadOnly(true);
record.getField('bp_bank_account_name').setReadOnly(true); record.getField('bp_bank_account_name').setReadOnly(true);
} }
if('${/parameter/@extend_receipt_pre_flag}' == 'Y'){
var record = $('csh_transaction_receipt_head_ds').getAt(0);
record.getField('transaction_date').setReadOnly(true);
record.getField('transaction_amount').setReadOnly(true);
record.getField('bank_slip_num').setReadOnly(true);
record.getField('collection_classes_desc').setReadOnly(true);
record.getField('description').setReadOnly(true);
record.getField('extra_nam').setReadOnly(true);
record.getField('ref_v05').setReadOnly(true);
record.getField('guarantor_name_duty_desc').setReadOnly(true);
//银行账户信息
record.getField('bank_account_name').setReadOnly(true);
record.getField('bank_branch_name').setReadOnly(true);
record.getField('bank_account_num').setReadOnly(true);
record.getField('bp_bank_account_name').setReadOnly(true);
record.getField('opposite_band_na').setReadOnly(true);
record.getField('bp_bank_account_num').setReadOnly(true);
}
} }
]]></script> ]]></script>
</a:view> </a:view>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ badcb828
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- <!--
$Author: sf $Author: sf
$Date: 2019-09-06 上午11:10:33 $Date: 2019-09-06 上午11:10:33
$Revision: 1.0 $Revision: 1.0
$Purpose: design the function of written_off money $Purpose: design the function of written_off money
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
<!-- <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/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="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="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"/> <a:link id="hls_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="agricultural_bank_link" url="${/request/@context_path}/modules/csh/CSH1400/csh_agricultural_bank_check.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function(){ Leaf.onReady(function(){
//console.log($('csh_transaction_receipt_maintain_result_ds')); //console.log($('csh_transaction_receipt_maintain_result_ds'));
...@@ -109,8 +110,8 @@ ...@@ -109,8 +110,8 @@
return; return;
} }
//不是新增就报错 //不是新增就报错
if (confirmed_flag != 'NEW' && confirmed_flag != 'CT_REJECTED') { if (confirmed_flag != 'NEW' && confirmed_flag != 'CT_REJECTED' && confirmed_flag != 'ACCAUDITED_RECOI') {
$L.showInfoMessage("提示", '请选择单据为新建或收款退回的数据', null, null); $L.showInfoMessage("提示", '请选择单据为新建、收款确认反冲、收款退回的数据', null, null);
$('csh510_csh_trx_bank_apply_new').enable(); $('csh510_csh_trx_bank_apply_new').enable();
return; return;
} }
...@@ -254,8 +255,8 @@ ...@@ -254,8 +255,8 @@
} else { } else {
return value; return value;
}*/ }*/
if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){ if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED' || record.get('confirmed_flag')=='ACCAUDITED_RECOI'){
url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source'); url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source')+'&extend_receipt_pre_flag='+ record.get('extend_receipt_pre_flag');
}else{ }else{
url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false'; url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
} }
...@@ -489,17 +490,33 @@ ...@@ -489,17 +490,33 @@
function csh510_export() { function csh510_export() {
$('csh_transaction_receipt_maintain_grid_ds')._export(null,'收款维护'); $('csh_transaction_receipt_maintain_grid_ds')._export(null,'收款维护');
} }
function csh531_margin_check() {
function csh531_margin_check() {
var param={}; var param={};
param['function_code']= 'CSH531F3'; param['function_code']= 'CSH531F3';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
// param['url_title']='控制茂甲保证金校验'; //param['url_title']='控制茂甲保证金校验';
param['url_title']='控制二手机业务保证金校验'; param['url_title']='控制二手机业务保证金校验';
hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id'); hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
} }
function agricultural_bank() {
new Leaf.Window({
id: 'agricultural_bank_wind',
params: {
winid:'agricultural_bank_wind',
sessionId: '${/session/@session_id}',
role_id: '${/session/@role_id}',
},
url:$('agricultural_bank_link').getUrl(),
title: '农行回单',
width: 1500,
height: 580
});
}
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets> <a:dataSets>
<a:dataSet id="confirmed_flag_ds"> <a:dataSet id="confirmed_flag_ds">
<a:datas> <a:datas>
...@@ -507,6 +524,8 @@ ...@@ -507,6 +524,8 @@
<a:record code_value="ACCAUDITING" code_value_name="收款确认中"/> <a:record code_value="ACCAUDITING" code_value_name="收款确认中"/>
<a:record code_value="CT_REJECTED" 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" code_value_name="收款已确认"/>
<a:record code_value="ACCAUDITED_RECOI" code_value_name="收款确认反冲"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY"> <a:dataSet id="bp_category_ds" lookupCode="BP_CATEGORY">
...@@ -534,7 +553,16 @@ ...@@ -534,7 +553,16 @@
<a:dataSet id="reversed_flag_ds"> <a:dataSet id="reversed_flag_ds">
<a:datas dataSource="/model/reversed_flag_rp"/> <a:datas dataSource="/model/reversed_flag_rp"/>
</a:dataSet> </a:dataSet>
<a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/> <!--<a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>-->
<a:dataSet id="ds_collection_classes_ds">
<a:datas>
<a:record code_value="DEPOSIT" code_value_name="保证金类"/>
<a:record code_value="NON_DEPOSIT" code_value_name="非保证金类"/>
<a:record code_value="COMBINED" code_value_name="混合类"/>
<a:record code_value="REFUND" code_value_name="日立为优质客户付租金"/>
<a:record code_value="OPERAT_DEPOSIT" code_value_name="经营性租赁保证金类"/>
</a:datas>
</a:dataSet>
<a:dataSet id="csh510_collection_classes_batch_update_ds"> <a:dataSet id="csh510_collection_classes_batch_update_ds">
<a:fields> <a:fields>
<a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/> <a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
...@@ -722,7 +750,9 @@ ...@@ -722,7 +750,9 @@
<a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/> <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_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 click="csh510_receipt_reset" text="HLS.RESET"/>
<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/> <!--<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>-->
<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="二手机业务保证金校验"/>
<a:gridButton id="Ocr_Bank_id" click="agricultural_bank" text="农行回单"/>
<!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>--> <!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
<!-- <a:gridButton click="csh510_receipt" text="财务认领"/> --> <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
</a:screenTopToolbar> </a:screenTopToolbar>
......
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