Skip to content

L
leaf-hlcm
Commit 911e54b8 authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/shouxin' into develop 

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[style] 修改状态
parents d442a026 796eb205
Show whitespace changes
Inline Side-by-side
Showing with 461 additions and 476 deletions
src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
View file @ 911e54b8
...@@ -20,93 +20,26 @@ VALUES ...@@ -20,93 +20,26 @@ VALUES
VALUES VALUES
('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1); ('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733CF', '合同租金计划变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC INSERT INTO sys_function_dynamic
(FUNCTION_CODE, (function_code,
FUNCTION_NAME, function_name,
SEQUENCE, sequence,
CREATION_DATE, creation_date,
CREATED_BY, created_by,
LAST_UPDATE_DATE, last_update_date,
LAST_UPDATED_BY) last_updated_by)
VALUES VALUES
('CON733BPT', '合同承租人变更申请明细', 1, SYSDATE, -1, SYSDATE, -1); ('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC INSERT INTO sys_function_dynamic
(FUNCTION_CODE, (function_code,
FUNCTION_NAME, function_name,
SEQUENCE, sequence,
CREATION_DATE, creation_date,
CREATED_BY, created_by,
LAST_UPDATE_DATE, last_update_date,
LAST_UPDATED_BY) last_updated_by)
VALUES VALUES
('CON733BPB', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1); ('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
end;
\ No newline at end of file
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPBQ', '合同回款账户变更申请明细', 1, SYSDATE, -1, SYSDATE, -1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733CF_Q','租金计划变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON733BPT_Q','承租人变更申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_REPO001D_Q','回购申请明细',1,SYSDATE,-1,SYSDATE,-1);
INSERT INTO SYS_FUNCTION_DYNAMIC
(FUNCTION_CODE,
FUNCTION_NAME,
SEQUENCE,
CREATION_DATE,
CREATED_BY,
LAST_UPDATE_DATE,
LAST_UPDATED_BY)
VALUES
('CON_ET002_Q','提前结清申请明细',1,SYSDATE,-1,SYSDATE,-1);
\ No newline at end of file
src/main/database/Init/Sys_prompt/CSH_TRANSACTION_PROMPT.sql → src/main/database/Init/Sys_prompt/INITIALIZE_CSH_TRANSACTION_PROMPT.sql
View file @ 911e54b8
...@@ -6,7 +6,10 @@ spool CSH_TRANSACTION_PROMPT.log ...@@ -6,7 +6,10 @@ spool CSH_TRANSACTION_PROMPT.log
set feedback off set feedback off
set define off set define off
begin begin
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.RETURNED_AMOUNT',
p_language => 'ZHS',
p_description => '已退款金额',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM', sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM',
p_language => 'ZHS', p_language => 'ZHS',
p_description => '收款金额从', p_description => '收款金额从',
...@@ -135,6 +138,43 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCT_CO ...@@ -135,6 +138,43 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCT_CO
p_language => 'ZHS', p_language => 'ZHS',
p_description => '会计确认人', p_description => '会计确认人',
p_created_by => 1); p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.NEW_APPLY_BTN',
p_language => 'ZHS',
p_description => '新增确认',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.REFUSE_BTN',
p_language => 'ZHS',
p_description => '新增驳回',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.DROP_BTN',
p_language => 'ZHS',
p_description => '作废',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.QUERY_BTN',
p_language => 'ZHS',
p_description => '查询',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.MANUAL_ADD',
p_language => 'ZHS',
p_description => '收款手动新增',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.CLASS_DESC',
p_language => 'ZHS',
p_description => '款项分类',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.STATEMENT',
p_language => 'ZHS',
p_description => '备注',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.BANK_INFO',
p_language => 'ZHS',
p_description => '账户信息',
p_created_by => 1);
sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.ATTACHMENT',
p_language => 'ZHS',
p_description => '附件',
p_created_by => 1);
end; end;
/ /
commit; commit;
......
src/main/database/Register_function/REGISTER_CSH510.sql
View file @ 911e54b8
...@@ -15,6 +15,10 @@ sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update ...@@ -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('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.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; end;
/ /
commit; commit;
......
src/main/database/Register_function/REGISTER_CSH_TRANSACTION_HAND_RECEIPT_UPDATE.sql deleted 100644 → 0
View file @ d442a026
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 @ 911e54b8
...@@ -7,6 +7,18 @@ set feedback off ...@@ -7,6 +7,18 @@ set feedback off
set define off set define off
begin 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 --分配bm
sys_function_assign_pkg.func_bm_load('HLS361N','csh.CSH509.query_roles_info'); 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 @ d442a026
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 @ d442a026
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);
--创建动态页面的虚拟功能号
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
end;
/
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 @ 911e54b8
...@@ -23,6 +23,8 @@ sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code ...@@ -23,6 +23,8 @@ sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code
--bm --bm
sys_function_assign_pkg.func_bm_load('HLS362N','hls.HLS361N.hls_bp_master_credit_confirmed'); 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; end;
/ /
commit; commit;
......
src/main/database/Register_function/REGISTER_HLS362N_credit_entrance_confirm_detail.sql deleted 100644 → 0
View file @ d442a026
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;
--创建动态页面的虚拟功能号
INSERT INTO sys_function_dynamic
(function_code,
function_name,
sequence,
creation_date,
created_by,
last_update_date,
last_updated_by)
VALUES
('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
/
commit;
set feedback on
set define on
spool off
exit
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_for_lov.lwm
View file @ 911e54b8
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<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 in (&apos;N&apos;))"/> <!-- <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>-->
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_receipt_return_query.lwm
View file @ 911e54b8
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: qwm $Author: sf
$Date: 2013-5-30 下午08:08:02 $Date: 2019-9-9 下午01:23:36
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
<bm:operations> <bm:fields>
<bm:operation name="query"> <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
<bm:query-sql><![CDATA[select t1.transaction_id, <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
t1.transaction_num, <bm:field name="transaction_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_CATEGORY" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_CATEGORY"/>
t1.transaction_category, <bm:field name="transaction_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH511_TRANSACTION_TYPE" lookupField="transaction_type_desc" physicalName="TRANSACTION_TYPE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_TYPE"/>
t1.transaction_type, <bm:field name="transaction_date" databaseType="DATE" datatype="java.util.Date" physicalName="TRANSACTION_DATE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_DATE"/>
to_char(t1.transaction_date,'yyyy-mm-dd') transaction_date, <bm:field name="penalty_calc_date" databaseType="DATE" datatype="java.util.Date" physicalName="PENALTY_CALC_DATE" prompt="CSH511.CSH_TRANSACTION.PENALTY_CALC_DATE"/>
t1.penalty_calc_date, <bm:field name="bank_slip_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BANK_SLIP_NUM" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/>
t1.bank_slip_num, <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH511.CSH_TRANSACTION.COMPANY_ID"/>
t1.company_id, <bm:field name="internal_period_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INTERNAL_PERIOD_NUM" prompt="CSH511.CSH_TRANSACTION.INTERNAL_PERIOD_NUM"/>
t1.internal_period_num, <bm:field name="period_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="HLS.ACCOUNT_PERIOD_NAME"/>
t1.period_name, <bm:field name="payment_method_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PAYMENT_METHOD_ID" prompt="HLS.PAYMENT_METHOD"/>
t1.payment_method_id, <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
t1.distribution_set_id, <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
t1.cashflow_amount, <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
t1.currency_code, <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
t1.transaction_amount, <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
t1.exchange_rate_type, <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
t1.exchange_rate_quotation, <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
t1.exchange_rate, <bm:field name="bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BANK_ACCOUNT_ID" prompt="CSH511.CSH_TRANSACTION.BANK_ACCOUNT_ID"/>
t1.bank_account_id, <bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/>
t1.bp_category, <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="CSH511.CSH_TRANSACTION.BP_ID"/>
t1.bp_id, <bm:field name="bp_bank_account_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_BANK_ACCOUNT_ID" prompt="CSH511.CSH_TRANSACTION.BP_BANK_ACCOUNT_ID"/>
t1.bp_bank_account_id, <bm:field name="bp_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_BANK_ACCOUNT_NUM" prompt="CSH511.BANK_ACCOUNT_NUM"/>
t1.bp_bank_account_num, <bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DESCRIPTION" prompt="HLS.NOTE"/>
t1.description, <bm:field name="handling_charge" databaseType="NUMBER" datatype="java.lang.Double" physicalName="HANDLING_CHARGE" prompt="CSH511.CSH_TRANSACTION.HANDLING_CHARGE"/>
t1.handling_charge, <bm:field name="posted_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="POSTED_FLAG" prompt="CSH511.CSH_TRANSACTION.POSTED_FLAG"/>
t1.posted_flag, <bm:field name="reversed_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="REVERSED_FLAG" prompt="CSH511.CSH_TRANSACTION.REVERSED_FLAG"/>
t1.reversed_flag, <bm:field name="reversed_date" databaseType="DATE" datatype="java.util.Date" physicalName="REVERSED_DATE" prompt="CSH511.CSH_TRANSACTION.REVERSED_DATE"/>
t1.reversed_date, <bm:field name="returned_flag" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH510_RETURN_SELECT" lookupField="returned_flag_desc" physicalName="RETURNED_FLAG" prompt="CSH511.CSH_TRANSACTION.RETURNED_FLAG"/>
t1.returned_flag, <bm:field name="returned_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="RETURNED_AMOUNT" prompt="CSH511.CSH_TRANSACTION.RETURNED_AMOUNT" expression="(select nvl(returned_amount,0) from dual)"/>
t1.returned_amount, <bm:field name="write_off_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="WRITE_OFF_FLAG" prompt="CSH511.CSH_TRANSACTION.WRITE_OFF_FLAG"/>
t1.write_off_flag, <bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="CSH511.CSH_TRANSACTION.WRITE_OFF_AMOUNT"/>
t1.write_off_amount, <bm:field name="full_write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="FULL_WRITE_OFF_DATE" prompt="CSH511.CSH_TRANSACTION.FULL_WRITE_OFF_DATE"/>
t1.full_write_off_date, <bm:field name="twin_csh_trx_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TWIN_CSH_TRX_ID" prompt="CSH511.CSH_TRANSACTION.TWIN_CSH_TRX_ID"/>
t1.twin_csh_trx_id, <bm:field name="return_from_csh_trx_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="RETURN_FROM_CSH_TRX_ID" prompt="CSH511.CSH_TRANSACTION.RETURN_FROM_CSH_TRX_ID"/>
t1.return_from_csh_trx_id, <bm:field name="reversed_csh_trx_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="REVERSED_CSH_TRX_ID" prompt="CSH511.CSH_TRANSACTION.REVERSED_CSH_TRX_ID"/>
t1.reversed_csh_trx_id, <bm:field name="source_csh_trx_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SOURCE_CSH_TRX_TYPE" prompt="CSH511.CSH_TRANSACTION.SOURCE_CSH_TRX_TYPE"/>
t1.source_csh_trx_type, <bm:field name="source_csh_trx_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SOURCE_CSH_TRX_ID" prompt="CSH511.CSH_TRANSACTION.SOURCE_CSH_TRX_ID"/>
t1.source_csh_trx_id, <bm:field name="source_doc_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SOURCE_DOC_CATEGORY"/>
t1.source_doc_category, <bm:field name="source_doc_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SOURCE_DOC_TYPE" prompt="CSH511.CSH_TRANSACTION.SOURCE_DOC_TYPE"/>
t1.source_doc_type, <bm:field name="source_doc_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SOURCE_DOC_ID" prompt="CSH511.CSH_TRANSACTION.SOURCE_DOC_ID"/>
t1.source_doc_id, <bm:field name="source_doc_line_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SOURCE_DOC_LINE_ID" prompt="CSH511.CSH_TRANSACTION.SOURCE_DOC_LINE_ID"/>
t1.source_doc_line_id, <bm:field name="create_je_mothed" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CREATE_JE_MOTHED"/>
t1.create_je_mothed, <bm:field name="create_je_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CREATE_JE_FLAG"/>
t1.create_je_flag, <bm:field name="gld_interface_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="GLD_INTERFACE_FLAG" prompt="CSH511.CSH_TRANSACTION.GLD_INTERFACE_FLAG"/>
t1.gld_interface_flag, <bm:field name="bp_code" expression="(select d.bp_code from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_CODE"/>
(select d.bp_code from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_code, <bm:field name="bp_name" expression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id)" forInsert="false" forUpdate="false" prompt="HLS.BP_NAME"/>
(select d.bp_name from hls_bp_master_v d where d.bp_id = t1.bp_id) as bp_name, <bm:field name="payment_method_display" expression="(select cp.description from csh_payment_method cp where cp.payment_method_id=t1.payment_method_id)" forInsert="false" forUpdate="false" prompt="HLS.PAYMENT_METHOD"/>
(select cp.description <bm:field name="currency_name" expression="(select gc.currency_name from gld_currency_vl gc where gc.currency_code=t1.currency_code)" forInsert="false" forUpdate="false" prompt="HLS.CURRENCY"/>
from csh_payment_method cp <bm:field name="bp_category_display" expression="(select b.description from hls_bp_category b where b.bp_category=t1.bp_category)" forInsert="false" forUpdate="false" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/>
where cp.payment_method_id = t1.payment_method_id) as payment_method_display, <bm:field name="exchange_rate_type_display" expression="(select tv.type_name from gld_exchangerate_types_vl tv where tv.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
(select gc.currency_name <bm:field name="transaction_functional_amount" expression="gld_exchange_rate_pkg.get_currency_exchange(t1.transaction_amount,t1.exchange_rate,t1.exchange_rate_quotation)" forInsert="false" forUpdate="false" prompt="HLS.FUNCTIONAL_AMOUNT"/>
from gld_currency_vl gc <bm:field name="bank_account_code" expression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_CODE"/>
where gc.currency_code = t1.currency_code) as currency_name, <bm:field name="bank_account_name" expression="(select a.bank_account_name from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NAME"/>
(select b.description <bm:field name="bank_account_num" expression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NUM"/>
from hls_bp_category b <bm:field name="bp_bank_account_code" expression="(select a.bank_account_code from hls_bp_master_bank_account a where a.bank_account_id = t1.bp_bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BP_BANK_ACCOUNT_CODE"/>
where b.bp_category = t1.bp_category) as bp_category_display, <!--<bm:field name="bp_bank_account_name" expression="(select a.bank_account_name from hls_bp_master_bank_account a where a.bank_account_id = t1.bp_bank_account_id)" forInsert="false" forUpdate="false" prompt="CSH511.BANK_ACCOUNT_NAME"/>-->
(select tv.type_name <bm:field name="bp_bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/>
from gld_exchangerate_types_vl tv <bm:field name="functional_currency_code" expression="(select gb.functional_currency_code from fnd_companies fc, gld_set_of_books gb where fc.company_id = ${/session/@company_id} and fc.set_of_books_id = gb.set_of_books_id)" forInsert="false" forUpdate="false"/>
where tv.type_code = t1.exchange_rate_type) as exchange_rate_type_display, <bm:field name="rate_method_code" expression="(select t.rate_method_code from gld_exchangerate_types t where t.type_code=t1.exchange_rate_type)" forInsert="false" forUpdate="false"/>
gld_exchange_rate_pkg.get_currency_exchange(t1.transaction_amount,t1.exchange_rate,t1.exchange_rate_quotation) as transaction_functional_amount, <bm:field name="zero_amounts_allowed" expression="(select d.zero_amounts_allowed from csh_bank_account_v d where d.bank_account_id=t1.bank_account_id)" forInsert="false" forUpdate="false"/>
(select a.bank_account_code <bm:field name="transaction_type_desc" forInsert="false" forUpdate="false" prompt="HLS.TRANSACTION_TYPE"/>
from csh_bank_account a <bm:field name="unwrite_off_amount" expression="(nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0))" forInsert="false" forUpdate="false" prompt="HLS.UNWRITEOFF_AMOUNT"/>
where a.bank_account_id = t1.bank_account_id <bm:field name="precision" expression="(select g.precision from gld_currency g where g.currency_code =t1.currency_code)" forInsert="false" forUpdate="false"/>
and a.company_id = t1.company_id) as bank_account_code, <bm:field name="reverse_amount" expression="(-1*t1.transaction_amount)" forInsert="false" forUpdate="false" prompt="CSH511.REVERSE_AMOUNT"/>
(select a.bank_account_name <bm:field name="user_desc" expression="(select su.description from sys_user su where su.user_id=t1.created_by)" forInsert="false" forUpdate="false"/>
from csh_bank_account a <bm:field name="auto_filt_penalty" expression="&apos;N&apos;" forInsert="false" forUpdate="false" prompt="CSH513.AUTO_FILT_PENALTY"/>
where a.bank_account_id = t1.bank_account_id <bm:field name="auto_filt_prinicipal_interest" expression="&apos;Y&apos;" forInsert="false" forUpdate="false" prompt="CSH513.AUTO_FILT_PRINICIPAL_INTEREST"/>
and a.company_id = t1.company_id) as bank_account_name, <bm:field name="returned_flag_desc" forInsert="false" forUpdate="false" prompt="CSH511.CSH_TRANSACTION.RETURNED_FLAG"/>
(select a.bank_account_num <bm:field name="receipt_type"/>
from csh_bank_account a <bm:field name="receipt_type_des" expression="(select v.code_value_name from sys_code_values_v v where v.code=&apos;RECEIPT_TYPE&apos; and v.code_value=t1.receipt_type)"/>
where a.bank_account_id = t1.bank_account_id <bm:field name="ref_contract_id"/>
and a.company_id = t1.company_id) as bank_account_num, <bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
(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, <bm:field name="collection_classes"/>
(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, <bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" forInsert="false" forUpdate="false"/>
(select gb.functional_currency_code <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"/>
from fnd_companies fc, gld_set_of_books gb <bm:field name="written_off_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'WRITE_OFF_FLAG' and v.code_value =t1.WRITE_OFF_FLAG)" forInsert="false" forUpdate="false"/>
where fc.company_id = ${/session/@company_id} <bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
and fc.set_of_books_id = gb.set_of_books_id) as functional_currency_code, <bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
(select t.rate_method_code <bm:field name="opposite_band_na"/>
from gld_exchangerate_types t <bm:field name="banka"/>
where t.type_code = t1.exchange_rate_type) as rate_method_code, <bm:field name="purpose"/>
(select d.zero_amounts_allowed <bm:field name="can_returned_amount" expression="(select transaction_amount-nvl(returned_amount,0) from dual)"/>
from csh_bank_account_v d <bm:field name="gsber"/>
where d.bank_account_id = t1.bank_account_id) as zero_amounts_allowed, <bm:field name="sus_belnr"/>
(t1.transaction_amount - nvl(t1.write_off_amount, 0)) as unwrite_off_amount, <bm:field name="bp_virtual_bank_account"/>
(select g.precision <bm:field name="confirmed_flag" />
from gld_currency g <bm:field name="debt_confirmed_by"/>
where g.country_code = t1.currency_code) as precision, <bm:field name="debt_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.debt_confirmed_by)" forInsert="false" forUpdate="false"/>
(-1 * t1.transaction_amount) as reverse_amount, <bm:field name="acc_confirmed_by"/>
(t1.transaction_amount-nvl(t1.returned_amount, 0)-nvl(t1.write_off_amount, 0)) can_return_amount, <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
t1.created_by, <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
(select u.employee_name from sys_user_v u where u.user_id=t1.created_by )user_desc， </bm:fields>
(t1.transaction_amount-nvl(t1.returned_amount, 0)-nvl(t1.write_off_amount, 0)) remain_total_amount <bm:features>
from csh_transaction t1 <f:standard-who/>
#WHERE_CLAUSE# </bm:features>
order by t1.transaction_date desc,t1.transaction_num desc <bm:primary-key>
]]></bm:query-sql> <bm:pk-field name="transaction_id"/>
</bm:operation> </bm:primary-key>
</bm:operations>
<bm:data-filters> <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.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 in(&apos;NOT&apos;,&apos;PARTIAL&apos;))"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="transaction_type" queryExpression="t1.transaction_type=${@transaction_type}"/> <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_id=${@bp_id}"/> <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num like ${@transaction_num_from}"/> <bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<!--<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>--> <bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field name="bank_slip_num_from" queryExpression="t1.bank_slip_num like ${@bank_slip_num_from}"/> <bm:query-field field="opposite_band_na" queryOperator="="/>
<!--<bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>--> <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
<bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>
<!-- <bm:query-field name="bank_slip_num_to" queryExpression="t1.bank_slip_num &lt;= ${@bank_slip_num_to}"/>-->
<bm:query-field name="transaction_amount_from" queryExpression="t1.transaction_amount &gt;= ${@transaction_amount_from}"/> <bm:query-field name="transaction_amount_from" queryExpression="t1.transaction_amount &gt;= ${@transaction_amount_from}"/>
<bm:query-field name="transaction_amount_to" queryExpression="t1.transaction_amount &lt;= ${@transaction_amount_to}"/> <bm:query-field name="transaction_amount_to" queryExpression="t1.transaction_amount &lt;= ${@transaction_amount_to}"/>
<bm:query-field name="currency_code_from" queryExpression="t1.currency_code &gt;= ${@currency_code_from}"/> <bm:query-field name="currency_code_from" queryExpression="t1.currency_code &gt;= ${@currency_code_from}"/>
<bm:query-field name="currency_code_to" queryExpression="t1.currency_code &lt;= ${@currency_code_to}"/> <bm:query-field name="currency_code_to" queryExpression="t1.currency_code &lt;= ${@currency_code_to}"/>
<bm:query-field name="bank_account_code_from" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) = ${@bank_account_code_from}"/> <bm:query-field name="bank_account_code" queryExpression="exists (select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id and a.bank_account_code = ${@bank_account_code})"/>
<!--<bm:query-field name="bank_account_code_to" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) &lt;= ${@bank_account_code_to}"/>--> <bm:query-field name="bank_account_code_from" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) &gt;= ${@bank_account_code_from}"/>
<bm:query-field name="transaction_date_from" queryExpression="trunc(t1.transaction_date) &gt;= to_date(${@transaction_date_from},&apos;YYYY-MM-DD&apos;)"/> <bm:query-field name="bank_account_code_to" queryExpression="(select a.bank_account_code from csh_bank_account a where a.bank_account_id=t1.bank_account_id) &lt;= ${@bank_account_code_to}"/>
<bm:query-field name="transaction_date_to" queryExpression="trunc(t1.transaction_date) &lt;= to_date(${@transaction_date_to},&apos;YYYY-MM-DD&apos;)"/> <bm:query-field name="transaction_date_from" queryExpression="transaction_date &gt;= to_date(${@transaction_date_from},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="payment_method_id" queryExpression="t1.payment_method_id =${@payment_method_id}"/> <bm:query-field name="transaction_date_to" queryExpression="transaction_date &lt;= to_date(${@transaction_date_to},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="returned_flag" queryExpression="t1.returned_flag=${@returned_flag}"/>
<bm:query-field name="period_name" queryExpression="t1.period_name=${@period_name}"/>
<bm:query-field name="user_id" queryExpression="t1.created_by=${@user_id}"/> <bm:query-field name="user_id" queryExpression="t1.created_by=${@user_id}"/>
<bm:query-field name="receipt" queryExpression="(t1.transaction_type=${@receipt} or t1.transaction_type=${@advance_receipt})"/> <bm:query-field name="receipt" queryExpression="(t1.transaction_type=${@receipt} or t1.transaction_type=${@advance_receipt})"/>
<bm:query-field name="full_write_off_flag" queryExpression="t1.write_off_flag!=${@full_write_off_flag}"/> <bm:query-field name="full_write_off_flag" queryExpression="t1.write_off_flag!=${@full_write_off_flag}"/>
<bm:query-field name="full_returned_flag" queryExpression="t1.returned_flag!=${@full_returned_flag}"/>
<bm:query-field name="not_write_off_flag" queryExpression="t1.write_off_flag!=${@not_write_off_flag}"/>
<bm:query-field name="not_reversed_flag_r" queryExpression="t1.reversed_flag!=${@not_reversed_flag_r}"/>
<bm:query-field name="bp_id_from" queryExpression="t1.bp_id&gt;=${@bp_id_from}"/>
<bm:query-field name="bp_id_to" queryExpression="t1.bp_id&lt;=${@bp_id_to}"/>
<bm:query-field field="write_off_flag" queryOperator="="/>
<bm:query-field field="posted_flag" queryOperator="="/>
<bm:query-field field="returned_flag" queryOperator="="/>
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field field="period_name" queryOperator="="/>
<bm:query-field field="payment_method_id" queryOperator="="/>
<!-- <bm:query-field field="posted_flag" queryOperator="="/> -->
<bm:query-field field="transaction_category" queryOperator="="/>
<bm:query-field field="transaction_type" queryOperator="="/>
<bm:query-field field="transaction_id" queryOperator="="/>
<bm:query-field field="collection_classes" queryOperator="="/>
<bm:query-field name="bp_id_from" queryExpression="t1.bp_id &gt;= ${@bp_id_from}"/>
<bm:query-field name="bp_id_to" queryExpression="t1.bp_id &lt;= ${@bp_id_to}"/>
<bm:query-field name="reverse_write_off_amount_flag" queryExpression="t1.write_off_amount &gt; 0 and ${@reverse_write_off_amount_flag}=&apos;Y&apos;"/>
<bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field name="description" queryExpression="t1.description like &apos;%&apos;||${@description}||&apos;%&apos;"/>
<bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH515/csh_transaction_returned_list.lwm
View file @ 911e54b8
...@@ -9,9 +9,14 @@ ...@@ -9,9 +9,14 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[select r.return_id, <bm:query-sql><![CDATA[select r.return_id,
r.this_return_amount,
t1.transaction_num, t1.transaction_num,
t1.transaction_date, t1.transaction_date,
t1.currency_code, t1.currency_code,
b.bank_account_num,
b.bank_branch_name,
bank_slip_num,
t1.period_name,
(select gc.currency_name (select gc.currency_name
from gld_currency_vl gc from gld_currency_vl gc
where gc.currency_code = t1.currency_code) as currency_name, where gc.currency_code = t1.currency_code) as currency_name,
...@@ -28,8 +33,7 @@ ...@@ -28,8 +33,7 @@
(select b.description (select b.description
from hls_bp_category b from hls_bp_category b
where b.bp_category = t1.bp_category) as bp_category_display, where b.bp_category = t1.bp_category) as bp_category_display,
t1.bank_slip_num,
t1.period_name,
(select cp.description (select cp.description
from csh_payment_method cp from csh_payment_method cp
where cp.payment_method_id = t1.payment_method_id) as payment_method_display, where cp.payment_method_id = t1.payment_method_id) as payment_method_display,
...@@ -45,18 +49,16 @@ ...@@ -45,18 +49,16 @@
from csh_bank_account a from csh_bank_account a
where a.bank_account_id = t1.bank_account_id where a.bank_account_id = t1.bank_account_id
and a.company_id = t1.company_id) as bank_account_name, 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 (select a.bank_account_code
from hls_bp_master_bank_account a from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code, where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_code,
(select a.bank_account_name (select a.bank_account_name
from hls_bp_master_bank_account a from hls_bp_master_bank_account a
where a.bank_account_id = t1.bp_bank_account_id) as bp_bank_account_name, 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, (select u.employee_name
from sys_user_v u
where u.user_id = t1.created_by) user_desc,
r.notes, r.notes,
(select h.bp_name (select h.bp_name
from hls_bp_master h from hls_bp_master h
...@@ -71,13 +73,15 @@ ...@@ -71,13 +73,15 @@
(select c.contract_number (select c.contract_number
from con_contract c from con_contract c
where contract_id = r.ref_contract_id) contract_number_t where contract_id = r.ref_contract_id) contract_number_t
from from csh_transaction t1,
csh_transaction t1, csh_transaction_return r csh_transaction_return r,
hls_bp_master_bank_account b
where where
t1.return_from_csh_trx_id = r.transaction_id and t1.transaction_id = r.transaction_id
t1.transaction_id = r.return_transaction_id and and r.bp_id = b.bp_id
r.status = 'APPROVED' and and r.status = 'APPROVED'
t1.return_from_csh_trx_id = ${@return_from_csh_trx_id} and t1.transaction_id = ${@return_from_csh_trx_id}
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ 911e54b8
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
//附件上传 //附件上传
function upload_attachment_win() { function upload_attachment_win() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
/* var record = $(ds_id).findById(record_id); /* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/ var mortgage_id = record.get('mortgage_id');*/
var win = new Leaf.Window({ var win = new Leaf.Window({
...@@ -33,11 +34,11 @@ ...@@ -33,11 +34,11 @@
url: $('hn2050_upload_win_link').getUrl(), url: $('hn2050_upload_win_link').getUrl(),
params: { params: {
winid: 'hn2050_upload_win', winid: 'hn2050_upload_win',
table_name: 'hn_virtual_con_mortgage', table_name: 'csh_transaction',
header_id: 1000 header_id: record.get('transaction_id')
}, },
width: 900, width: 900,
hight: 400 height: 400
}).on('close', function() { }).on('close', function() {
//record.ds.query(); //record.ds.query();
}); });
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview
View file @ 911e54b8
...@@ -14,7 +14,7 @@ ...@@ -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:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/>
</a:init-procedure> </a:init-procedure>
<a:view> <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_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="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"/> <a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/>
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
//附件上传 //附件上传
function upload_attachment_win() { function upload_attachment_win() {
var record=$('csh_transaction_receipt_head_ds').getAt(0);
/* var record = $(ds_id).findById(record_id); /* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/ var mortgage_id = record.get('mortgage_id');*/
var win = new Leaf.Window({ var win = new Leaf.Window({
...@@ -33,11 +35,11 @@ ...@@ -33,11 +35,11 @@
url: $('hn2050_upload_win_link').getUrl(), url: $('hn2050_upload_win_link').getUrl(),
params: { params: {
winid: 'hn2050_upload_win', winid: 'hn2050_upload_win',
table_name: 'hn_virtual_con_mortgage', table_name: 'csh_transaction',
header_id: 1000 header_id: record.get('transaction_id')
}, },
width: 900, width: 900,
hight: 400 height: 400
}).on('close', function() { }).on('close', function() {
//record.ds.query(); //record.ds.query();
}); });
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ 911e54b8
...@@ -728,7 +728,7 @@ ...@@ -728,7 +728,7 @@
<a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/> <a:column name="description" prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
<a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/> <a:column name="confirmed_flag_desc" prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/>
<a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/> <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" > <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/> <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
......
src/main/webapp/modules/csh/CSH515/csh_amount_return.lview
View file @ 911e54b8
...@@ -15,20 +15,26 @@ ...@@ -15,20 +15,26 @@
<a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
// console.log('${/parameter}');
})
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var transaction_amount = ${/parameter/@transaction_amount}||0; /* var transaction_amount = ${/parameter/@transaction_amount}||0;
var return_amount = ${/parameter/@returned_amount}||0; var return_amount = ${/parameter/@returned_amount}||0;
var write_off_amount = ${/parameter/@write_off_amount}||0; var write_off_amount = ${/parameter/@write_off_amount}||0;
var remain_total_amount = ${/parameter/@remain_total_amount}||0; var remain_total_amount = ${/parameter/@remain_total_amount}||0;
var bank_slip_num = '${/parameter/@bank_slip_num}'; var bank_slip_num = '${/parameter/@bank_slip_num}';*/
record.set('remain_total_amount',remain_total_amount); record.set('remain_total_amount',remain_total_amount);
record.set('bank_slip_num',bank_slip_num); record.set('bank_slip_num',bank_slip_num);
}; };
//提交按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
console.log($(ds_id).getAt(0));
var return_id = $(ds_id).getAt(0).get('return_id'); var return_id = $(ds_id).getAt(0).get('return_id');
var transaction_amount = $(ds_id).getAt(0).get('transaction_amount'); var transaction_amount = $(ds_id).getAt(0).get('transaction_amount');
var this_return_amount = $(ds_id).getAt(0).get('this_return_amount'); var this_return_amount = $(ds_id).getAt(0).get('this_return_amount');
var return_amount = $(ds_id).getAt(0).get('return_amount'); var return_amount = $(ds_id).getAt(0).get('return_amount');
...@@ -43,7 +49,7 @@ ...@@ -43,7 +49,7 @@
Leaf.showMessage('提示', '退款金额不能大于可退款金额！'); Leaf.showMessage('提示', '退款金额不能大于可退款金额！');
return; return;
} }
var fin_amount = '${/model/fin_amount_check/record/@fin_amount}'; /* var fin_amount = '${/model/fin_amount_check/record/@fin_amount}';*/
// if(check_amount < 0.1 * fin_amount){ // if(check_amount < 0.1 * fin_amount){
// Leaf.showMessage('提示','退还后保证金不足融资余额10%！'); // Leaf.showMessage('提示','退还后保证金不足融资余额10%！');
// return; // return;
......
src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
View file @ 911e54b8
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<a:link id="csh560_check_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="query"/> <a:link id="csh560_check_wfl_link" model="csh.CSH560.return_workflow_start" modelaction="query"/>
<a:link id="csh515_amount_return_link" url="${/request/@context_path}/modules/csh/CSH515/csh_amount_return.lview"/> <a:link id="csh515_amount_return_link" url="${/request/@context_path}/modules/csh/CSH515/csh_amount_return.lview"/>
<a:link id="csh515_get_layout_link" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="csh515_get_layout_link" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="csh_transaction_receipt_maintain_readonly_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function dateValidator(record, name, value) { //日期校验方法 function dateValidator(record, name, value) { //日期校验方法
if (name == 'transaction_date_from' || name == 'transaction_date_to') { if (name == 'transaction_date_from' || name == 'transaction_date_to') {
...@@ -80,9 +81,7 @@ ...@@ -80,9 +81,7 @@
function seedetail_transaction_num(value, record, name) { function seedetail_transaction_num(value, record, name) {
if (record.get('transaction_id')) { if (record.get('transaction_id')) {
var url; var url;
url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
url = $('csh_transaction_receipt_return_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id');
return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>'; return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
} }
} }
...@@ -184,6 +183,7 @@ ...@@ -184,6 +183,7 @@
var returned_amount = record.get('returned_amount')||0; var returned_amount = record.get('returned_amount')||0;
var write_off_amount = record.get('write_off_amount')||0; var write_off_amount = record.get('write_off_amount')||0;
var transaction_amount = record.get('transaction_amount')||0; var transaction_amount = record.get('transaction_amount')||0;
var can_returned_amount = record.get('can_returned_amount')||0;
var bp_id = record.get('bp_id'); var bp_id = record.get('bp_id');
var remain_total_amount = record.get('remain_total_amount'); var remain_total_amount = record.get('remain_total_amount');
var bank_slip_num = record.get('bank_slip_num'); var bank_slip_num = record.get('bank_slip_num');
...@@ -202,12 +202,14 @@ ...@@ -202,12 +202,14 @@
return; return;
} }
var param = record.data; var param = record.data;
param['bank_slip_num'] = bank_slip_num;
param['function_code'] = 'CSH560R'; param['function_code'] = 'CSH560R';
param['url_title'] = '收款退款'; param['url_title'] = '收款退款';
param['bp_id'] = bp_id; param['bp_id'] = bp_id;
param['transaction_id'] = transaction_id; param['transaction_id'] = transaction_id;
param['write_off_amount'] = write_off_amount; param['write_off_amount'] = write_off_amount;
param['returned_amount'] = returned_amount; param['returned_amount'] = returned_amount;
param['can_returned_amount']=can_returned_amount;
param['transaction_amount'] = transaction_amount; param['transaction_amount'] = transaction_amount;
param['remain_total_amount'] = remain_total_amount; param['remain_total_amount'] = remain_total_amount;
param['winid'] = 'csh515_amount_return_winid'; param['winid'] = 'csh515_amount_return_winid';
...@@ -284,6 +286,72 @@ ...@@ -284,6 +286,72 @@
<a:map from="bank_account_code" to="bank_account_code_from"/> <a:map from="bank_account_code" to="bank_account_code_from"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping>
<a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="bank_branch_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping>
<a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping>
<a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
<a:map from="bank_account_id" to="bank_account_id"/>
<a:map from="bank_account_num" to="bank_account_num"/>
<a:map from="bank_account_name" to="bank_account_name"/>
<a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/>
<a:map from="bank_account_type" to="bank_account_type"/>
<a:map from="bank_account_type_name" to="bank_account_type_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="opposite_band_na" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bp_bank_account_num" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">
<a:mapping>
<a:map from="bp_bank_account_name" to="bp_bank_account_name"/>
<a:map from="opposite_band_na" to="opposite_band_na"/>
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="bank_account_from_id"/> <a:field name="bank_account_from_id"/>
<a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
...@@ -355,47 +423,66 @@ ...@@ -355,47 +423,66 @@
<a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> --> <a:gridButton click="csh510_receipt_quit" text="HLS.EXIT"/> -->
<a:gridButton click="csh510_receipt_query" text="HLS.QUERY"/> <a:gridButton click="csh510_receipt_query" text="HLS.QUERY"/>
<a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/> <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
<a:gridButton click="csh515_receipt_return" text="CSH515.CSH_REFUND"/> <a:gridButton click="csh515_receipt_return" text="CSH515.CSH_REFUND" id="csh515_receipt_return"/>
<a:gridButton click="csh515_receipt_return_list" text="CSH515.CSH_REFUND_DETAILS"/> <a:gridButton click="csh515_receipt_return_list" text="CSH515.CSH_REFUND_DETAILS"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form bindTarget="csh_transaction_receipt_maintain_query_ds" column="3" labelWidth="130" marginWidth="35" title="CSH515.CSH_RECEIPT_REFUND"> <a:form bindTarget="csh_transaction_receipt_write_off_query_ds" labelWidth="120" marginWidth="80"
<a:comboBox name="transaction_type_display" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_RECEIPT_CATEGORY"/> title="收款核销" style="margin-left:20px">
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="HLS.BP_TITLE"/> <a:hBox>
<a:lov name="bank_account_code_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_ACCOUNT_CODE_FROM"/> <a:fieldSet column="4" labelWidth="150" title="HLS.QUERY_TITLE">
<!--<a:lov name="bank_account_code_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_ACCOUNT_CODE_TO"/>-->
<a:textField name="transaction_num_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="现金事务编号"/>
<!--<a:textField name="transaction_num_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="现金事务编号到"/>-->
<a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="收款金额从"/>
<a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="收款金额到"/>
<a:datePicker name="transaction_date_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/> <a:datePicker name="transaction_date_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/>
<a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/> <a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
<!--<a:comboBox name="payment_method_display" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="HLS.PAYMENT_METHOD"/>--> <a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
<!--<a:comboBox name="returned_flag_display" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.RETURNED_FLAG_CHOOSE"/>--> <a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<a:textField name="bank_slip_num_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="银行流水号"/> <!--我方账户户名-->
<!--<a:textField name="bank_slip_num_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="银行流水号到"/>--> <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<!--<a:comboBox name="currency_name_from_display" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="HLS.CURRENCY_FROM"/> <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:comboBox name="currency_name_to_display" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="HLS.CURRENCY_TO"/>--> <a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<!--<a:lov name="period_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="GLD_PERIODS.PERIOD_NAME"/>--> <!--银行流水号-->
<!--<a:lov name="user_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="HLS.DOCUMENT_CREATED_BY"/>--> <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
</a:fieldSet>
</a:hBox>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_return_maintain_ds" marginHeight="290" marginWidth="35" navBar="true"> <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_return_maintain_ds" marginHeight="180" marginWidth="35" navBar="true">
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="120"/> <a:column name="transaction_num" prompt="现金事务编号" renderer="seedetail_transaction_num" width="120" align="center"/>
<a:column name="transaction_date" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_DATE" renderer="Leaf.formatDate"/> <a:column name="receipt_type_n" align="center" prompt="CSH510.CSH_TRANSACTION.RECEIPT_TYPE" width="100"/>
<a:column name="currency_name" prompt="HLS.CURRENCY"/> <a:column name="transaction_amount" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" renderer="Leaf.formatMoney" align="right"/>
<a:column name="transaction_amount" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" renderer="Leaf.formatMoney"/> <a:column name="transaction_date" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_DATE" renderer="Leaf.formatDate" align="center"/>
<a:column name="can_returned_amount" prompt="可退款金额" renderer="Leaf.formatMoney" align="right"/>
<a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
<a:column name="returned_amount" renderer="Leaf.formatMoney" align="right"/>
<!-- <a:column name="posted_flag" prompt="HLS.POST"/> --> <!-- <a:column name="posted_flag" prompt="HLS.POST"/> -->
<a:column name="bank_account_code" prompt="CSH511.BANK_ACCOUNT_CODE"/> <!-- <a:column name="bank_account_code" prompt="CSH511.BANK_ACCOUNT_CODE"/>
<a:column name="bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/> <a:column name="bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/>-->
<!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> --> <!-- <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="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/> -->
<a:column name="bank_slip_num" prompt="银行流水号"/> <!-- <a:column name="returned_amount" prompt="HLS.RETURNED_AMOUNT" renderer="Leaf.formatMoney"/>
<a:column name="returned_amount" prompt="HLS.RETURNED_AMOUNT" renderer="Leaf.formatMoney"/>
<a:column name="remain_total_amount" prompt="CSH515.CSH_CAN_REFUND_AMOUNT" renderer="Leaf.formatMoney"/> <a:column name="remain_total_amount" prompt="CSH515.CSH_CAN_REFUND_AMOUNT" renderer="Leaf.formatMoney"/>
<a:column name="write_off_amount" prompt="HLS.WRITEOFF_AMOUNT" renderer="Leaf.formatMoney"/> <a:column name="write_off_amount" prompt="HLS.WRITEOFF_AMOUNT" renderer="Leaf.formatMoney"/>-->
<!--<a:column name="can_return_amount" prompt="CSH515.CSH_CAN_REFUND_AMOUNT" renderer="Leaf.formatMoney"/>--> <!--<a:column name="can_return_amount" prompt="CSH515.CSH_CAN_REFUND_AMOUNT" renderer="Leaf.formatMoney"/>-->
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/> <!--<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>-->
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" align="center">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"/>
</a:column>
<a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT" align="center">
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center"/>
<a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center"/>
</a:column>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
src/main/webapp/modules/csh/CSH515/csh_transaction_returned_list.lview
View file @ 911e54b8
...@@ -73,18 +73,19 @@ ...@@ -73,18 +73,19 @@
</a:screenTopToolbar> </a:screenTopToolbar>
<a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true"> <a:grid bindTarget="csh_transaction_returned_list_ds" marginHeight="130" marginWidth="30" navBar="true">
<a:columns> <a:columns>
<a:column name="transaction_num" prompt="退款编号" renderer="returned_list_transaction" width="120"/> <a:column name="transaction_num" prompt="退款编号" width="120" align="center"/>
<a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate"/> <a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate" align="center"/>
<a:column name="currency_name" prompt="HLS.CURRENCY"/> <!-- <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="posted_flag" prompt="HLS.POST"/> -->
<a:column name="bank_account_code" prompt="退款账户"/> <!--<a:column name="bank_account_code" prompt="退款账户"/>-->
<a:column name="bank_account_name" prompt="CSH511.BANK_ACCOUNT_NAME"/> <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="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> -->
<a:column name="bp_name" prompt="HLS.BP_NAME"/> <a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
<a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY"/> <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"/> <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"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
<a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/> <a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview
View file @ 911e54b8
...@@ -66,7 +66,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -66,7 +66,7 @@ $Purpose: 商业伙伴授信维护
//设置为可以修改 //设置为可以修改
//datas[0].getField('credit_total_amount').setReadOnly(false); //datas[0].getField('credit_total_amount').setReadOnly(false);
} }
//1. 营业内勤/营业担当勾选授信状态为“启用”或“审批冻结 //1. 营业内勤/营业担当勾选授信状态为“启用”或“停用
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
//授信额度变更 //授信额度变更
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd'); var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
...@@ -77,8 +77,8 @@ $Purpose: 商业伙伴授信维护 ...@@ -77,8 +77,8 @@ $Purpose: 商业伙伴授信维护
} }
//启用和审批冻结判断 //启用和审批冻结判断
var credit_status=datas[0].data.credit_status; var credit_status=datas[0].data.credit_status;
if(credit_status!='ENABLE'&&credit_status!='FREZZING'){ if(credit_status!='ENABLE'&&credit_status!='DISABLE'){
$L.showInfoMessage("提示",'请选择状态为启用和审批冻结的数据！',null,null) $L.showInfoMessage("提示",'请选择状态为启用和停用的数据！',null,null)
return; return;
} }
//角色判断 00215 营业内勤 //角色判断 00215 营业内勤
......
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