Commit aa9dbcc2 authored by lijingjing's avatar lijingjing

Merge branch 'refs/heads/feature/acr_create' into develop

parents 7788cc59 8dfd59c2
Pipeline #3945 canceled with stages
......@@ -9,47 +9,48 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT
--应付我司开户名
(SELECT hbbc.bank_full_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id=V.bp_bank_account_id
) agent_bank_name,
--代理商名称
(SELECT bp_name
FROM hls_bp_master hbm,hls_bp_master_bank_account hbbc
WHERE hbm.bp_id = hbbc.bp_id
AND hbbc.bank_account_id=v.bp_bank_account_id) agent_name,
--应付我司开户行
(SELECT HBBc.bank_account_name
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) agent_account_name,
--应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) AGENT_BANK_NUM,
--厂商开户名
(SELECT hbbc.bank_account_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id=v.vender_bank_account_id
) vender_account_name,
--厂商开户行
(SELECT hbbc.bank_full_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id=v.vender_bank_account_id
) vender_bank_name,
--厂商名称
(SELECT bp_name
FROM hls_bp_master hbm,hls_bp_master_bank_account hbbc
WHERE hbm.bp_id=hbbc.bp_id
AND hbbc.bank_account_id=V.vender_bank_account_id) vender_name,
--应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.VENDER_BANK_ACCOUNT_ID) VENDER_BANK_NUM,
( to_char(SYSDATE,'yyyy')||'年'||to_char(SYSDATE,'mm')||'月'||to_char(SYSDATE,'dd')||'日') current_date
select tt.* from ( SELECT
--应付我司开户名
(SELECT hbbc.bank_full_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id = V.bp_bank_account_id) agent_bank_name,
--代理商名称
(select bp.BP_NAME
from HLS_BP_MASTER bp
WHERE bp.BP_ID = t.bp_id_agent_level1
and bp.bp_category = 'AGENT') agent_name,
--应付我司开户行
(SELECT HBBc.bank_account_name
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) agent_account_name,
--应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.BP_BANK_ACCOUNT_ID) AGENT_BANK_NUM,
--厂商开户名
(SELECT hbbc.bank_account_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id = v.vender_bank_account_id) vender_account_name,
--厂商开户行
(SELECT hbbc.bank_full_name
FROM hls_bp_master_bank_account hbbc
WHERE hbbc.bank_account_id = v.vender_bank_account_id) vender_bank_name,
--厂商名称
(select bp.BP_NAME
from HLS_BP_MASTER bp
WHERE bp.BP_ID = t.bp_id_tenant
AND bp.bp_category = 'TENANT') vender_name,
--应付我司开户账号
(SELECT HBBC.BANK_ACCOUNT_NUM
FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC
WHERE HBBC.BANK_ACCOUNT_ID = V.VENDER_BANK_ACCOUNT_ID) VENDER_BANK_NUM,
(to_char(SYSDATE, 'yyyy') || '年' || to_char(SYSDATE, 'mm') || '月' ||
to_char(SYSDATE, 'dd') || '日') current_date,
v.payment_req_id,
v.ref_doc_id
FROM CSH_PAYMENT_REQ_LN V
FROM CSH_PAYMENT_REQ_LN V, con_contract t
where t.contract_id = V.ref_doc_id) tt
#WHERE_CLAUSE#
-- WHERE V.PAYMENT_REQ_ID = 2512561 AND ROWNUM <= 1
......@@ -60,10 +61,10 @@
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="v.payment_req_id =${@payment_req_id}"/>
<bm:data-filter enforceOperations="query" expression="tt.payment_req_id =${@payment_req_id}"/>
</bm:data-filters>
<!-- <bm:query-fields>
<bm:query-field name="payment_req_id" queryOperator="="/>
</bm:query-fields>-->
<!-- <bm:query-fields>
<bm:query-field name="payment_req_id" queryOperator="="/>
</bm:query-fields>-->
</bm:model>
</bm:model>
\ No newline at end of file
......@@ -72,8 +72,11 @@
where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NAME,
--应付我司金额
cpr.amount_agent,
cpr.amount_vender,
to_char(cpr.amount_agent,'FM999,999,999,990.00') amount_agent,
to_char(cpr.amount_vender,'FM999,999,999,990.00') amount_vender,
--未付金额
(cpr.amount_agent - nvl(cpr.amount_agent_paid, 0)) residual_agent_amount,
(cpr.amount_vender - nvl(cpr.amount_vender_paid, 0)) residual_vender_amount,
......@@ -91,9 +94,10 @@
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_name,
cpr.amount,
c.lease_item_amount,
to_char(c.lease_item_amount,'FM999,999,999,990.00') lease_item_amount,
--首付款抵充金额
(select nvl(hd.other_payment2, 0)
(select to_char( nvl(hd.other_payment2, 0),'FM999,999,999,990.00')
from hls_fin_calculator_hd hd
where hd.calc_session_id =
(select PQ.CALC_SESSION_ID
......@@ -124,8 +128,8 @@
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="v.payment_req_id =${@payment_req_id}"/>
</bm:data-filters>
<!-- <bm:query-fields>
<bm:query-field name="payment_req_id" queryOperator="="/>
</bm:query-fields>-->
<!-- <bm:query-fields>
<bm:query-field name="payment_req_id" queryOperator="="/>
</bm:query-fields>-->
</bm:model>
</bm:model>
\ No newline at end of file
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