Skip to content

L
leaf-hlcm
Commit 0937edf5 authored by 王炜's avatar 王炜
Browse files
Options

Merge remote-tracking branch 'origin/master' into local_master

parents d4c7ab12 d4bbbba8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10734 additions and 904 deletions
src/main/database/Register_function/REGISTER_RPT556.sql 0 → 100644
View file @ 0937edf5
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_ET001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/rpt/RPT556/con_je_vat_quarter_query.lview','增值税台账(季度维度)',1,1,0);
--功能定义
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('RPT556','增值税台账(季度维度)','增值税台账(季度维度)','100','','','modules/rpt/RPT556/con_je_vat_quarter_query.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('RPT556','增值税台账(季度维度)','增值税台账(季度维度)','100','','','modules/rpt/RPT556/con_je_vat_quarter_query.lview','US',-1);
--分配页面
sys_function_assign_pkg.func_service_load('RPT556','modules/rpt/RPT556/con_je_vat_quarter_query.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_current_quarter_query');
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_quarter_query');
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_total_query_quarter');
--分配菜单
--sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET001',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
View file @ 0937edf5
......@@ -1097,16 +1097,29 @@
<select id="selectContractDetailList" parameterType="integer" resultType="java.util.HashMap">
Select
hb.bp_name,
c.contract_number,
(Select cl.machine_number
From con_contract_lease_item cl
Where cl.contract_id = c.contract_id) As machine_number,
to_char(Sysdate, 'yyyy"年"mm"月"dd"日"') As today
Select hb.bp_name,
c.contract_number,
(Select cl.machine_number
From con_contract_lease_item cl
Where cl.contract_id = c.contract_id) As machine_number,
to_char(Sysdate, 'yyyy"年"mm"月"dd"日"') As today
From con_contract c, hls_bp_master hb
Where c.bp_id_tenant = hb.bp_id
and c.contract_id = #{contractId}
and c.contract_id = #{contractId}
and nvl(division, '-1') not IN ('70', '92')
union all
Select hb.bp_name,
c.contract_number,
(Select cl.machine_number_70
From con_contract_lease_item cl
Where cl.contract_id = c.contract_id) As machine_number,
to_char(Sysdate, 'yyyy"年"mm"月"dd"日"') As today
From con_contract c, hls_bp_master hb
Where c.bp_id_tenant = hb.bp_id
and c.contract_id = #{contractId}
and nvl(division, '-1') IN ('70', '92')
</select>
......
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @ 0937edf5
......@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91'))
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60'))
UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91')
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60')
AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
......
src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm
View file @ 0937edf5
......@@ -70,6 +70,11 @@
<bm:field name="finance_type_n" expression="(select code_value_name from sys_code_values_v scv where scv.code=&apos;FINANCE_TYPE&apos; and scv.code_value = t1.finance_type)" forInsert="false" forUpdate="false"/>
<bm:field name="pay_method"/>
<bm:field name="pay_method_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = &apos;PAY_METHODS&apos; and v.code_value=t1.pay_method)" forInsert="false" forUpdate="false"/>
<bm:field name="is_buyout"/>
<bm:field name="is_buyout_n" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;YES_OR_NO&apos; And v.code_enabled_flag = &apos;Y&apos; And v.code_value_enabled_flag = &apos;Y&apos; And v.code_value = t1.is_buyout)" forInsert="false" forUpdate="false"/>
<bm:field name="is_constru_unit"/>
<bm:field name="is_constru_unit_n" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;YES_OR_NO&apos; And v.code_enabled_flag = &apos;Y&apos; And v.code_value_enabled_flag = &apos;Y&apos; And v.code_value = t1.is_constru_unit)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<o:sequence-pk sequenceName="con_contract_tmpt_clause_s"/>
......
src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm
View file @ 0937edf5
......@@ -53,6 +53,7 @@
<bm:field name="sign_contract_status_n"/>
<bm:field name="bp_id_tenant_n"/>
<bm:field name="bp_id_agent_level1_n"/>
<bm:field name="is_constru_unit"/>
</bm:fields>
<bm:primary-key>
<bm:pk-field name="contract_id"/>
......
src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_repur_query.lwm
View file @ 0937edf5
......@@ -188,7 +188,181 @@
where hb.bp_id = cc.bp_id_agent_level1
And hb.bp_code in
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2))) t1
or (decode(${/session/@user_id}, 10600, 1, 2) = 2))
and nvl(division,'-1') not IN ('70','92')
union all
SELECT
cc.contract_id,
cc.document_type,
cc.document_category,
--cc.contract_name,
(SELECT pp.project_number
FROM prj_project pp
WHERE pp.project_id = cc.project_id) project_number,
cc.bp_id_tenant,
to_char(cc.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
(SELECT hb.bp_name
FROM hls_bp_master hb, con_contract_bp ccb
WHERE hb.bp_category = 'AGENT'
AND ccb.bp_category = 'AGENT'
AND hb.bp_id = ccb.bp_id
AND ccb.contract_id = cc.contract_id) agent_id_n,
(SELECT bp_name
FROM hls_bp_master
WHERE bp_id = cc.bp_id_tenant
AND enabled_flag = 'Y') bp_id_tenant_desc,
cc.contract_number,
cc.bp_id_agent_level1,
(SELECT extra_nam
FROM hls_bp_master
WHERE bp_id = cc.bp_id_agent_level1
AND enabled_flag = 'Y') bp_id_agent_desc,
cc.owner_user_id,
(SELECT description
FROM sys_user
WHERE user_id = cc.owner_user_id) owner_user_id_desc,
cc.lease_organization,
(SELECT description
FROM hls_lease_organization
WHERE lease_organization = cc.lease_organization
AND enabled_flag =
'Y') lease_organization_desc,
(SELECT a.description value_name
FROM hls_business_type_v a
WHERE a.enabled_flag = 'Y'
AND a.business_type = cc.business_type) business_type_n,
cc.data_class,
(SELECT hd.description
FROM hls_division hd
WHERE hd.enabled_flag = 'Y'
AND hd.division = cc.division) division_n,
cc.division,
null account_due_times,
null account_due_days,
null account_due_amount,
contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_times,
contract_item_query_pkg.calc_bussiness_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_days,
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(cwo.write_off_due_amount, 0))
FROM csh_write_off cwo
WHERE cwo.reversed_flag = 'N'
AND cwo.contract_id = cc.contract_id
AND cwo.cf_item IN ( 250)
And Exists
(Select 1
From con_contract_cashflow cn
Where cn.cashflow_id = cwo.cashflow_id
And cn.cf_status = 'RELEASE'
And trunc(cn.due_date) <= trunc(Sysdate))),
0) business_due_amount,
--营业逾期总金额
contract_item_query_pkg.calc_repur_penalty(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) over_due_amount,
--营业最早逾期的预定支付日
(SELECT MIN(ccc.due_date)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.due_amount > 0
AND ccc.due_date <= sysdate
and ccc.cf_status='RELEASE'
AND ccc.cf_item in (250)
AND ccc.write_off_flag <> 'FULL') min_overdue_date,
--营业已收租金
(SELECT SUM(nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
and ccc.cf_status='RELEASE'
AND ccc.cf_item IN
(250)) business_received_amount,
--营业未收租金
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
and ccc.cf_status='RELEASE'
AND ccc.cf_item IN ( 250)
) business_unreceived_amount,
--会计已收租金
null ac_received_amount,
--会计未收租金
null ac_unreceived_amount,
--机型
(SELECT ccli.modelcd
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) modelcd,
--机号
(SELECT ccli.machine_number_70
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) machine_number,
to_char(cc.repurchase_date, 'yyyy-mm-dd') lease_start_date,
cc.PAYMENT_PERIOD lease_times,
--租金合计
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (250)
) total_due_amount,
cc.contract_status,
cc.BUSINESS_TYPE,
cc.repurchase_types
,(select to_char(max(t.creation_date), 'yyyy-mm-dd')
from cux_rent_dun_msg t
where t.contract_id = cc.contract_id) dun_date,
cc.send_message,
(select v.code_value_name
From sys_code_values_v v
Where v.code = 'SEND_MESSAGE'
And cc.send_message = v.code_value ) send_message_n,
cc.cell_phone
FROM con_contract cc
WHERE
cc.contract_status='REPURING'
and cc.repurchase_types='STAGE_REPURCHASE'
and EXISTS(SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
AND TRUNC(ccw.due_date) <= TRUNC(SYSDATE)
AND ccw.due_amount > nvl(ccw.received_amount, 0)
AND ccw.write_off_flag <> 'FULL'
And ccw.cf_item = '250'
AND ccw.cf_status = 'RELEASE'
AND ccw.cf_direction = 'INFLOW')
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = cc.contract_id
AND trunc(SYSDATE) BETWEEN a1.start_date AND
nvl(a1.end_date, trunc(SYSDATE))
AND a1.user_id = a2.owner_user_id
AND a1.trx_category = a2.trx_category
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
And ((decode(${/session/@user_id}, 10600, 1, 2) = 1
And exists(select 1
from hls_bp_master hb
where hb.bp_id = cc.bp_id_agent_level1
And hb.bp_code in
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2)) and nvl(division,'-1') IN ('70','92')
) t1
#WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/cont/CON_ET001/calc_et_date_amount.lwm
View file @ 0937edf5
......@@ -19,9 +19,8 @@
cus_con_et_pkg.calc_et_date_amount(p_change_req_id =>${@change_req_id},
p_contract_id => ${@contract_id},
p_et_date => TO_DATE(${@termination_date},'yyyy-mm-dd'),
p_ET_FEE => ${@et_fee},
p_ET_FEE => ${@et_fee},
p_et_interest_rate => ${@et_interest_rate},
p_et_total_amount => ${@et_total_amount},
p_et_due_amount => ${@et_due_amount},
p_overdue_amount => ${@overdue_amount},
......@@ -31,9 +30,8 @@
p_sum_unreceived_principal => ${@sum_unreceived_principal},
p_fund_possession_rate=>${@fund_possession_rate},
p_last_rent_due_date=>${@last_rent_due_date},
p_residual_value=>${@residual_value},
p_deposit_deduction=>${@deposit_deduction},
p_user_id => ${/session/@user_id});
END;
]]>
......
src/main/webapp/WEB-INF/classes/cont/CON_ET001/create_change_req.lwm
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select division from con_contract t1 #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="execute">
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" input="false" output="true" outputPath="@change_req_id"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 0937edf5
......@@ -88,7 +88,9 @@
v.write_off_date,
v.write_off_amount,
v.division,
v.finance_amount
v.finance_amount,
v.lease_item_amount,
v.is_buyout
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
......@@ -220,7 +222,9 @@
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.division,
t.finance_amount
t.finance_amount,
t.lease_item_amount,
nvl(t.is_buyout,'N') is_buyout
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ 0937edf5
......@@ -60,7 +60,7 @@
cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
--应付我司金额
cpr.amount_agent,
nvl(cpr.amount_agent,0) amount_agent,
cpr.amount_vender,
to_char(cpr.amount_agent,'FM999,999,999,990.00') amount_agent_print,
to_char(cpr.amount_vender,'FM999,999,999,990.00') amount_vender_print,
......@@ -131,7 +131,8 @@
nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
c.division
c.division,
nvl(c.is_buyout,'N') is_buyout
from csh_payment_req_ln cpr,
con_contract c,
hls_bp_master hbm,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 0937edf5
......@@ -158,6 +158,11 @@
(select bp_name
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
--add by 18938
(select nvl(is_constru_unit,'N')
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) is_constru_unit,
nvl(t.is_buyout,'N') is_buyout,
--查找厂商
(SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
hli.vender_name,
......@@ -255,6 +260,8 @@
<bm:field name="con_business_type_n"/>
<bm:field name="cdd_list_id"/>
<bm:field name="bp_id_agent_n"/>
<bm:field name="is_constru_unit"/>
<bm:field name="is_buyout"/>
<bm:field name="bp_id_tenant"/>
<!-- <bm:field name="vender_name"/>-->
<bm:field name="vender_name_n"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_check_wfl.lwm 0 → 100644
View file @ 0937edf5
<?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="execute">
<bm:update-sql><![CDATA[
begin
margin_check_req_pkg.margin_check_submit(
p_user_id =>${/session/@user_id},
p_margin_check_id => ${@margin_check_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="margin_check_id" dataType="java.lang.Long" input="false" output="true"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
margin_check_req_pkg.margin_check_save(
p_sql_type => 'INSERT',
p_user_id =>${/session/@user_id},
p_margin_check_id => ${@margin_check_id},
p_mar_after_status => ${@mar_after_status},
p_mar_before_status =>${@mar_before_status}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select Mar_After_Status as Mar_Status, mar_after_status_n
from (select t.mar_after_status,
(SELECT Code_Value_Name
FROM Sys_Code_Values_v sv
where sv.code = 'MARGIN_CHECK_STATUS'
and sv.code_value = t.mar_after_status) mar_after_status_n
from Csh_Margin_Check t
where t.wfl_status = 'APPROVED'
order by t.creation_date desc)
where Rownum = 1
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_submit.lwm 0 → 100644
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sc
$Date: 2022年12月2日11:26:37
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
cm_sh_transaction_reverse_pkg.csh_bank_recoin_submit(
p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ 0937edf5
......@@ -3,37 +3,37 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from
(select t1.contract_id,
t1.dd_bank_account_num,
t1.dd_bank_account_name,
t1.contract_number,
t1.contract_name,
t1.bp_id_tenant,
t1.bp_id_agent_level1,
(select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
(SELECT sc.code_value_name
FROM sys_code_values_v sc
WHERE sc.code = 'CON500_CONTRACT_STATUS'
AND sc.code_value = t1.contract_status) contract_status_desc,
t1.payment_deduction,t1.division
from con_contract t1
where
t1.contract_status in ('INCEPT','NEW','ETING','REPURING')
and t1.data_class = 'NORMAL'
and t1.company_id in ((
select company_id
from fnd_companies t
where t.company_id = ${/session/@company_id} or
t.parent_company_id = ${/session/@company_id}
union
select t.parent_company_id company_id
from fnd_companies t
where t.parent_company_id is not null
and (t.company_id = ${/session/@company_id} or t.parent_company_id = ${/session/@company_id})))
) t
#WHERE_CLAUSE#
]]></bm:query-sql>
select * from
(select t1.contract_id,
t1.dd_bank_account_num,
t1.dd_bank_account_name,
t1.contract_number,
t1.contract_name,
t1.bp_id_tenant,
t1.bp_id_agent_level1,
(select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
(SELECT sc.code_value_name
FROM sys_code_values_v sc
WHERE sc.code = 'CON500_CONTRACT_STATUS'
AND sc.code_value = t1.contract_status) contract_status_desc,
t1.payment_deduction,t1.division
from con_contract t1
where
t1.contract_status in ('INCEPT','NEW','ETING','REPURING')
and t1.data_class = 'NORMAL'
and t1.company_id in ((
select company_id
from fnd_companies t
where t.company_id = ${/session/@company_id} or
t.parent_company_id = ${/session/@company_id}
union
select t.parent_company_id company_id
from fnd_companies t
where t.parent_company_id is not null
and (t.company_id = ${/session/@company_id} or t.parent_company_id = ${/session/@company_id})))
) t
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
......@@ -60,11 +60,12 @@ select t.parent_company_id company_id
<!--<bm:query-field name="bp_id"
queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>-->
<bm:query-field name="bp_id" queryExpression="(Exists (Select 1
From hls_bp_master h, hls_bp_master_role hbr
From hls_bp_master h, hls_bp_master_role hbr,con_contract_bp bp
Where h.bp_name in ( select hbm.bp_name from hls_bp_master hbm where hbm.bp_id= ${@bp_id})
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
and h.bp_id = t.bp_id_tenant) Or not Exists
and h.bp_id= bp.bp_id
and hbr.bp_type in('TENANT','GUTA_NP')
and bp.contract_id=t.contract_id) Or not Exists
(Select 1
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
......@@ -73,4 +74,18 @@ select t.parent_company_id company_id
))"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" Expression=" exists
(select 1
from con_contract_cashflow ccc
where ccc.contract_id = t.contract_id
and ccc.cf_status = 'RELEASE'
and ccc.write_off_flag != 'FULL'
and ccc.cf_direction = 'INFLOW'
and ccc.cf_item not in (251)
and ((nvl(${@deposit_flag}, 'N') = 'Y' and cf_item in (1, 8, 9, 200, 11, 250)) or
(nvl(${@deposit_flag}, 'N') = 'N'))
and ccc.due_amount - nvl(ccc.received_amount, 0)>0
)"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_deposit_entry_write_off.lwm
View file @ 0937edf5
......@@ -30,5 +30,10 @@
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select hlcm_cux_deposit_pkg.deposit_extend_month(p_transaction_id => ${@transaction_id}) check_flag from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm
View file @ 0937edf5
......@@ -47,18 +47,10 @@
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
t1.journal_type
FROM hls_journal_header_imp t1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('014'))
and t1.journal_type in('COST_IMPORT','GLOBAL_TEMPLATE')
where t1.created_by=${/session/@user_id}
union
select t1.journal_header_id,
t1.batch_id,
......@@ -97,118 +89,12 @@
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
t1.journal_type
FROM hls_journal_header_imp t1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('012'))
and t1.journal_type in('FUND_POOL','FINANCIAL_TEMPLATE')
union
select t1.journal_header_id,
t1.batch_id,
t1.batch_number,
t1.reverse_batch_number,
t1.journal_submit_batch_id,
t1.journal_num,
t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name
from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name,
to_char(t1.journal_date,'yyyy-mm-dd') journal_date,
t1.currency_code,
(SELECT gc.currency_name
FROM gld_currency_v gc
WHERE gc.currency_code = t1.currency_code) currency_desc,
t1.total_amount_fuc_dr,
(SELECT d.je_transaction_desc
FROM gld_je_transaction d
WHERE d.je_transaction_code = t1.je_transaction_code) je_transaction_desc,
t1.description,
(SELECT COUNT(1)
FROM hls_journal_detail_imp t
WHERE t.journal_header_id = t1.journal_header_id) je_detail_count,
t1.wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS'
and v.code_value = t1.wfl_status) wfl_status_n,
t1.reversed_flag,
t1.reverse_wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('0033','025'))
and t1.journal_type in('GENERAL_SALARIES','BPO_SALARIES')
union
select t1.journal_header_id,
t1.batch_id,
t1.batch_number,
t1.reverse_batch_number,
t1.journal_submit_batch_id,
t1.journal_num,
t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name
from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name,
to_char(t1.journal_date,'yyyy-mm-dd') journal_date,
t1.currency_code,
(SELECT gc.currency_name
FROM gld_currency_v gc
WHERE gc.currency_code = t1.currency_code) currency_desc,
t1.total_amount_fuc_dr,
(SELECT d.je_transaction_desc
FROM gld_je_transaction d
WHERE d.je_transaction_code = t1.je_transaction_code) je_transaction_desc,
t1.description,
(SELECT COUNT(1)
FROM hls_journal_detail_imp t
WHERE t.journal_header_id = t1.journal_header_id) je_detail_count,
t1.wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS'
and v.code_value = t1.wfl_status) wfl_status_n,
t1.reversed_flag,
t1.reverse_wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('002','013') or ${/session/@user_id} = 10418
)
and t1.journal_type in('GENERAL_SALARIES','BPO_SALARIES','COST_IMPORT','FUND_POOL','GLOBAL_TEMPLATE','FINANCIAL_TEMPLATE')
where ${/session/@user_id}=10418
and(t1.wfl_status in ('APPROVING', 'REJECT', 'APPROVED')
)
) t1
#WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm
View file @ 0937edf5
......@@ -46,12 +46,8 @@
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
t1.journal_type
FROM hls_journal_header_imp t1
#WHERE_CLAUSE#
order by t1.journal_header_id desc
]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_reverse_wfl.lwm
View file @ 0937edf5
......@@ -43,11 +43,8 @@
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id) post_gl_status
FROM hls_journal_header_imp t1
t1.journal_type
FROM hls_journal_header_imp t1
#WHERE_CLAUSE#
order by t1.journal_header_id desc
]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/prj/PRJ500D/user_agent_description.lwm
View file @ 0937edf5
......@@ -4,7 +4,7 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select h.bp_name, h.bp_code, h.bp_id
select h.bp_name, h.bp_code, h.bp_id,nvl(h.is_constru_unit,'N') as is_constru_unit
from exp_emp_assign_e_v ee, hls_bp_master h
where ee.user_id = ${/session/@user_id}
and ee.unit_id = h.unit_id
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
View file @ 0937edf5
......@@ -462,15 +462,18 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
(select case
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then
round(ccc.vat_due_amount /
(ccc.due_amount - ccc.vat_due_amount),
2)
else
null
end
from con_contract_cashflow ccc
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code,
l.cashflow_id
FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
View file @ 0937edf5
......@@ -496,15 +496,18 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
(select case
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then
round(ccc.vat_due_amount /
(ccc.due_amount - ccc.vat_due_amount),
2)
else
null
end
from con_contract_cashflow ccc
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code,
l.cashflow_id,
'N' fixed_data_flag
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
View file @ 0937edf5
......@@ -69,5 +69,7 @@
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
<bm:query-field name="journal_date_f" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &gt;= ${@journal_date_f}"/>
<bm:query-field name="journal_date_t" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &lt;= ${@journal_date_t}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT556/con_je_vat_total_query_quarter.lwm 0 → 100644
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2023-3-16 下午2:20:47
$Revision: 1.0
$Purpose:
-->
<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 t.contract_id,
t.invoice_hd_id,
t.invoice_line_id,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'ACR510_INVOICE_KIND'
AND v.code_value = t.invoice_kind)invoice_kind_n,
t.cashflow_id,
t.tax_apply_month invoice_month,
t.invoice_date,
t.invoice_number,
t.invoice_tax_amount total_amount,
t.apply_flag for_invoice_flag,
t.tenant_name bp_name,
t.contract_number,
t.acr_tax_amount return_tax_amount,
t.journal_tax_amount amount_cr,
t.journal_month je_month,
t.journal_date je_date,
t.journal_num,
t.times,
t.due_date,
t.due_amount,
t.principal,
t.interest,
t.tax_amount vat_due_amount,
t.created_by,
t.creation_date,
t.last_updated_by,
t.last_update_date,
t.tax_type_rate
FROM vat_account_tmp t
WHERE floor(t.session_id/10)=${/session/@session_id}
) t1
#WHERE_CLAUSE#
--order by invoice_hd_id,due_date ASC,invoice_line_id asc
order by invoice_hd_id, invoice_number asc, due_date ASC
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
hl_cm_vat_report_pkg.vat_quarter_data_process(p_start_period =>${@start_period},
p_end_period =>${@end_period},
p_session_id =>${/session/@session_id},
p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>-->
</bm:data-filters>
<bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
<!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>-->
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_approve_history.lwm 0 → 100644
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw, zj_wfl_workflow_instance zi
Where zw.workflow_id = zi.workflow_id
And zi.instance_id = t1.instance_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_instance_node_rcpt_ht t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_display.lwm 0 → 100644
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw
Where zw.workflow_id = t1.workflow_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_workflow_instance t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_query.lwm 0 → 100644
View file @ 0937edf5
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:ns2="leaf.database.local.oracle" xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select nvl((Select distinct zw.workflow_code
From zj_wfl_workflow zw, zj_wfl_workflow_instance zi
Where zw.workflow_id = zi.workflow_id
And zi.instance_id = t1.instance_id),'N') as workflow_code,
nvl((Select hm.is_constru_unit
From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit
From zj_wfl_instance_node_recipient t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_approve_history.lwm
View file @ 0937edf5
......@@ -3,10 +3,13 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_node_service_url(t1.record_id,
Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type},
${/session/@user_id}) as service_url
from zj_wfl_instance_node_rcpt_ht t1
${/session/@user_id}) as service_url,tt.*
from zj_wfl_instance_node_rcpt_ht tt) t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_wait_to_do.lwm
View file @ 0937edf5
......@@ -3,11 +3,14 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_node_service_url(t1.record_id,
${/parameter/@url_type},
${/session/@user_id}) as service_url
from zj_wfl_instance_node_recipient t1
#WHERE_CLAUSE#
Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type},
${/session/@user_id}) as service_url,tt.*
from zj_wfl_instance_node_recipient tt) t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow_service_display.lwm
View file @ 0937edf5
......@@ -3,9 +3,12 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select zj_wfl_core_pkg.get_wfl_service_url(t1.instance_id,
${/session/@user_id}) as service_url
from zj_wfl_workflow_instance t1
Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru
From (select zj_wfl_core_pkg.get_wfl_service_url(tt.instance_id,
${/session/@user_id}) as service_url,tt.*
from zj_wfl_workflow_instance tt) t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
View file @ 0937edf5
......@@ -338,5 +338,6 @@ var enableLayoutConfig = {
'modules/prj/PRJ501N/prj_project_lease_import.lview:':true,
'modules/csh/CSH531F/csh_bank_recoi_processing.lview':true,
'modules/csh/CSH531F/csh_bank_recoi_processing_workflow.lview':true,
'modules/csh/CSH531F/csh_bank_recoi_margin_check.lview':true,
'modules/hsbc/HSBC130/pingan_account_hisbalance_query.lview':true
};
\ No newline at end of file
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 0937edf5
......@@ -298,7 +298,7 @@
<a:record code_value="50" code_value_name="星邦高空作业车"/>
<a:record code_value="90" code_value_name="租赁二手机"/>
<a:record code_value="91" code_value_name="神钢建机"/>
<a:record code_value="92" code_value_name="北京卡家"/>
<a:record code_value="92" code_value_name="北京心诚"/>
</a:datas>
</a:dataSet>
<a:dataSet id="acr510n_invoice_method_ds">
......
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @ 0937edf5
......@@ -19,6 +19,7 @@
<a:dataSet id="pay_methods_ds" lookupCode="PAY_METHODS"/>
<a:dataSet id="con202_withway_ds" lookupCode="WITHHOLD_WAYS"/>
<a:dataSet id="secondary_lease_ds" lookupCode="SECONDARY_LEASE"/>
<a:dataSet id="is_buyout_ds" lookupCode="YES_OR_NO"/>
<a:dataSet id="con202_finance_type" lookupCode="FINANCE_TYPE"/>
<a:dataSet id="hls_bp_class_ds" lookupCode="HLS211_BP_CLASS"/>
<a:dataSet id="other_tmpt_clause_ds" lookupCode="CON202_CON_PRINT_OTHER_CONDITON"/>
......@@ -36,6 +37,9 @@
<a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/>
<a:field name="pay_method_n" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/>
<a:field name="is_buyout_n" displayField="code_value_name" options="is_buyout_ds" returnField="is_buyout" valueField="code_value"/>
<a:field name="is_constru_unit_n" displayField="code_value_name" options="is_buyout_ds" returnField="is_constru_unit" valueField="code_value"/>
<a:field name="marital_status_flag_n" displayField="code_value_name" options="marital_status_flag_ds" returnField="marital_status_flag" valueField="code_value"/>
<a:field name="sp_sign_flag_n" displayField="code_value_name" options="sp_sign_flag_ds" returnField="sp_sign_flag" valueField="code_value"/>
<a:field name="finance_type"/>
......@@ -127,6 +131,8 @@
<a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/>
<a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/>
<a:column name="is_buyout_n" editor="cb" prompt="是否买断机" width="100"/>
<a:column name="is_constru_unit_n" editor="cb" prompt="宏菱建机部" width="100"/>
<a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/>
<a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/>
<a:column name="business_type" editor="lov" prompt="业务类型" width="80"/>
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 0937edf5
......@@ -9,6 +9,7 @@
dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query model="csh.CSH531F.csh_transaction_recoi_check_wfl" rootPath="wfl_status"/>
<a:model-query model="cont.CON3200.get_user_employee_type" rootPath="employee_info"/>
<a:model-query fetchAll="true" model="cont.CON500.con_contract_get_guid_file_name" rootPath="file_name_path"/>
<s:server-script import="contract_print_path.js"><![CDATA[
......@@ -607,10 +608,11 @@
return;
}
if ($(ds_id).validate()) {
debugger;
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
return;
if('${/model/wfl_status/record/@mar_status}' == 'Y'){
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){
Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
return;
}
}
// if(record.get('division')=='92'&&record.get('write_off_amount')<record.get('customer_margin')){
// Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租');
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ 0937edf5
......@@ -207,7 +207,7 @@
<a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" bindTarget="contract_sales_report_ds" prompt="其它"/>
<a:checkBox name="lease_name91" bindTarget="contract_sales_report_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京卡家"/>
<a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/>
</a:form>
<a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">
......
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @ 0937edf5
......@@ -126,7 +126,11 @@
//add by gzj 2022-12-23 北京卡家
||record_data.templet_code =='CON_COLLECTION_PAYMENT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ_1'||record_data.templet_code =='CSH_PAYMENT_REQ_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_SURE'
||record_data.templet_code =='CSH_PAYMENT_REQ_KJ_1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_KJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ_FR'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_KJ'
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ') {
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_KJ'||record_data.templet_code =='LEASE_CONTRACT_PAR_KJ'||record_data.templet_code =='PERSONAL_CREDIT_KJ'||record_data.templet_code =='ENTERPRISE_CREDIT_KJ'
//add by 18938
||record_data.templet_code == 'BUSINESS_CONTRACT_XN' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN2' || record_data.templet_code == 'LEASE_CONTRACT_PAR_XN' || record_data.templet_code == 'DOWN_PAYMENT_OFFSET'
||record_data.templet_code == 'FINANCE_LEASEBACK_CONTRACT_XN' || record_data.templet_code == 'LEASE_ORDER_XN' || record_data.templet_code == 'LEASE_ORDER_XN2' || record_data.templet_code == 'FINANCE_LEASE_CONTRACT_XN'
||record_data.templet_code == 'CON_CONTRACT_MORTGAGE_XN') {
// word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
......
src/main/webapp/modules/cont/CON620/con_contract_account_detail.lview
View file @ 0937edf5
......@@ -19,6 +19,19 @@
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function() {
if("${/parameter/@division}"=='70' || "${/parameter/@division}"=='92' ){
if(document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER")){
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none";
}
}else {
if (document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70")) {
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70").style.display = "none";
}
}
});
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview
View file @ 0937edf5
......@@ -211,14 +211,23 @@
if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "";
document.getElementById("CON_DUE_DETAIL_user_button5").style.display = "";
} else {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "none";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "none";
document.getElementById("CON_DUE_DETAIL_user_button5").style.display = "none";
}
}
if("${/parameter/@division}"=='70' || "${/parameter/@division}"=='92' ){
if(document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER")){
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none";
}
}else {
if (document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70")) {
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER_70").style.display = "none";
}
}
});
//新增催款函pdf打印（盖章）
......
src/main/webapp/modules/cont/CON620/create_content_for_collection_signatures.lsc
View file @ 0937edf5
......@@ -55,8 +55,10 @@
m = m < 10 ? "0" + m : m;
d = now.getDate();
d = d < 10 ? "0" + d : d;
for (var i = 0;i < from_file_data.length;i++) {
var to_file_path = (sys_file_path + y + "\/" + m + "\/").toString();
FileUtils.forceMkdir(new File(to_file_path)); //根据日期创建目录
for (var i = 0;i < from_file_data.length;i++) {
//var to_file_path = (sys_file_path + y + "\/" + m + "\/").toString();
var record_data = from_file_data[i];
var to_file_name = record_data.to_file_name;
......
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 0937edf5
......@@ -4,6 +4,7 @@
<a:init-procedure>
<a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}"
model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
</a:init-procedure>
<a:view>
<!-- <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
......@@ -52,6 +53,16 @@
$(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(ds_con_id).query();
}
if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
}
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
});
function open_contract_win(ds_id, record_id) {
......@@ -876,6 +887,17 @@
$(ds_id).query();
}
}
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number');
}else {
$(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70');
}
};
};
//选择事件(grid,attach,gridbox,table)
/*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) {
......
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ 0937edf5
......@@ -205,7 +205,7 @@
<a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
<a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京卡家"/>
<a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ 0937edf5
......@@ -519,9 +519,20 @@
});
});
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, qpara, bp_seq) {
};
//加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){
$(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number');
}else {
$(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70');
}
};
}
//图片渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
var result = name.match(/(.*)_pic$/);
......
src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
View file @ 0937edf5
......@@ -5,9 +5,10 @@
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure>
<a:view>
<a:link id="csh_payment_req_create_link" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_selected.lview"/>
<a:link id="csh_payment_req_history_print_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<a:link id="csh_payment_req_history_word_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_word_print.lsc"/>
<a:link id="csh_payment_req_create_link"
url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_selected.lview"/>
<a:link id="csh_payment_req_history_print_link_id"
url="${/request/@context_path}/modules/csh/CSH501/csh_payment_req_history_pdf_print.lsc"/>
<a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="tre_loan_contact_cancel_change_link_id" model="lon.LON120.tre_loan_change_cancel"
modelaction="update"/>
......@@ -17,7 +18,7 @@
<script type="text/javascript"><![CDATA[
Leaf.onReady(function () {
//付款打印按钮只有会计担当和会计部长可见
if ("${/model/role_info/record/@role_code}" != "0013" && "${/model/role_info/record/@role_code}" != "0014" && "${/model/role_info/record/@role_code}" != "0010"&& "${/model/role_info/record/@role_code}" != "0006") {
if ("${/model/role_info/record/@role_code}" != "0013" && "${/model/role_info/record/@role_code}" != "0014" && "${/model/role_info/record/@role_code}" != "0010") {
//$('${/parameter/@layout_code}_user_button5').style.display='none';
Ext.fly('${/parameter/@layout_code}_user_button5').dom.style.display = "none";
} else {
......@@ -36,22 +37,11 @@
//获取该付款申请的头id
var payment_req_id = records[0].get('payment_req_id');
var payment_status = records[0].get('approval_status');
var division = records[0].get('con_division');
if (payment_status != "APPROVED") {
$L.showInfoMessage("提示", '只有审批通过的付款申请才能打印,且一次只能打印一个付款申请!');
return;
}
// var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
// window.open(href = url_l, target = "_self");
if(division == '30' || division == '50'){
var url_l = $('csh_payment_req_history_word_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
}else{
var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
}
var url_l = $('csh_payment_req_history_print_link_id').getUrl() + '?document_id=' + payment_req_id + '&document_table=CSH_PAYMENT_APPROVE&file_path=${/parameter/@file_path}&batch_flag=Y&source_type=COMMON';
window.open(href = url_l, target = "_self");
};
......@@ -227,6 +217,8 @@
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var param = {};
param['payment_req_id'] = record.get('payment_req_id');
param['document_category'] = record.get('document_category');
......@@ -239,12 +231,13 @@
param['approval_status'] = record.get('approval_status');
param['con_business_type'] = record.get('con_business_type');
param['division'] = record.get('division');
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
if (record.get('business_type') == 'PAYMENT') {
param['function_code'] = 'CSH501D';
} else if (record.get('business_type') == 'PREPAYMENT') {
param['function_code'] = 'CSH501_PRE_D';
}
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D';
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @ 0937edf5
......@@ -129,6 +129,9 @@
param['product_type_n'] = record.get('product_type_n');
param['product_name_write'] = record.get('product_name_write');
}
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
param['is_buyout'] = record.get('is_buyout');
param['winid'] = 'csh501_csh_payment_req_link_winid';
param['url_title'] = '付款申请';
hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ 0937edf5
......@@ -30,6 +30,8 @@
<!-- <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_import.lview"/>-->
<a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
<a:link id="csh_margin_check_id" url="${/request/@context_path}/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview"/>
<a:link id="hls_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Leaf.onReady(function(){
//console.log($('csh_transaction_receipt_maintain_result_ds'));
......@@ -487,8 +489,16 @@
function csh510_export() {
$('csh_transaction_receipt_maintain_grid_ds')._export(null,'收款维护');
}
function csh531_margin_check() {
var param={};
param['function_code']= 'CSH531F3';
param['function_usage'] = 'MODIFY';
param['url_title']='控制茂甲保证金校验';
hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets>
<a:dataSet id="confirmed_flag_ds">
<a:datas>
......@@ -711,6 +721,7 @@
<a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/>
<!-- <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>-->
<a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>
<!-- <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
<!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->
</a:screenTopToolbar>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ 0937edf5
......@@ -148,7 +148,9 @@
</a:fields>
</a:dataSet>
<a:dataSet id="csh_lov_con_contract_ds" selectable="true" autoQuery="true" selectionModel="single"
model="csh.CSH531N.con_contract" queryDataSet="csh_query_con_ds">
model="csh.CSH531N.con_contract"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.con_contract/query?deposit_flag=${/parameter/@deposit_flag}&amp;transaction_date=${/parameter/@transaction_date}"
queryDataSet="csh_query_con_ds">
<a:events>
<a:event name="indexchange" handler="indexChangeFunction"/>
</a:events>
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_create.lview
View file @ 0937edf5
......@@ -87,7 +87,7 @@
if (!header_ds_record.get('post_gl_status')){
header_ds_record.set('post_gl_status', 'N');
}
header_ds_record.set('reversed_flag', 'N');
//header_ds_record.set('reversed_flag', 'N');
// if (name = 'document_type') {
// Leaf.request({
// url: $('get_document_type_id').getUrl(),
......
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