Skip to content

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

新增代理店北京慧珠及费用合并报表调整

parent 2915dac6
Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 22 deletions
src/main/webapp/WEB-INF/classes/rpt/RPT7100/rpt_asset_commission_split.lwm 0 → 100644
View file @ a49cb774
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT *
FROM (select cc.contract_id,
--合同编号
cc.contract_number,
--承租人名称
(select hbm.bp_name
from hls_bp_master hbm
where hbm.bp_id = cc.bp_id_tenant) bp_name,
--承租人编号
(select hbm.bp_code
from hls_bp_master hbm
where hbm.bp_id = cc.bp_id_tenant) bp_code,
--经销商名称
(select hbm.extra_nam
from hls_bp_master hbm
where hbm.bp_id = cc.bp_id_agent_level1) agent_name,
--经销商编号
(select hbm.bp_code
from hls_bp_master hbm
where hbm.bp_id = cc.bp_id_agent_level1) agent_code,
cc.division,
--租赁物
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DIVISION'
and v.code_value = cc.division) division_desc,
--利息总额
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
nvl((SELECT sum(ccw.interest)
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
and ccw.cf_item = 1
and ccw.cf_direction = 'INFLOW'
and ccw.cf_status = 'RELEASE'),
0)
else
null
end interest,
--已核销利息总额
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
nvl((SELECT sum(NVL(ccw.Received_Interest, 0))
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
and ccw.cf_item = 1
and ccw.cf_direction = 'INFLOW'
and ccw.cf_status = 'RELEASE'),
0)
else
null
end Received_Interest,
--期间
gp.internal_period_num,
gp.period_name,
--当期不可列支佣金(不含税)
(SELECT ce.income_tax_amount
FROM con_unearned_comsn_income ce
WHERE ce.contract_id = cc.contract_id
and ce.internal_period_num = gp.internal_period_num) income_tax_amount,
--当期可列支佣金(不含税)
(SELECT ce.income_tax_diff_amount
FROM con_unearned_comsn_income ce
WHERE ce.contract_id = cc.contract_id
and ce.internal_period_num = gp.internal_period_num) income_tax_diff_amount,
--当期资产管理费(不含税)
(select SUM(round(ccc.due_amount /
(nvl((select hf.vat_rate
from hl_asset_manage_fee hf
where hf.cashflow_id = ccc.cashflow_id),
nvl(hlcm_monthend_je_pkg.get_acp_rate(cc.bp_id_agent_level1),
0.06)) + 1),
2))
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.due_date >= gp.start_date
and ccc.due_date < gp.end_date + 1
and ccc.cf_item = 40) asset_not_due_amount,
--当期费用合计
round((COALESCE((SELECT ce.income_tax_amount
FROM con_unearned_comsn_income ce
WHERE ce.contract_id = cc.contract_id
AND ce.internal_period_num =
gp.internal_period_num),
0) +
COALESCE((SELECT ce.income_tax_diff_amount
FROM con_unearned_comsn_income ce
WHERE ce.contract_id = cc.contract_id
AND ce.internal_period_num =
gp.internal_period_num),
0) +
COALESCE((SELECT SUM(ROUND(ccc.due_amount /
(nvl((select hf.vat_rate
from hl_asset_manage_fee hf
where hf.cashflow_id = ccc.cashflow_id),
nvl(hlcm_monthend_je_pkg.get_acp_rate(cc.bp_id_agent_level1),
0.06)) + 1),
2))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.due_date >= gp.start_date
AND ccc.due_date < gp.end_date + 1
AND ccc.cf_item = 40),
0)),
2) sum_asset_commission,
--当期收入合计
(SELECT sum(ce.UNEARNED_FINANCE_INCOME)
FROM CON_UNEARNED_FINANCE_INCOME ce
WHERE ce.contract_id = cc.contract_id
and ce.internal_period_num = gp.internal_period_num) UNEARNED_FINANCE_INCOME,
--不含税佣金
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
nvl((SELECT sum(NVL(round(ccw.due_amount /
(nvl((select hf.vat_rate
from hlcm_comsn_reconcilia hf
where hf.cashflow_id = ccw.cashflow_id),
nvl(hlcm_monthend_je_pkg.get_acp_rate(cc.bp_id_agent_level1),
0.06)) + 1),
2),
0))
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
and ccw.cf_item = 911
and ccw.cf_direction = 'OUTFLOW'
and ccw.cf_status = 'RELEASE'),
0)
else
null
end commission_not_due_amount,
--含税佣金
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
nvl((SELECT sum(NVL(round(ccw.due_amount, 2), 0))
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
and ccw.cf_item = 911
and ccw.cf_direction = 'OUTFLOW'
and ccw.cf_status = 'RELEASE'),
0)
else
null
end commission_due_amount,
--支付日期
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
(select to_char(ccc.last_received_date, 'yyyy-mm-dd')
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.cf_item = 911)
else
null
end commission_due_date,
--发票号码
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
(SELECT INVOICE_NUMBER
FROM hlcm_monthly_report_temp htp
WHERE htp.contract_id = cc.contract_id)
else
null
end commission_invoice_number,
--含税资产管理费
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
(select SUM(round(ccc.due_amount, 2))
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.cf_item = 40)
else
null
end sum_asset_due_amount,
--不含税资产管理费
case
when gp.internal_period_num =
to_number(to_char(cc.inception_of_lease, 'yyyymm')) then
nvl((select SUM(round(ccc.due_amount /
(nvl((select hf.vat_rate
from hl_asset_manage_fee hf
where hf.cashflow_id = ccc.cashflow_id),
nvl(hlcm_monthend_je_pkg.get_acp_rate(cc.bp_id_agent_level1),
0.06)) + 1),
2))
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.cf_item = 40),
0)
else
null
end sum_asset_not_due_amount
from con_contract cc, gld_periods gp
where cc.data_class = 'NORMAL'
and gp.adjustment_flag != 'Y'
and cc.contract_status not IN ('NEW', 'INCEPT_RETURN', 'CANCEL')
and gp.internal_period_num >=
to_number(to_char(cc.inception_of_lease, 'yyyymm'))
and gp.internal_period_num <=
(select to_number(to_char(MAX(CCC.DUE_DATE), 'yyyymm'))
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.cf_item in (1, 200, 250)
and ccc.cf_direction = 'INFLOW'
and ccc.cf_status = 'RELEASE')
and exists (select 1
from con_contract_cashflow ccc
where ccc.contract_id = cc.contract_id
and ccc.cf_item in (40, 911))) t1 #WHERE_CLAUSE#
order By t1.contract_number,t1.internal_period_num
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="contract_number"
queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name"
queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
<bm:query-field name="agent_name"
queryExpression="t1.agent_name like &apos;%&apos;||${@agent_name}||&apos;%&apos;"/>
<bm:query-field name="period_name_from"
queryExpression="t1.period_name &gt;= nvl(${@period_name_from},t1.period_name)"/>
<bm:query-field name="period_name_to"
queryExpression="t1.period_name &lt;= nvl(${@period_name_to},t1.period_name)"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ a49cb774
......@@ -17,11 +17,14 @@
<a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON311/con_re_print_modify.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_op_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_op_modify.lview"/>
<a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="con_contract_update_print_detail_link_id" url="${/request/@context_path}/modules/cont/CON311/con_contract_update_print_word_detail.lview"/>
<a:link id="con_lease_org_print_link"
url="${/request/@context_path}/modules/cont/CON620/create_content_for_collection.lsc"/>
<a:link id="car_modify_link_readonly_c" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_constru.lview"/>
<a:link id="operate_readonly_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain_opreat.lview"/>
<script type="text/javascript"><![CDATA[
......@@ -50,24 +53,42 @@
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
if(record.get('sign_contract_status')=='NEW' || record.get('sign_contract_status')=='SIGN_RETURN'){
param['function_code'] = 'CON301MM';
param['function_usage'] = 'MODIFY';
if(record.get('division')!='95'){
if(record.get('sign_contract_status')=='NEW' || record.get('sign_contract_status')=='SIGN_RETURN'){
param['function_code'] = 'CON301MM';
param['function_usage'] = 'MODIFY';
}
else{
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
//add by 24976
param['sign_contract_status'] = record.get('sign_contract_status');
param['contract_status'] = record.get('contract_status');
}
param['winid'] = 'con_contract_modify_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
else{
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
//add by 24976
param['sign_contract_status'] = record.get('sign_contract_status');
param['contract_status'] = record.get('contract_status');
if(record.get('division')=='95'){
if(record.get('sign_contract_status')=='NEW' || record.get('sign_contract_status')=='SIGN_RETURN'){
param['function_code'] = 'CON301MM_OP';
param['function_usage'] = 'MODIFY';
}
else{
param['function_code'] = 'CON301OP';
param['function_usage'] = 'QUERY';
param['sign_contract_status'] = record.get('sign_contract_status');
param['contract_status'] = record.get('contract_status');
}
param['winid'] = 'con_contract_modify_op_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_op_link', ds_id);
}
param['winid'] = 'con_contract_modify_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
function open_project_Window(record_id, ds_id) {
var record = $(ds_id).findById(record_id);
var record = $(ds_id).findById(record_id);
var param = record.data;
var url;
param['hide_flag'] = 'Y';
......@@ -79,14 +100,19 @@
/* param['window_open_flag'] = 'Y';
param['show_history_flag'] = 'Y'; */
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
if(record.get('is_constru_unit') == 'N'){
//不是虚拟店
param['function_code'] = 'PRJ501_WFL';
url = 'car_modify_special_link';
}else{
//虚拟店
param['function_code'] = 'PRJ501Q_CONSTRU';
url = 'car_modify_link_readonly_c';
if(record.get('division')!='95'){
if(record.get('is_constru_unit') == 'N'){
//不是虚拟店
param['function_code'] = 'PRJ501_WFL';
url = 'car_modify_special_link';
}else{
//虚拟店
param['function_code'] = 'PRJ501Q_CONSTRU';
url = 'car_modify_link_readonly_c';
}
}else {
param['function_code'] = 'PRJ501_OPERAT_WFL';
url = 'operate_readonly_link';
}
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, url, ds_id, '${/parameter/@layout_code}');
}
......@@ -171,12 +197,30 @@
}
};*/
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected();
var division=records[0].data.division;
var division_detail = records[0].data.division_detail;
var bp_id_agent_code = records[0].data.bp_id_agent_code;
if(division == '95'){
Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本！');
return;
}
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}');
return;
}
if(division == '70'){
if(division_detail=='03'){
Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本！');
return;
}
//代理店北京慧珠不支持打印纸质合同文本
if(bp_id_agent_code=='D00010038'){
Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本！');
return;
}
}
var record=records[0];
new Leaf.Window({
id: 'con_contract_update_print_detail_winid',
......@@ -197,6 +241,11 @@
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected();
var division=records[0].data.division;
if(division == '95'){
Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成用印信息！');
return;
}
if (records.length != 1) {
Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}');
return;
......
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