Skip to content

L
leaf-hlcm
Commit 796eb205 authored by stone's avatar stone
Browse files
Options

[fix] 修复收款退款功能

parent e914e4da
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 189 deletions
src/main/database/Register_function/REGISTER_CSH510.sql
View file @ 796eb205
......@@ -15,6 +15,10 @@ sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update
sys_function_assign_pkg.func_bm_load('CSH509','csh.CSH509.query_roles_info');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update_bp_info');
--页面注册
sys_function_assign_pkg.service_load('modules/csh/CSH510/csh_transaction_hand_receipt_update.lview','收款维护',1,1,0);
sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510/csh_transaction_hand_receipt_update.lview');
end;
/
commit;
......
src/main/database/Register_function/REGISTER_CSH_TRANSACTION_HAND_RECEIPT_UPDATE.sql deleted 100644 → 0
View file @ e914e4da
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/csh/CSH510/csh_transaction_hand_receipt_update.lview','收款维护',1,1,0);
sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510/csh_transaction_hand_receipt_update.lview');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N.sql
View file @ 796eb205
......@@ -7,6 +7,18 @@ set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/hls_bp_master_credit.lview');
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_LEASE',p_function_code=>'HLS361N',p_enabled_flag=>'Y',P_USER_ID=>-1);
--分配bm
sys_function_assign_pkg.func_bm_load('HLS361N','csh.CSH509.query_roles_info');
......
src/main/database/Register_function/REGISTER_HLS361N_HLS_BP_MASTER_CREDIT.sql deleted 100644 → 0
View file @ e914e4da
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/hls_bp_master_credit.lview');
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_LEASE',p_function_code=>'HLS361N',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_entrance_detail.sql deleted 100644 → 0
View file @ e914e4da
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
/
commit;
set feedback on
set define on
spool off
exit
src/main/database/Register_function/REGISTER_HLS361N_credit_confirm.sql → src/main/database/Register_function/REGISTER_HLS362N.sql
View file @ 796eb205
......@@ -23,6 +23,8 @@ sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code
--bm
sys_function_assign_pkg.func_bm_load('HLS362N','hls.HLS361N.hls_bp_master_credit_confirmed');
sys_function_assign_pkg.service_load('modules/hls/HLS362N/credit_entrance_detail_confirm.lview','授信详细',1,1,0);
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS362N/credit_entrance_detail_confirm.lview');
end;
/
commit;
......
src/main/database/Register_function/REGISTER_HLS362N_credit_entrance_confirm_detail.sql deleted 100644 → 0
View file @ e914e4da
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS362N/credit_entrance_detail_confirm.lview','授信详细',1,1,0);
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS362N/credit_entrance_detail_confirm.lview');
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm
View file @ 796eb205
......@@ -108,7 +108,7 @@
</bm:primary-key>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} and t1.posted_flag=&apos;Y&apos; and t1.reversed_flag=&apos;N&apos; and write_off_flag&lt;&gt; &apos;FULL&apos; and returned_flag &lt;&gt; &apos;FULL&apos; and t1.transaction_type in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;) and (nvl(t1.returned_amount, 0)+nvl(t1.write_off_amount, 0)&lt;t1.transaction_amount)) "/>
<bm:data-filter name="query" expression="(t1.confirmed_flag=&apos;APPROVED&apos; and t1.write_off_flag=&apos;NOT&apos;)"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag=&apos;APPROVED&apos; and t1.write_off_flag in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_returned_list.lwm
View file @ 796eb205
......@@ -8,76 +8,80 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[select r.return_id,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
t1.bank_slip_num,
t1.period_name,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select a.bank_account_num
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_num,
t1.bp_bank_account_num,
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name from sys_user_v u where u.user_id=t1.created_by )user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from
csh_transaction t1, csh_transaction_return r
where
t1.return_from_csh_trx_id = r.transaction_id and
t1.transaction_id = r.return_transaction_id and
r.status = 'APPROVED' and
t1.return_from_csh_trx_id = ${@return_from_csh_trx_id}
<bm:query-sql><![CDATA[select r.return_id,
r.this_return_amount,
t1.transaction_num,
t1.transaction_date,
t1.currency_code,
b.bank_account_num,
b.bank_branch_name,
bank_slip_num,
t1.period_name,
(select gc.currency_name
from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name,
t1.transaction_amount,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name,
(select b.description
from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display,
(select cp.description
from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
t1.exchange_rate,
(select tv.type_name
from gld_exchangerate_types_vl tv
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display,
(select a.bank_account_code
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_code,
(select a.bank_account_name
from csh_bank_account a
where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name,
(select a.bank_account_code
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name
from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name,
(select u.employee_name
from sys_user_v u
where u.user_id = t1.created_by) user_desc,
r.notes,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_tenant
from con_contract c
where contract_id = r.ref_contract_id)) bp_name_t,
(select h.bp_name
from hls_bp_master h
where h.bp_id = (select c.bp_id_agent_level1
from con_contract c
where contract_id = r.ref_contract_id)) agent_name_t,
(select c.contract_number
from con_contract c
where contract_id = r.ref_contract_id) contract_number_t
from csh_transaction t1,
csh_transaction_return r,
hls_bp_master_bank_account b
where
t1.transaction_id = r.transaction_id
and r.bp_id = b.bp_id
and r.status = 'APPROVED'
and t1.transaction_id = ${@return_from_csh_trx_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview
View file @ 796eb205
......@@ -14,7 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/>
</a:init-procedure>
<a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="csh_receipt_import_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt_impiort.lview"/>
<a:link id="csh_transaction_receipt_id" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/>
<a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/>
......
src/main/webapp/modules/csh/CSH515/csh_transaction_returned_list.lview
View file @ 796eb205
......@@ -73,18 +73,19 @@
</a:screenTopToolbar>
<a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true">
<a:columns>
<a:column name="transaction_num" prompt="退款编号" renderer="returned_list_transaction" width="120"/>
<a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate"/>
<a:column name="transaction_num" prompt="退款编号" width="120" align="center"/>
<a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate" align="center"/>
<!-- <a:column name="currency_name" prompt="HLS.CURRENCY"/>-->
<a:column name="transaction_amount" prompt="退款金额" renderer="Leaf.formatMoney"/>
<a:column name="this_return_amount" prompt="退款金额" renderer="Leaf.formatMoney" align="right"/>
<!-- <a:column name="posted_flag" prompt="HLS.POST"/> -->
<a:column name="bank_account_code" prompt="退款账户"/>
<a:column name="bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/>
<!--<a:column name="bank_account_code" prompt="退款账户"/>-->
<a:column name="bank_account_num" prompt="退款账户" align="center"/>
<a:column name="bank_branch_name" prompt="CSH511.BANK_ACCOUNT_NAME" align="center"/>
<!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> -->
<a:column name="bp_name" prompt="HLS.BP_NAME"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/>
<a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/>
<a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM" align="center"/>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/>
</a:columns>
</a:grid>
......
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