Commit 479b66dd authored by stone's avatar stone

【fix】修改付款条件

parent b4d776da
...@@ -9,10 +9,11 @@ ...@@ -9,10 +9,11 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select rownum, v.* select rownum, v.*
from (select c.contract_number, from (select c.contract_number,
c.contract_name, c.contract_name,
c.contract_id, c.contract_id,
c.bp_id_agent_level1,
(select hli.pattern (select hli.pattern
from con_contract_lease_item ccli, hls_lease_item hli from con_contract_lease_item ccli, hls_lease_item hli
where ccli.lease_item_id = hli.lease_item_id where ccli.lease_item_id = hli.lease_item_id
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
hbm.bp_name, hbm.bp_name,
to_char(cpr.apply_pay_date,'yyyy-mm-dd') apply_pay_date, to_char(cpr.apply_pay_date,'yyyy-mm-dd') apply_pay_date,
cpr.bp_bank_account_id, cpr.bp_bank_account_id,
cpr.vender_bank_account_id,
(select cph.payment_req_number (select cph.payment_req_number
from csh_payment_req_hd cph from csh_payment_req_hd cph
where cpr.payment_req_id = cph.payment_req_id) payment_req_number, where cpr.payment_req_id = cph.payment_req_id) payment_req_number,
...@@ -53,9 +55,10 @@ ...@@ -53,9 +55,10 @@
and c.source_doc_id = cpr.payment_req_id and c.source_doc_id = cpr.payment_req_id
and c.transaction_type = 'PAYMENT') bank_slip_num,*/ and c.transaction_type = 'PAYMENT') bank_slip_num,*/
(select bp_name (select h.bank_account_name
from hls_bp_master hbm FROM hls_bp_master_bank_account h
where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N, WHERE
h.bank_account_id = cpr.bp_bank_account_id) BP_ID_AGENT_N,
(select hbm.bank_account_num (select hbm.bank_account_num
from hls_bp_master_bank_account hbm from hls_bp_master_bank_account hbm
...@@ -74,19 +77,13 @@ ...@@ -74,19 +77,13 @@
--未付金额 --未付金额
(cpr.amount_agent - nvl(cpr.amount_agent_paid, 0)) residual_agent_amount, (cpr.amount_agent - nvl(cpr.amount_agent_paid, 0)) residual_agent_amount,
(cpr.amount_vender - nvl(cpr.amount_vender_paid, 0)) residual_vender_amount, (cpr.amount_vender - nvl(cpr.amount_vender_paid, 0)) residual_vender_amount,
(select bp_name
from hls_bp_master hbm
where hbm.bp_id =
(select bp_id
from hls_bp_master_bank_account t
where t.bank_account_id = cpr.vender_bank_account_id)) vender_name,
(select hbm.bank_account_name (select hbm.bank_account_name
from hls_bp_master_bank_account hbm from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_ID, where hbm.bank_account_id = cpr.vender_bank_account_id
) vender_name,
(select hbm.bank_account_num (select hbm.bank_account_num
from hls_bp_master_bank_account hbm from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_number, where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number,
(select hbm.bank_account_num (select hbm.bank_account_num
from hls_bp_master_bank_account hbm from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n, where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n,
......
...@@ -215,8 +215,9 @@ ...@@ -215,8 +215,9 @@
and ee.unit_id = h.unit_id and ee.unit_id = h.unit_id
and h.bp_category = 'AGENT' and h.bp_category = 'AGENT'
) )
-- AND t.contract_status IN AND t.contract_status IN
-- ('INCEPT') ('INCEPT')
and t.sign_contract_status in ('SIGNING')
--测试用,cf_itme应当为0 --测试用,cf_itme应当为0
AND f.cf_item in (0)) t1 AND f.cf_item in (0)) t1
...@@ -285,6 +286,12 @@ ...@@ -285,6 +286,12 @@
<bm:field name="cf_61_write_off_flag_n"/> <bm:field name="cf_61_write_off_flag_n"/>
<bm:field name="billing_status_n"/> <bm:field name="billing_status_n"/>
<bm:field name="invoice_status_n"/> <bm:field name="invoice_status_n"/>
<bm:field name="bp_bank_account_id"/>
<bm:field name="vender_bank_account_id"/>
<bm:field name="vender_name"/>
<bm:field name="VENDER_BANK_ACCOUNT_NUMBER"/>
<bm:field name="bp_bank_account_name"/>
<bm:field name="bp_bank_account_num"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<s:bm-script><![CDATA[ <s:bm-script><![CDATA[
......
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