Commit 5a022ef4 authored by lizhe's avatar lizhe

日立返还金后续修改

parent ca6d5023
......@@ -84,6 +84,10 @@
acr_invoice_pkg.check_rl_flag(cc.contract_id) = 'Y'
then
'Y'
when acr_invoice_pkg.check_rl_cf_flag(cc.contract_id,t2.cf_item,t2.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(cc.contract_id) = 'N'
then
'N'
else
''
end rl_flag,
......
......@@ -106,6 +106,10 @@
acr_invoice_pkg.check_rl_flag(con.contract_id) = 'Y'
then
'Y'
when acr_invoice_pkg.check_rl_cf_flag(con.contract_id,cf.cf_item,cf.times)= 'Y' and
acr_invoice_pkg.check_rl_flag(con.contract_id) = 'N'
then
'N'
else
''
end rl_flag
......
......@@ -642,7 +642,7 @@
AND cf_status = 'RELEASE'
AND cf_item = 8) residual_date,
-- 合同终了
(CASE
/*(CASE
WHEN ct.contract_status IN ('INCEPT', 'ETING', 'TERMINATE', 'ET') THEN
(SELECT to_char(MAX(cc.last_received_date),'yyyy-mm-dd')
FROM con_contract_cashflow cc
......@@ -657,7 +657,8 @@
AND cf_item = 250)
ELSE
''
END) terminate_date,
END) terminate_date,*/
to_char(ct.et_date, 'yyyy-mm-dd') terminate_date,
ct.is_buyout,
(SELECT v.code_value_name
FROM sys_code_values_v v
......
......@@ -192,7 +192,7 @@
</a:grid>
</a:tab>
<a:tab prompt="租金余额表" width="150">
<a:tab prompt="租金余额表(日立返还金筛选用)" width="210">
<a:grid id="con_contract_rental_result_add_grid" bindTarget="con_contract_rental_result_ds" marginHeight="115" navBar="true" marginWidth="30">
<a:columns>
<a:column name="agent_extra_name" align="center" prompt="代理店" width="120"/>
......
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