Commit 69ea79a9 authored by panhong18943's avatar panhong18943

Merge branch 'remote_uat' of https://hel.hand-china.com/hlcm/leaf-hlcm into remote_uat

parents 31bf50ad ef3b1a59
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/> <bm:parameter name="sum_unreceived_principal" dataType="java.lang.Double" input="false" output="true" outputPath="@sum_unreceived_principal"/>
<bm:parameter name="fund_possession_rate" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_rate"/> <bm:parameter name="fund_possession_rate" dataType="java.lang.Double" input="false" output="true" outputPath="@fund_possession_rate"/>
<bm:parameter name="last_rent_due_date" dataType="date" input="false" output="true" outputPath="@last_rent_due_date"/> <bm:parameter name="last_rent_due_date" dataType="date" input="false" output="true" outputPath="@last_rent_due_date"/>
<bm:parameter name="asset_possession_cost" dataType="java.lang.Double" input="false" output="true" outputPath="@asset_possession_cost"/>
</bm:parameters> </bm:parameters>
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
BEGIN BEGIN
...@@ -30,8 +31,9 @@ ...@@ -30,8 +31,9 @@
p_sum_unreceived_principal => ${@sum_unreceived_principal}, p_sum_unreceived_principal => ${@sum_unreceived_principal},
p_fund_possession_rate=>${@fund_possession_rate}, p_fund_possession_rate=>${@fund_possession_rate},
p_last_rent_due_date=>${@last_rent_due_date}, p_last_rent_due_date=>${@last_rent_due_date},
p_asset_possession_cost => ${@asset_possession_cost},
p_residual_value=>${@residual_value}, p_residual_value=>${@residual_value},
p_deposit_deduction=>${@deposit_deduction}, p_deposit_deduction=>${@deposit_deduction},
p_user_id => ${/session/@user_id}); p_user_id => ${/session/@user_id});
END; END;
]]> ]]>
......
<?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 nvl(hd.hd_user_col_v06, 'N') hd_user_col_v06
from con_contract cc, hls_fin_calculator_hd hd
where cc.calc_session_id = hd.calc_session_id
and cc.contract_id =${/parameter/@contract_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-17 下午02:12:40
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[select t.column_code,
lower(t.column_name) column_name,
t.prompt,
t.price_list,
hls_fin_calculator_save_pkg.calc_hls_fin_value(nvl(${@calc_session_id},-999),
${@price_list},
t.column_name,
t.percent,
t.validation_type) column_value_c,
hls_fin_calculator_save_pkg.get_default_value_name(${@calc_session_id},t.price_list,t.column_name,t.layout_area_seq,${/session/@user_id},${/session/@session_id}) column_value,
t.percent,
t.validation_type,
t.validation_sql,
t.layout_area_seq,
t.input_mode,
decode(t.input_mode, 'REQUIRED', 'TRUE', 'FALSE') required_input_mode,
(case when ${@maintain_type}='READONLY' then
'TRUE'
else
decode(t.input_mode, 'READONLY', 'TRUE', 'FALSE')
end) readonly_input_mode,
nvl(t.allow_format,'FALSE') allow_format,
nvl(t.allow_decimal,'FALSE') allow_decimal,
nvl(t.zero_fill,'FALSE') zero_fill,
nvl(t.precision,2) precision,
t.alignment,
nvl(p.show_column_code,'N') show_column_code,
decode(p.show_column_code,'N',258,298) grid_left_width,
decode(p.show_column_code,'N',280,345) grid_margin_width,
decode(${/parameter/@calc_type},'CLASSIC_CALCULATOR',110,60) margin_height,
nvl(t.display_flag,'N') display_flag,
nvl(t.enabled_flag,'N') enabled_flag,
nvl(p.field_width,120) field_width,
nvl(p.margin_top,3) margin_top,
nvl(t.lov_return_vcode,'N') lov_return_vcode,
decode(${/session/@lov_search_rule},'AUTOCOMPLETE','true','false') autocomplete,
decode(${/session/@lov_search_rule},'FETCHSINGLE','true','false') fetchsingle,
(case when t.validation_type in ('TEXTFIELD','TEXTAREA') then
decode(sys_parameter_pkg.value('SYS_GRID_SHOW_TITLE',${/session/@user_id},${/session/@role_id},${/session/@company_id}),'Y','true','false')
else 'false'
end) sys_grid_show_title,
p.description price_list_name,
p.calc_method,
(select sv.code_value_name from sys_code_values_v sv where sv.code='HLS050.HLS_PRICE_LIST.CALC_METHOD' and sv.code_value=p.calc_method) calc_method_name,
lower(t.lov_cascade_para1) lov_cascade_para1,
lower(t.lov_cascade_para2) lov_cascade_para2,
lower(t.lov_cascade_para3) lov_cascade_para3,
t.lower_limit,
t.upper_limit,
(select h.source_doc_category from hls_fin_calculator_hd h where h.calc_session_id = ${@calc_session_id} )source_doc_category
from hls_fin_calc_config t,hls_price_list p
#WHERE_CLAUSE#
order by t.display_order,t.column_name
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="source_doc_category" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_CODE"/>
<bm:field name="column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_NAME"/>
<bm:field name="prompt" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROMPT"/>
<bm:field name="price_list" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRICE_LIST"/>
<bm:field name="column_value" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_VALUE"/>
<bm:field name="column_value_c" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_VALUE_C"/>
<bm:field name="percent" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERCENT"/>
<bm:field name="validation_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VALIDATION_TYPE"/>
<bm:field name="validation_sql" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VALIDATION_SQL"/>
<bm:field name="layout_area_seq" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LAYOUT_AREA_SEQ"/>
<bm:field name="input_mode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INPUT_MODE"/>
<bm:field name="required_input_mode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="REQUIRED_INPUT_MODE"/>
<bm:field name="readonly_input_mode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="READONLY_INPUT_MODE"/>
<bm:field name="allow_format" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALLOW_FORMAT"/>
<bm:field name="allow_decimal" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALLOW_DECIMAL"/>
<bm:field name="zero_fill" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ZERO_FILL"/>
<bm:field name="precision" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PRECISION"/>
<bm:field name="alignment" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALIGNMENT"/>
<bm:field name="show_column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_COLUMN_CODE"/>
<bm:field name="display_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISPLAY_FLAG"/>
<bm:field name="field_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="FIELD_WIDTH"/>
<bm:field name="margin_top" databaseType="NUMBER" datatype="java.lang.Long" physicalName="MARGIN_TOP"/>
<bm:field name="lov_return_vcode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOV_RETURN_VCODE"/>
<bm:field name="grid_left_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="GRID_LEFT_WIDTH"/>
<bm:field name="grid_margin_width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="GRID_MARGIN_WIDTH"/>
<bm:field name="margin_height" databaseType="NUMBER" datatype="java.lang.Long" physicalName="MARGIN_HEIGHT"/>
<bm:field name="autocomplete" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="AUTOCOMPLETE"/>
<bm:field name="fetchsingle" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FETCHSINGLE"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
<bm:field name="sys_grid_show_title" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SYS_GRID_SHOW_TITLE"/>
<bm:field name="price_list_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRICE_LIST_NAME"/>
<bm:field name="calc_method" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CALC_METHOD"/>
<bm:field name="calc_method_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CALC_METHOD_NAME"/>
<bm:field name="lov_cascade_para1" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOV_CASCADE_PARA1"/>
<bm:field name="lov_cascade_para2" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOV_CASCADE_PARA2"/>
<bm:field name="lov_cascade_para3" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOV_CASCADE_PARA3"/>
<bm:field name="lower_limit" databaseType="NUMBER" datatype="java.lang.Double" physicalName="LOWER_LIMIT"/>
<bm:field name="upper_limit" databaseType="NUMBER" datatype="java.lang.Double" physicalName="UPPER_LIMIT"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="enabled_flag" queryExpression="t.enabled_flag=${@enabled_flag}"/>
<bm:query-field field="display_flag" queryExpression="(t.display_flag=${@display_flag} or (t.display_flag=&apos;C&apos; and exists(select 1 from hls_fin_calc_config_quote q where q.calc_session_id=${@calc_session_id} and q.layout_area_seq=t.layout_area_seq and q.column_name=t.column_name and q.display_flag=&apos;Y&apos;)))"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="(t.layout_area_seq = &apos;H&apos; and t.price_list=p.price_list and t.price_list = nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})))"/>
<bm:data-filter enforceOperations="query" expression=" (t.column_name not in('BTB_INT_RATE') )"></bm:data-filter>
</bm:data-filters>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-18 下午05:30:04
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[select d.column_code,
lower(d.column_name) column_name,
d.column_name upper_column_name,
d.prompt,
d.data_type,
d.validation_type,
d.validation_sql,
d.input_mode,
d.display_order,
decode(sign(d.display_order), '-1', 'true', '1', 'false', 'false') lock_column,
d.price_list,
d.layout_area_seq,
d.precision,
d.allow_format,
d.allow_decimal,
d.zero_fill,
d.default_value,
d.alignment,
d.lov_return_vcode,
nvl(d.width,100) width,
nvl(p.show_column_code,'N') show_column_code,
(case when d.validation_type in ('TEXTFIELD','TEXTAREA') then
decode(sys_parameter_pkg.value('SYS_GRID_SHOW_TITLE',${/session/@user_id},${/session/@role_id},${/session/@company_id}),'Y','true','false')
else 'false'
end) sys_grid_show_title,
sys_parameter_pkg.value('SYS_GRID_COL_UNDERLINE',${/session/@user_id},${/session/@role_id},${/session/@company_id}) sys_grid_col_underline,
d.enabled_flag,
nvl((select q.display_flag from hls_fin_calc_config_quote q
where q.calc_session_id=${@calc_session_id} and q.layout_area_seq='L' and q.column_name=d.column_name),d.display_flag) display_flag,
d.lower_limit,
d.upper_limit
from hls_fin_calc_config d,hls_price_list p
#WHERE_CLAUSE#
order by d.display_order,d.column_name
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_CODE" required="true"/>
<bm:field name="column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COLUMN_NAME" required="true"/>
<bm:field name="upper_column_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="UPPER_COLUMN_NAME" required="true"/>
<bm:field name="prompt" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROMPT"/>
<bm:field name="data_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DATA_TYPE"/>
<bm:field name="validation_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VALIDATION_TYPE"/>
<bm:field name="validation_sql" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VALIDATION_SQL"/>
<bm:field name="input_mode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INPUT_MODE"/>
<bm:field name="display_order" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISPLAY_ORDER"/>
<bm:field name="lock_column" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOCK_COLUMN"/>
<bm:field name="price_list" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRICE_LIST" required="true"/>
<bm:field name="layout_area_seq" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LAYOUT_AREA_SEQ" required="true"/>
<bm:field name="precision" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PRECISION"/>
<bm:field name="allow_format" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALLOW_FORMAT"/>
<bm:field name="allow_decimal" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALLOW_DECIMAL"/>
<bm:field name="default_value" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DEFAULT_VALUE"/>
<bm:field name="alignment" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ALIGNMENT"/>
<bm:field name="width" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WIDTH"/>
<bm:field name="show_column_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="show_column_code"/>
<bm:field name="zero_fill" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ZERO_FILL"/>
<bm:field name="lov_return_vcode" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LOV_RETURN_VCODE"/>
<bm:field name="sys_grid_show_title" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SYS_GRID_SHOW_TITLE"/>
<bm:field name="sys_grid_col_underline" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SYS_GRID_COL_UNDERLINE"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
<bm:field name="display_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISPLAY_FLAG"/>
<bm:field name="lower_limit" databaseType="NUMBER" datatype="java.lang.Double" physicalName="LOWER_LIMIT"/>
<bm:field name="upper_limit" databaseType="NUMBER" datatype="java.lang.Double" physicalName="UPPER_LIMIT"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="enabled_flag" queryExpression="d.enabled_flag=${@enabled_flag}"/>
<bm:query-field field="display_flag" queryExpression="d.display_flag=${@display_flag}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(d.price_list =nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})) and d.layout_area_seq = &apos;L&apos; and lower(d.column_name)=nvl(${@column_name},lower(d.column_name)) and d.price_list=p.price_list)"/>
<bm:data-filter enforceOperations="query" expression=" (d.column_name not in('BTB_INTEREST','BTB_FEE') )"></bm:data-filter>
</bm:data-filters>
</bm:model>
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
AND f.write_off_flag <> 'FULL' AND f.write_off_flag <> 'FULL'
AND f.cf_status IN ('RELEASE', 'BLOCK') AND f.cf_status IN ('RELEASE', 'BLOCK')
AND f.cf_direction = 'OUTFLOW' AND f.cf_direction = 'OUTFLOW'
and t.business_type<>'LEASEOPERAT'
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 SELECT 1
FROM csh_payment_req_ln l,csh_payment_req_hd hd FROM csh_payment_req_ln l,csh_payment_req_hd hd
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhuxianfei
$Date: 2018/7/26 14:11
$Revision: 1.0
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_payment_asset_req_pkg.req_acp_import(p_invoice_type => ${@invoice_type},
p_invoice_code => ${@invoice_code},
p_invoice_number=> ${@invoice_number},
p_net_amount => ${@net_amount},
p_invoice_date => ${@invoice_date},
p_payment_req_id => ${@payment_req_id},
p_user_id => ${/session/@user_id}
);
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024/1/26 14:11
$Revision: 1.0
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_payment_asset_req_pkg.req_acp_import_total(
p_invoice_type => ${@invoice_type},
p_invoice_code => ${@invoice_code},
p_invoice_number => ${@invoice_number},
p_total_amount => ${@total_amount},
p_invoice_date => ${@invoice_date},
p_payment_req_id => ${@payment_req_id},
p_user_id => ${/session/@user_id}
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-1-19 上午11:15:04
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_payment_asset_req_pkg.payment_asset_submit
(
p_payment_req_id=>${@payment_req_id},
p_user_id=>${/session/@user_id}
);
end;]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: qwm $Author: qwm
$Date: 2013-5-30 下午02:30:47 $Date: 2013-5-30 下午02:30:47
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:s="leaf.plugin.script">
<bm:operations> <bm:operations>
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
WHERE cc.contract_id = h.contract_id WHERE cc.contract_id = h.contract_id
AND cc.data_class = 'NORMAL' AND cc.data_class = 'NORMAL'
AND cc.contract_status = 'CLOSED') AND cc.contract_status = 'CLOSED')
AND NOT EXISTS (SELECT 1
FROM con_contract cc
WHERE cc.contract_id = h.contract_id
AND cc.division = '95')
AND t.returned_flag = 'NOT' AND t.returned_flag = 'NOT'
AND EXISTS AND EXISTS
(SELECT 1 (SELECT 1
...@@ -55,9 +59,14 @@ ...@@ -55,9 +59,14 @@
FROM csh_payment_req_ln l FROM csh_payment_req_ln l
WHERE l.payment_req_id = h.payment_req_id WHERE l.payment_req_id = h.payment_req_id
AND rownum = 1) AND rownum = 1)
--AND )
--cc.cf_item = '52' and not exists(select 1
)) v #WHERE_CLAUSE# from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf
where l.payment_req_id = h.payment_req_id
and l.ref_doc_category = 'CONTRACT'
and l.ref_doc_id = cc.contract_id
and l.ref_doc_line_id = cf.cashflow_id
and cf.cf_item in ('40'))) v #WHERE_CLAUSE#
ORDER BY transaction_date DESC, transaction_num ORDER BY transaction_date DESC, transaction_num
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
<bm:field name="paid_byother_flag" /> <bm:field name="paid_byother_flag" />
<bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" /> <bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" />
<bm:field name="guarantor_name_duty" /> <bm:field name="guarantor_name_duty" />
<bm:field name="operat_flag" />
</bm:fields> </bm:fields>
......
...@@ -180,6 +180,6 @@ ...@@ -180,6 +180,6 @@
<bm:data-filter name="query" expression="(t1.returned_flag = 'NOT')"/> <bm:data-filter name="query" expression="(t1.returned_flag = 'NOT')"/>
<bm:data-filter name="query" expression="(t1.write_off_flag = 'NOT')"/> <bm:data-filter name="query" expression="(t1.write_off_flag = 'NOT')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED'))"/> <bm:data-filter name="query" expression="(t1.confirmed_flag in ('ACCAUDITED','APPROVED','WF_REJECTED'))"/>
<bm:data-filter name="query" expression="((t1.transaction_type = 'DEPOSIT' and t1.ref_contract_id is null) or (t1.collection_classes = 'REFUND' and t1.ref_contract_id is null and t1.source_csh_trx_id is null ) or (t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and nvl(t1.collection_classes,'NON') != 'REFUND'))"/> <bm:data-filter name="query" expression="((t1.transaction_type = 'DEPOSIT' and t1.ref_contract_id is null) or (t1.collection_classes = 'REFUND' and t1.ref_contract_id is null and t1.source_csh_trx_id is null ) or (t1.transaction_type in ('RECEIPT') and nvl(t1.collection_classes,'NON') != 'REFUND'))"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
\ No newline at end of file
...@@ -108,17 +108,64 @@ ...@@ -108,17 +108,64 @@
<bm:field name="acc_confirmed_by"/> <bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/> <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/> <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="deposit_trans_type"/> <bm:field name="deposit_trans_type" expression="decode(t1.ref_contract_id,
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/> null,
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/> decode(t1.collection_classes,
'OPERAT_DEPOSIT',
'vender_deposit',
t1.deposit_trans_type),
t1.deposit_trans_type)" forInsert="false" forUpdate="false" />
<bm:field name="deposit_trans_type_desc" expression="decode(t1.ref_contract_id,
null,
decode(t1.collection_classes,
'OPERAT_DEPOSIT',
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = 'vender_deposit'),
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = t1.deposit_trans_type)),
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = t1.deposit_trans_type))" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/> <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="source_type"/> <bm:field name="source_type"/>
<bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/> <bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
<bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/> <bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/> <bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
<bm:field name="business_type" expression="(select cc.business_type from con_contract cc where cc.contract_id = t1.ref_contract_id)"/> <bm:field name="business_type" expression=" decode(t1.ref_contract_id,
<bm:field name="business_type_desc" expression="(select hb.description from con_contract cc,hls_business_type_v hb where cc.business_type= hb.business_type and hb.enabled_flag = 'Y' and cc.contract_id = t1.ref_contract_id)"/> null,
</bm:fields> decode(t1.collection_classes,
'OPERAT_DEPOSIT',
'LEASEOPERAT',
(select cc.business_type
from con_contract cc
where cc.contract_id = t1.ref_contract_id)),
(select cc.business_type
from con_contract cc
where cc.contract_id = t1.ref_contract_id))"/>
<bm:field name="business_type_desc" expression="decode(t1.ref_contract_id,
null,
decode(t1.collection_classes,
'OPERAT_DEPOSIT',
(select ht.description
from hls_business_type ht
where ht.business_type = 'LEASEOPERAT'),
(select hb.description
from con_contract cc, hls_business_type_v hb
where cc.business_type = hb.business_type
and hb.enabled_flag = 'Y'
and cc.contract_id = t1.ref_contract_id)),
(select hb.description
from con_contract cc, hls_business_type_v hb
where cc.business_type = hb.business_type
and hb.enabled_flag = 'Y'
and cc.contract_id = t1.ref_contract_id))"/>
</bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
</bm:features> </bm:features>
...@@ -210,5 +257,5 @@ ...@@ -210,5 +257,5 @@
<bm:query-field name="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/> <bm:query-field name="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/> <bm:query-field name="vender_project_number" queryExpression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@business_type}||&apos;%&apos;"/> <bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2023-12-21 14:30:34
$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
hls_bp_master_credit_pkg.saved_credit_status(
p_bp_credit_hd_id =>${@bp_credit_hd_id},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
<bm:operation name="execute"> <bm:operation name="execute">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
hls_monthend_new_pkg.csh_check_acr(p_user_id => ${/session/@user_id},p_err_msg=> ${@p_err_msg}); hls_monthend_new_pkg.csh_check_acr(p_csh_date => ${@csh_date},p_user_id => ${/session/@user_id},p_err_msg=> ${@p_err_msg});
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
<bm:parameters> <bm:parameters>
<bm:parameter name="p_err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@p_err_msg"/> <bm:parameter name="p_err_msg" dataType="java.lang.String" input="false" output="true" outputPath="@p_err_msg"/>
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
10413, 10413,
'NO', 'NO',
(Select decode(t.role_code, (Select decode(t.role_code,
'0009', '0009',
'NO',
'0038',
'NO', 'NO',
'0014', '0014',
'YES', 'YES',
......
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
(SELECT ccli.modelcd (SELECT ccli.modelcd
FROM con_contract_lease_item ccli FROM con_contract_lease_item ccli
WHERE ccli.contract_id = WHERE ccli.contract_id =
ct.contract_id) modelcd, ct.contract_id
AND ccli.equipment_type ='MAIN') modelcd,
--机型 --机型
(SELECT nvl(i.machine_number,i.machine_number_70) (SELECT nvl(i.machine_number,i.machine_number_70)
FROM con_contract_lease_item i FROM con_contract_lease_item i
...@@ -785,6 +787,7 @@ ...@@ -785,6 +787,7 @@
FROM con_contract ct FROM con_contract ct
WHERE ct.contract_status NOT IN ('CANCEL') WHERE ct.contract_status NOT IN ('CANCEL')
AND ct.data_class = 'NORMAL' AND ct.data_class = 'NORMAL'
and ct.document_type not in('PUR_ORDER')
ORDER BY ct.bp_id_agent_level1 ORDER BY ct.bp_id_agent_level1
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
...@@ -270,10 +270,10 @@ SELECT h.period_year, ...@@ -270,10 +270,10 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr!=0 and h.total_amount_dr!=0
and ga.account_id=l.account_id and ga.account_id=l.account_id
and ga.account_code in('2221001020','2221001023','2221001024') and ga.account_code in('2221001020','2221001023','2221001024','2221001026')
and h.reversed_flag='N' and h.reversed_flag='N'
and h.internal_period_num=to_number(${@base_period}) and h.internal_period_num=to_number(${@base_period})
And (h.je_transaction_code ='HL_SALES_TAX_ACT_NEW' ) And (h.je_transaction_code in ('HL_SALES_TAX_ACT_NEW','FIN_INCOME_RECOGNITION_OP') )
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd')))) and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
union union
SELECT h.period_year, SELECT h.period_year,
...@@ -329,7 +329,7 @@ SELECT h.period_year, ...@@ -329,7 +329,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end due_amount, end due_amount,
null principal, null principal,
...@@ -353,7 +353,7 @@ SELECT h.period_year, ...@@ -353,7 +353,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end interest, end interest,
round(l.amount_cr - round(l.amount_cr -
...@@ -380,7 +380,7 @@ SELECT h.period_year, ...@@ -380,7 +380,7 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023','2221001024') and ga.account_code in ('2221001020', '2221001023','2221001024','2221001026')
and h.reversed_flag = 'N' and h.reversed_flag = 'N'
and h.internal_period_num = to_number(${@base_period}) and h.internal_period_num = to_number(${@base_period})
And (h.je_transaction_code = And (h.je_transaction_code =
......
...@@ -163,10 +163,10 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month, ...@@ -163,10 +163,10 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023', '2221001024') and ga.account_code in ('2221001020', '2221001023', '2221001024','2221001026')
and h.reversed_flag = 'N' and h.post_gl_status = 'Y' and h.reversed_flag = 'N' and h.post_gl_status = 'Y'
and h.internal_period_num <= to_number(${@base_period}) and h.internal_period_num <= to_number(${@base_period})
AND (h.je_transaction_code = 'HL_SALES_TAX_ACT_NEW') AND (h.je_transaction_code in ('HL_SALES_TAX_ACT_NEW','FIN_INCOME_RECOGNITION_OP'))
and ((trunc(h.journal_date) <= and ((trunc(h.journal_date) <=
trunc(to_date('2020-01-31', 'yyyy-mm-dd')) and trunc(to_date('2020-01-31', 'yyyy-mm-dd')) and
h.description = 'MANUAL_IMPORT') or h.description = 'MANUAL_IMPORT') or
...@@ -240,7 +240,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month, ...@@ -240,7 +240,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end due_amount, end due_amount,
null principal, null principal,
...@@ -283,7 +283,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month, ...@@ -283,7 +283,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end interest, end interest,
round(l.amount_cr, round(l.amount_cr,
...@@ -309,7 +309,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month, ...@@ -309,7 +309,7 @@ SELECT to_char(add_months(trunc(t1.journal_date, 'Q'), 2), 'yyyymm') tax_month,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023', '2221001024') and ga.account_code in ('2221001020', '2221001023', '2221001024','2221001026')
and h.reversed_flag = 'N' and h.post_gl_status = 'Y' and h.reversed_flag = 'N' and h.post_gl_status = 'Y'
and h.internal_period_num <= to_number(${@base_period}) and h.internal_period_num <= to_number(${@base_period})
And (h.je_transaction_code = 'HL_CSH_CONSOLIDATION_DALAY' or And (h.je_transaction_code = 'HL_CSH_CONSOLIDATION_DALAY' or
...@@ -735,7 +735,7 @@ SELECT h.period_year, ...@@ -735,7 +735,7 @@ SELECT h.period_year,
--and h.total_amount_dr != 0 --and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
--and l.line_description like '%留购金%' --and l.line_description like '%留购金%'
and ga.account_code in ('2221001020', '2221001023', '2221001024') and ga.account_code in ('2221001020', '2221001023', '2221001024','2221001026')
and h.reversed_flag = 'N' and h.post_gl_status = 'Y' and h.reversed_flag = 'N' and h.post_gl_status = 'Y'
and h.internal_period_num <= to_number(${@base_period}) and h.internal_period_num <= to_number(${@base_period})
And exists And exists
...@@ -1030,7 +1030,7 @@ select tax_month, ...@@ -1030,7 +1030,7 @@ select tax_month,
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="(t1.amount_tax > 0 or t1.fixed_data_flag='Y')"/>--> <!-- <bm:data-filter enforceOperations="query" expression="(t1.amount_tax > 0 or t1.fixed_data_flag='Y')"/>-->
<bm:data-filter enforceOperations="query" expression="(exists(select 1 from con_contract cc where cc.contract_number=t1.contract_number and cc.contract_status!='CANCEL' and cc.data_class='NORMAL') or t1.fixed_data_flag='Y')"/> <bm:data-filter enforceOperations="query" expression="(exists(select 1 from con_contract cc where cc.contract_number=t1.contract_number and cc.contract_status!='CANCEL' and cc.data_class='NORMAL') or t1.fixed_data_flag='Y')"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
......
...@@ -279,10 +279,10 @@ SELECT h.period_year, ...@@ -279,10 +279,10 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr!=0 and h.total_amount_dr!=0
and ga.account_id=l.account_id and ga.account_id=l.account_id
and ga.account_code in('2221001020','2221001023','2221001024') and ga.account_code in('2221001020','2221001023','2221001024','2221001026')
and h.reversed_flag='N' and h.reversed_flag='N'
and h.internal_period_num<to_number(${@base_period}) and h.internal_period_num<to_number(${@base_period})
AND (h.je_transaction_code= 'HL_SALES_TAX_ACT_NEW') AND (h.je_transaction_code in( 'HL_SALES_TAX_ACT_NEW','FIN_INCOME_RECOGNITION_OP'))
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd')))) and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
AND ( not EXISTS (SELECT 1 AND ( not EXISTS (SELECT 1
FROM acr_invoice_hd hi, acr_invoice_ln li FROM acr_invoice_hd hi, acr_invoice_ln li
...@@ -357,7 +357,7 @@ SELECT h.period_year, ...@@ -357,7 +357,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end due_amount, end due_amount,
null principal, null principal,
...@@ -381,7 +381,7 @@ SELECT h.period_year, ...@@ -381,7 +381,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end interest, end interest,
round(l.amount_cr - round(l.amount_cr -
...@@ -409,7 +409,7 @@ SELECT h.period_year, ...@@ -409,7 +409,7 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023','2221001024') and ga.account_code in ('2221001020', '2221001023','2221001024','2221001026')
and h.reversed_flag = 'N' and h.reversed_flag = 'N'
and h.internal_period_num < to_number(${@base_period}) and h.internal_period_num < to_number(${@base_period})
And (h.je_transaction_code = And (h.je_transaction_code =
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
SELECT t.contract_id, SELECT t.contract_id,
t.invoice_hd_id, t.invoice_hd_id,
t.invoice_line_id, t.invoice_line_id,
t.invoice_kind,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code = 'ACR510_INVOICE_KIND' WHERE v.code = 'ACR510_INVOICE_KIND'
......
...@@ -271,11 +271,11 @@ SELECT h.period_year, ...@@ -271,11 +271,11 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr!=0 and h.total_amount_dr!=0
and ga.account_id=l.account_id and ga.account_id=l.account_id
and ga.account_code in('2221001020','2221001023','2221001024') and ga.account_code in('2221001020','2221001023','2221001024','2221001026')
and h.reversed_flag='N' and h.reversed_flag='N'
and h.internal_period_num<=to_number(${@end_period}) and h.internal_period_num<=to_number(${@end_period})
and h.internal_period_num>=to_number(${@start_period}) and h.internal_period_num>=to_number(${@start_period})
And (h.je_transaction_code ='HL_SALES_TAX_ACT_NEW' ) And (h.je_transaction_code in ('HL_SALES_TAX_ACT_NEW','FIN_INCOME_RECOGNITION_OP') )
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd')))) and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
union union
SELECT h.period_year, SELECT h.period_year,
...@@ -336,7 +336,7 @@ SELECT h.period_year, ...@@ -336,7 +336,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end due_amount, end due_amount,
null principal, null principal,
...@@ -365,7 +365,7 @@ SELECT h.period_year, ...@@ -365,7 +365,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end interest, end interest,
round(l.amount_cr - round(l.amount_cr -
...@@ -392,7 +392,7 @@ SELECT h.period_year, ...@@ -392,7 +392,7 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023','2221001024') and ga.account_code in ('2221001020', '2221001023','2221001024','2221001026')
and h.reversed_flag = 'N' and h.reversed_flag = 'N'
and h.internal_period_num<=to_number(${@end_period}) and h.internal_period_num<=to_number(${@end_period})
and h.internal_period_num>=to_number(${@start_period}) and h.internal_period_num>=to_number(${@start_period})
......
...@@ -279,10 +279,10 @@ SELECT h.period_year, ...@@ -279,10 +279,10 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr!=0 and h.total_amount_dr!=0
and ga.account_id=l.account_id and ga.account_id=l.account_id
and ga.account_code in('2221001020','2221001023','2221001024') and ga.account_code in('2221001020','2221001023','2221001024','2221001026')
and h.reversed_flag='N' and h.reversed_flag='N'
and h.internal_period_num<to_number(${@start_period}) and h.internal_period_num<to_number(${@start_period})
AND (h.je_transaction_code= 'HL_SALES_TAX_ACT_NEW') AND (h.je_transaction_code in ('HL_SALES_TAX_ACT_NEW','FIN_INCOME_RECOGNITION_OP') )
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd')))) and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
AND ( not EXISTS (SELECT 1 AND ( not EXISTS (SELECT 1
FROM acr_invoice_hd hi, acr_invoice_ln li FROM acr_invoice_hd hi, acr_invoice_ln li
...@@ -363,7 +363,7 @@ SELECT h.period_year, ...@@ -363,7 +363,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end due_amount, end due_amount,
null principal, null principal,
...@@ -392,7 +392,7 @@ SELECT h.period_year, ...@@ -392,7 +392,7 @@ SELECT h.period_year,
(select 1 (select 1
from gld_accounts g from gld_accounts g
where g.account_id = d.account_id where g.account_id = d.account_id
and g.account_code in ('1122000001', '1122000002')) and g.account_code in ('1122000001', '1122000002','1122000005'))
and rownum = 1) and rownum = 1)
end interest, end interest,
round(l.amount_cr - round(l.amount_cr -
...@@ -424,7 +424,7 @@ SELECT h.period_year, ...@@ -424,7 +424,7 @@ SELECT h.period_year,
and h.sbo_num is not null and h.sbo_num is not null
and h.total_amount_dr != 0 and h.total_amount_dr != 0
and ga.account_id = l.account_id and ga.account_id = l.account_id
and ga.account_code in ('2221001020', '2221001023','2221001024') and ga.account_code in ('2221001020', '2221001023','2221001024','2221001026')
and h.reversed_flag = 'N' and h.reversed_flag = 'N'
and h.internal_period_num < to_number(${@start_period}) and h.internal_period_num < to_number(${@start_period})
And (h.je_transaction_code = And (h.je_transaction_code =
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
SELECT t.contract_id, SELECT t.contract_id,
t.invoice_hd_id, t.invoice_hd_id,
t.invoice_line_id, t.invoice_line_id,
t.invoice_kind,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code = 'ACR510_INVOICE_KIND' WHERE v.code = 'ACR510_INVOICE_KIND'
......
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
From prj_project pp, hls_bp_master hm From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id), And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit 'N') as is_constru_unit,
(select pp.division from prj_project pp where pp.wfl_instance_id=t1.instance_id) as division,
(select cc.division from csh_payment_req_hd crh,con_contract cc where crh.contract_id=cc.contract_id and crh.wfl_instance_id=t1.instance_id) payment_division
From zj_wfl_instance_node_rcpt_ht t1 From zj_wfl_instance_node_rcpt_ht t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
From prj_project pp, hls_bp_master hm From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id), And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit 'N') as is_constru_unit,
(select pp.division from prj_project pp where pp.wfl_instance_id=t1.instance_id) as division,
(select cc.division from csh_payment_req_hd crh,con_contract cc where crh.contract_id=cc.contract_id and crh.wfl_instance_id=t1.instance_id) payment_division
From zj_wfl_workflow_instance t1 From zj_wfl_workflow_instance t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
From prj_project pp, hls_bp_master hm From prj_project pp, hls_bp_master hm
Where pp.invoice_agent_id = hm.bp_id Where pp.invoice_agent_id = hm.bp_id
And pp.wfl_instance_id = t1.instance_id), And pp.wfl_instance_id = t1.instance_id),
'N') as is_constru_unit 'N') as is_constru_unit,
(select pp.division from prj_project pp where pp.wfl_instance_id=t1.instance_id) division,
(select cc.division from csh_payment_req_hd crh,con_contract cc where crh.contract_id=cc.contract_id and crh.wfl_instance_id=t1.instance_id) payment_division
From zj_wfl_instance_node_recipient t1 From zj_wfl_instance_node_recipient t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -5,7 +5,13 @@ ...@@ -5,7 +5,13 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
Select t1.*,replace(t1.service_url, Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview', 'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru 'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru,
replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_operat_wfl.lview') as service_url_operat,
replace(t1.service_url,
'modules/csh/CSH501/csh_payment_req.lview',
'modules/csh/CSH501/csh_payment_op_req.lview') as service_url_operat_payment
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id, From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type}, ${/parameter/@url_type},
${/session/@user_id}) as service_url,tt.* ${/session/@user_id}) as service_url,tt.*
......
...@@ -5,7 +5,13 @@ ...@@ -5,7 +5,13 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
Select t1.*,replace(t1.service_url, Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview', 'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru 'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru,
replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_operat_wfl.lview') as service_url_operat,
replace(t1.service_url,
'modules/csh/CSH501/csh_payment_req.lview',
'modules/csh/CSH501/csh_payment_op_req.lview') as service_url_operat_payment
From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id, From (select zj_wfl_core_pkg.get_node_service_url(tt.record_id,
${/parameter/@url_type}, ${/parameter/@url_type},
${/session/@user_id}) as service_url,tt.* ${/session/@user_id}) as service_url,tt.*
......
...@@ -5,7 +5,15 @@ ...@@ -5,7 +5,15 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
Select t1.*,replace(t1.service_url, Select t1.*,replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview', 'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru 'modules/prj/PRJ501N/prj_project_maintain_constru_wfl.lview') as service_url_constru,
replace(t1.service_url,
'modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview',
'modules/prj/PRJ501N/prj_project_maintain_operat_wfl.lview') as service_url_operat,
replace(t1.service_url,
'modules/csh/CSH501/csh_payment_req.lview',
'modules/csh/CSH501/csh_payment_op_req.lview') as service_url_operat_payment,
replace(t1.service_url,
'modules/prj/PRJ2000/purchase_order_deteail.lview') as service_url_purchase
From (select zj_wfl_core_pkg.get_wfl_service_url(tt.instance_id, From (select zj_wfl_core_pkg.get_wfl_service_url(tt.instance_id,
${/session/@user_id}) as service_url,tt.* ${/session/@user_id}) as service_url,tt.*
from zj_wfl_workflow_instance tt) t1 from zj_wfl_workflow_instance tt) t1
......
var override_queryfields = [
{
name : 'amount_from',
queryexpression : "T1.amount>=${@amount_from}"
},
{
name : 'amount_to',
queryexpression : "T1.amount<=${@amount_to}"
},
{
name : 'req_date_from',
queryexpression : "T1.req_date>=trunc(to_date(${@req_date_from},'yyyy-mm-dd'))"
},
{
name : 'req_date_to',
queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')"
},
{
name:'payment_req_number',
queryexpression:"t1.payment_req_number like '%'||${@payment_req_number}||'%'"
}
];
var add_datafilters = [
{
name : '',
expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('40'))"
} ];
add_datafilter();
override();
...@@ -25,6 +25,17 @@ var add_datafilters = [ ...@@ -25,6 +25,17 @@ var add_datafilters = [
name : 'approval_status', name : 'approval_status',
expression : "(t1.approval_status in ('NEW','RETURN','REJECT'))" expression : "(t1.approval_status in ('NEW','RETURN','REJECT'))"
} ]; },
{
name : '',
expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('0'))"
}
];
add_datafilter(); add_datafilter();
override(); override();
...@@ -25,6 +25,17 @@ var add_datafilters = [ ...@@ -25,6 +25,17 @@ var add_datafilters = [
name : 'approval_status', name : 'approval_status',
expression : "(t1.approval_status NOT in ('NEW','RETURN','REJECT','CANCEL'))" expression : "(t1.approval_status NOT in ('NEW','RETURN','REJECT','CANCEL'))"
} ]; },
{
name : '',
expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('0'))"
}
];
add_datafilter(); add_datafilter();
override(); override();
...@@ -347,5 +347,7 @@ var enableLayoutConfig = { ...@@ -347,5 +347,7 @@ var enableLayoutConfig = {
'modules/inv/INV100/inv_payment_detail.lview':true, 'modules/inv/INV100/inv_payment_detail.lview':true,
'modules/inv/INV100/inv_payment_wfl_detail.lview':true, 'modules/inv/INV100/inv_payment_wfl_detail.lview':true,
'modules/hls/HLS303/bp_asset_create.lview':true, 'modules/hls/HLS303/bp_asset_create.lview':true,
'modules/csh/CSH1500/csh_asset_reconciliation.lview':true 'modules/csh/CSH1500/csh_asset_reconciliation.lview':true,
'modules/csh/CSH501C/csh_payment_asset_create_entrance.lview': true,
'modules/csh/CSH501C/csh_payment_asset_req.lview': true
}; };
\ No newline at end of file
var override_queryfields = [ var override_queryfields = [
{ {
field : 'project_id', field : 'project_id',
queryoperator : "=" queryoperator : "="
}, },
//{ //{
// field : 'project_name', // field : 'project_name',
// queryoperator : "like" // queryoperator : "like"
//}, //},
{ {
name : 'create_date_from', name : 'create_date_from',
queryexpression : "t1.create_date between to_date(${@create_date_from},'yyyy-mm-dd') and nvl(to_date(${@create_date_to},'yyyy-mm-dd'),t1.create_date)" queryexpression : "t1.create_date between to_date(${@create_date_from},'yyyy-mm-dd') and nvl(to_date(${@create_date_to},'yyyy-mm-dd'),t1.create_date)"
}, },
{ {
name : 'create_date_to', name : 'create_date_to',
queryexpression : "t1.create_date between nvl(to_date(${@create_date_from},'yyyy-mm-dd'),t1.create_date) and to_date(${@create_date_to},'yyyy-mm-dd')" queryexpression : "t1.create_date between nvl(to_date(${@create_date_from},'yyyy-mm-dd'),t1.create_date) and to_date(${@create_date_to},'yyyy-mm-dd')"
}, },
{ {
name : 'bp_id', name : 'bp_id',
queryexpression : "exists (select 1 from prj_project_bp b where b.project_id=t1.project_id and b.bp_id=${@bp_id})" queryexpression : "exists (select 1 from prj_project_bp b where b.project_id=t1.project_id and b.bp_id=${@bp_id})"
}, },
{
name : 'bp_name',
queryexpression : "exists (select 1 from prj_project_bp_v b where b.project_id=t1.project_id and b.bp_name like '%'||${@bp_name}||'%')"
},
//{ //{
// field : 'employee_id', // field : 'employee_id',
// queryoperator : "=" // queryoperator : "="
...@@ -60,12 +63,22 @@ var override_queryfields = [ ...@@ -60,12 +63,22 @@ var override_queryfields = [
// field : 'search_term_2', // field : 'search_term_2',
// queryoperator : "=" // queryoperator : "="
//}, //},
{ {
name:'project_status', name:'project_status',
queryexpression : "t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED','CLOSED')" queryexpression : "t1.project_status in ('NEW','APPROVING','APPROVED_RETURN','REJECT','APPROVED','CONTRACT_CREATED','CLOSED')"
} }
]; ];
var add_datafilters = [{
name: 'document_type',
expression: "t1.document_type not in('PUR_ORDER') "
},
{
name: 'business_type',
expression: "t1.business_type not in('OTHERS') "
}
];
add_datafilter();
override(); override();
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ' //update by xsh35973 添加法人铁甲保证函 ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ' //update by xsh35973 添加法人铁甲保证函
//addby xsh35973 20221017 神钢建机 //addby xsh35973 20221017 神钢建机
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG' ||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG'
||record_data.templet_code =='FINANCE_LEASE_BACK_CON_SG'||record_data.templet_code =='FINANCE_LEASE_BACK_CON_GUA_SG1'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_SG'||record_data.templet_code =='LEASE_ORDER_SG'||record_data.templet_code =='PROOF_RECEIPT_SG'
//add by gzj 2022-12-23 北京卡家 //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 =='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 =='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'
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}" <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"/> 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:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<!-- <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>--> <!-- <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
...@@ -52,10 +53,12 @@ ...@@ -52,10 +53,12 @@
} }
//让历史信息查询 //让历史信息查询
var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master'); var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
if($(history_con_id)){
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}'; var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}';
$(history_con_id).setQueryUrl(url); $(history_con_id).setQueryUrl(url);
$(history_con_id).query(); $(history_con_id).query();
}
//铁甲业务合同展示保证金字段 18083 2023/5/11
if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){ 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")){ 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_prompt").style.display = "none";
...@@ -65,6 +68,13 @@ ...@@ -65,6 +68,13 @@
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_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
} }
}
//报价中资管费字段为否时,不展示资产管理费字段 18083 2024/1/29
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST").style.display = "none";
}
} }
}); });
...@@ -496,14 +506,14 @@ ...@@ -496,14 +506,14 @@
var residual_value = record.get('residual_value'); var residual_value = record.get('residual_value');
var ccr_residual_value = record.get('ccr_residual_value'); var ccr_residual_value = record.get('ccr_residual_value');
var amount_250 = record.get('amount_250'); var amount_250 = record.get('amount_250');
if (amount_250 == 0){ if (amount_250 == 0){
if (residual_value != ccr_residual_value && typeof (residual_value) != 'undefined') { if (residual_value != ccr_residual_value && typeof (residual_value) != 'undefined') {
var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE'); var req_change_id_4 = document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_RESIDUAL_VALUE');
var req_change_input_4 = req_change_id_4.getElementsByTagName('input'); var req_change_input_4 = req_change_id_4.getElementsByTagName('input');
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important'); req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
} }
} }
if(amount_250 != 0){ if(amount_250 != 0){
if (residual_value != 0 && typeof (residual_value) != 'undefined') { if (residual_value != 0 && typeof (residual_value) != 'undefined') {
...@@ -512,7 +522,7 @@ ...@@ -512,7 +522,7 @@
req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important'); req_change_input_4[0].style.setProperty('background-color', '#FF9965', 'important');
} }
} }
} }
} }
}; };
...@@ -901,15 +911,14 @@ ...@@ -901,15 +911,14 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item'); 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){ if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
var division =$(project_ds_id).getAt(0).get('division'); if(record.data.division=='70' || record.data.division=='92'){
if(division=='70' || division=='92'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number'); $(gridId).hideColumn('machine_number');
}else { }else {
$(gridId).hideColumn('lease_name'); $(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70'); $(gridId).hideColumn('machine_number_70');
} }
}; }
}; };
//选择事件(grid,attach,gridbox,table) //选择事件(grid,attach,gridbox,table)
/*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) { /*window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_before_select'] = function(ds, record, bp_seq) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/> <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/> <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/> <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
...@@ -67,6 +67,13 @@ ...@@ -67,6 +67,13 @@
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){ 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_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
//报价中资管费字段为否时,不展示资产管理费字段 18083 2024/1/29
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST").style.display = "none";
} }
} }
}); });
...@@ -86,7 +93,7 @@ ...@@ -86,7 +93,7 @@
} }
}; };
var clc_flag = 'N'; var clc_flag = 'N';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req'); var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
...@@ -186,6 +193,7 @@ ...@@ -186,6 +193,7 @@
record.set('fund_possession_rate', res.result.fund_possession_rate); record.set('fund_possession_rate', res.result.fund_possession_rate);
record.set('last_rent_due_date',res.result.last_rent_due_date); record.set('last_rent_due_date',res.result.last_rent_due_date);
record.set('sum_unreceived_principal',res.result.sum_unreceived_principal); record.set('sum_unreceived_principal',res.result.sum_unreceived_principal);
record.set('asset_possession_cost', res.result.asset_possession_cost);
clc_flag = 'N'; clc_flag = 'N';
}, },
failure: function () { failure: function () {
...@@ -200,6 +208,7 @@ ...@@ -200,6 +208,7 @@
//record.set('fund_possession_rate',''); //record.set('fund_possession_rate','');
record.set('last_rent_due_date',''); record.set('last_rent_due_date','');
record.set('sum_unreceived_principal',''); record.set('sum_unreceived_principal','');
record.set('asset_possession_cost','');
}, },
error: function () { error: function () {
record.set('termination_date',''); record.set('termination_date','');
...@@ -213,6 +222,7 @@ ...@@ -213,6 +222,7 @@
//record.set('fund_possession_rate',''); //record.set('fund_possession_rate','');
record.set('last_rent_due_date',''); record.set('last_rent_due_date','');
record.set('sum_unreceived_principal',''); record.set('sum_unreceived_principal','');
record.set('asset_possession_cost','');
}, },
scope: this scope: this
}); });
...@@ -231,6 +241,15 @@ ...@@ -231,6 +241,15 @@
if(sum_unreceived_principal !=0) { if(sum_unreceived_principal !=0) {
var et_due_amount_result = plus(sum_unreceived_principal, value); var et_due_amount_result = plus(sum_unreceived_principal, value);
record.set('et_due_amount', et_due_amount_result); record.set('et_due_amount', et_due_amount_result);
}
//调整资金占用费 18083 2023/2/6
var fund_possession_time = record.get('fund_possession_time')||0;
var btb_int_rate = record.get('btb_int_rate')||0;
var asset_possession_cost_result =value-sum_unreceived_principal*fund_possession_time*btb_int_rate/360;
if(asset_possession_cost_result<0|| asset_possession_cost_result == NaN || asset_possession_cost_result == undefined) {
record.set('asset_possession_cost', 0);
}else{
record.set('asset_possession_cost', asset_possession_cost_result);
} }
} }
if(name == 'residual_value'&& clc_flag =='N'){ if(name == 'residual_value'&& clc_flag =='N'){
...@@ -693,7 +712,7 @@ ...@@ -693,7 +712,7 @@
$(gridId).hideColumn('lease_name'); $(gridId).hideColumn('lease_name');
$(gridId).hideColumn('machine_number_70'); $(gridId).hideColumn('machine_number_70');
} }
}; }
} }
//图片渲染 //图片渲染
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: gaoyang $Author: gaoyang
$Date: 2013-4-17 上午09:26:12 $Date: 2013-4-17 上午09:26:12
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<a:screen xmlns:c="leaf.application.action" xmlns:s="leaf.plugin.script" xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" customizationEnabled="true" trace="true"> <a:screen xmlns:c="leaf.application.action" xmlns:s="leaf.plugin.script" xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" customizationEnabled="true" trace="true">
<a:init-procedure participants="leaf.service.exception.ExceptionHandler"> <a:init-procedure participants="leaf.service.exception.ExceptionHandler">
<a:model-query defaultWhereClause="d.enabled_flag=&apos;Y&apos; and nvl(d.display_flag,&apos;N&apos;)!=&apos;N&apos;" fetchAll="true" model="hls.HLS500.hls_fin_calc_config_ln" rootPath="calc_config_ln_path"/> <a:model-query defaultWhereClause="d.enabled_flag=&apos;Y&apos; and nvl(d.display_flag,&apos;N&apos;)!=&apos;N&apos;" fetchAll="true" model="cont.CON_REPO001.hls_fin_calc_config_ln" rootPath="calc_config_ln_path"/>
<a:model-query defaultWhereClause="d.enabled_flag=&apos;Y&apos;" fetchAll="true" model="hls.HLS500.hls_fin_calc_config_ln" rootPath="calc_config_ln_all_path"/> <a:model-query defaultWhereClause="d.enabled_flag=&apos;Y&apos;" fetchAll="true" model="cont.CON_REPO001.hls_fin_calc_config_ln" rootPath="calc_config_ln_all_path"/>
<a:model-query fetchAll="true" model="hls.HLS500.hls_fin_calc_button" rootPath="calc_button_path"/> <a:model-query fetchAll="true" model="hls.HLS500.hls_fin_calc_button" rootPath="calc_button_path"/>
<a:model-query defaultWhereClause="t.enabled_flag=&apos;Y&apos; and (t.display_flag=&apos;Y&apos; or (t.display_flag=&apos;C&apos; and exists(select 1 from hls_fin_calc_config_quote q where q.calc_session_id=${/parameter/@calc_session_id} and q.layout_area_seq=&apos;H&apos; and q.column_name=t.column_name and q.display_flag=&apos;Y&apos;)))" fetchAll="true" model="hls.HLS500N.hls_fin_calc_config_hd_n" rootPath="calc_config_hd_path"/> <a:model-query defaultWhereClause="t.enabled_flag=&apos;Y&apos; and (t.display_flag=&apos;Y&apos; or (t.display_flag=&apos;C&apos; and exists(select 1 from hls_fin_calc_config_quote q where q.calc_session_id=${/parameter/@calc_session_id} and q.layout_area_seq=&apos;H&apos; and q.column_name=t.column_name and q.display_flag=&apos;Y&apos;)))" fetchAll="true" model="cont.CON_REPO001.hls_fin_calc_config_hd_n" rootPath="calc_config_hd_path"/>
<a:model-query defaultWhereClause="t.enabled_flag=&apos;Y&apos; and (t.display_flag=&apos;N&apos; or (t.display_flag=&apos;C&apos; and not exists(select 1 from hls_fin_calc_config_quote q where q.calc_session_id=${/parameter/@calc_session_id} and q.layout_area_seq=&apos;H&apos; and q.column_name=t.column_name and q.display_flag=&apos;Y&apos;)))" fetchAll="true" model="hls.HLS500N.hls_fin_calc_config_hd_n" rootPath="temp_config_hd_path"/> <a:model-query defaultWhereClause="t.enabled_flag=&apos;Y&apos; and (t.display_flag=&apos;N&apos; or (t.display_flag=&apos;C&apos; and not exists(select 1 from hls_fin_calc_config_quote q where q.calc_session_id=${/parameter/@calc_session_id} and q.layout_area_seq=&apos;H&apos; and q.column_name=t.column_name and q.display_flag=&apos;Y&apos;)))" fetchAll="true" model="cont.CON_REPO001.hls_fin_calc_config_hd_n" rootPath="temp_config_hd_path"/>
<p:set field="/parameter/@dynamic_base_table" value="HLS_FIN_CALCULATOR_LN_FORMULA"/> <p:set field="/parameter/@dynamic_base_table" value="HLS_FIN_CALCULATOR_LN_FORMULA"/>
<a:model-query fetchAll="true" model="hls.HLS500N.hls_fin_calculator_common" rootPath="ln_formula_path"/> <a:model-query fetchAll="true" model="hls.HLS500N.hls_fin_calculator_common" rootPath="ln_formula_path"/>
<p:set field="/parameter/@dynamic_base_table" value="HLS_FIN_CALCULATOR_HD_FORMULA"/> <p:set field="/parameter/@dynamic_base_table" value="HLS_FIN_CALCULATOR_HD_FORMULA"/>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
}, null, null); }, null, null);
} else { } else {
Leaf.request({ Leaf.request({
url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calc_config_ln/query', url: '${/request/@context_path}/autocrud/cont.CON_REPO001.hls_fin_calc_config_ln/query',
para: { para: {
calc_session_id: '${/parameter/@calc_session_id}', calc_session_id: '${/parameter/@calc_session_id}',
column_name: formula_column_name column_name: formula_column_name
...@@ -1408,7 +1408,7 @@ debugger; ...@@ -1408,7 +1408,7 @@ debugger;
<a:dataSet id="calc_button_ds"> <a:dataSet id="calc_button_ds">
<a:datas dataSource="/model/calc_button_path"/> <a:datas dataSource="/model/calc_button_path"/>
</a:dataSet> </a:dataSet>
<a:dataSet id="hls_fin_calculator_hd_ds" autoQuery="true" fetchAll="true" model="hls.HLS500N.hls_fin_calc_config_hd_n" processfunction="hls500_hd_process" queryUrl="${/request/@context_path}/autocrud/hls.HLS500N.hls_fin_calc_config_hd_n/query?calc_session_id=${/parameter/@calc_session_id}&amp;enabled_flag=Y&amp;display_flag=Y"> <a:dataSet id="hls_fin_calculator_hd_ds" autoQuery="true" fetchAll="true" model="cont.CON_REPO001.hls_fin_calc_config_hd_n" processfunction="hls500_hd_process" queryUrl="${/request/@context_path}/autocrud/cont.CON_REPO001.hls_fin_calc_config_hd_n/query?calc_session_id=${/parameter/@calc_session_id}&amp;enabled_flag=Y&amp;display_flag=Y">
<a:fields> <a:fields>
<a:field name="column_value" lovGridHeight="350" lovHeight="500" lovWidth="500"/> <a:field name="column_value" lovGridHeight="350" lovHeight="500" lovWidth="500"/>
<a:field name="column_value_c"/> <a:field name="column_value_c"/>
......
...@@ -101,8 +101,7 @@ ...@@ -101,8 +101,7 @@
and t.business_type = 'OTHERS' and t.business_type = 'OTHERS'
and t.document_type = 'PUR_ORDER' and t.document_type = 'PUR_ORDER'
and t.division='95' and t.division='95'
AND nvl(t.contract_status,'NEW') = 'INCEPT' AND NOT EXISTS(SELECT 1
AND NOT EXISTS(SELECT 1
FROM csh_payment_req_ln l, csh_payment_req_hd hd FROM csh_payment_req_ln l, csh_payment_req_hd hd
WHERE l.ref_doc_line_id = f.cashflow_id WHERE l.ref_doc_line_id = f.cashflow_id
AND l.ref_doc_category = 'CONTRACT' AND l.ref_doc_category = 'CONTRACT'
...@@ -138,9 +137,13 @@ ...@@ -138,9 +137,13 @@
queryExpression="t1.plan_order_date &lt;= ${@plan_order_date_to}"/> queryExpression="t1.plan_order_date &lt;= ${@plan_order_date_to}"/>
<bm:query-field name="lease_item_amount" <bm:query-field name="lease_item_amount"
queryExpression="t1.due_amount&gt;=${@lease_item_amount}"/> queryExpression="t1.due_amount&gt;=${@lease_item_amount}"/>
<bm:query-field name="vender_con_number" queryExpression="t1.vender_con_number=${@vender_con_number}"/> <bm:query-field name="bp_id_agent_n" queryExpression="t1.vender_name_n=${@bp_id_agent_n}"/>
<bm:query-field name="vender_name_n" queryExpression="t1.vender_name_n=${@vender_name_n}"/>
<bm:query-field name="invoice_status_n" <bm:query-field name="invoice_status_n"
queryExpression="t1.invoice_status_n like &apos;%&apos;||${@invoice_status_n}||&apos;%&apos;"/> queryExpression="t1.invoice_status_n like &apos;%&apos;||${@invoice_status_n}||&apos;%&apos;"/>
<bm:query-field name="contract_number" queryExpression="t1.contract_number=${@contract_number}"/> <bm:query-field name="contract_number" queryExpression="t1.contract_number=${@contract_number}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters>
<bm:data-filter name="contract_status" expression="(nvl(t1.contract_status,'NEW') = 'INCEPT')"/>
</bm:data-filters>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
trace="true">
<a:init-procedure>
</a:init-procedure>
<a:view>
<a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="csh501_csh_asset_req_link_id"
url="${/request/@context_path}/modules/csh/CSH501C/csh_payment_asset_req.lview"/>
<script type="text/javascript"><![CDATA[
function detail_link(id, name, query_only) {
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['business_type'] = record.get('business_type');
param['approval_status'] = record.get('approval_status');
param['bp_id'] = record.get('bp_id_agent_level1');
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') {
param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D_ASSET';
} else if(record.get('approval_status') == 'APPROVED'){
param['function_usage'] = 'QUERY';
param['function_code'] = 'CSH501D_ASSET';
param['download'] = 'Y';
} else {
param['function_usage'] = 'QUERY';
param['function_code'] = 'ASSET_SAVE';
param['download'] = 'Y';
}
param['winid'] = 'csh_payment_asset_update_window';
param['url_title'] = '付款申请';
hls_doc_get_layout_code('get_layout_code_link_id', param, 'csh501_csh_asset_req_link_id', ds_id, '${/parameter/@layout_code}');
}
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
window['${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'payment_req_number' && value) {
link_function = 'detail_link';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + value + '</a>';
}
return value;
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
aut_authority_list_validate_query(ds, qpara);
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:screen-include
screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=PAYMENT_REQ&amp;function_code=CSH501C"/>
</a:view>
</a:screen>
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<a:model-update model="hls.HLS811.hls_doc_file_templet_get_atm"/>
<s:server-script import="contract_print_path.js"><![CDATA[
importPackage(java.io);
importPackage(Packages.hls.plugin.docx4j);
importPackage(Packages.leaf.plugin.word2pdf);
importPackage(Packages.org.apache.commons.io);
//删除文件
function deleteFile(filePath) {
var file = new File(filePath);
if (file.exists()) {
file.delete();
}
}
//生成pdf
function wordToPdf(word_file_path,pdf_file_path) {
// word转pdf
var pdf_file_path_new = pdf_file_path + '.pdf';
var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
//删除word文件
//deleteFile(word_file_path);
return pdf_file_path_new;
}
function copyFile(fOld, fNew) {
var fis = new java.io.FileInputStream(fOld);
var fos = new java.io.FileOutputStream(fNew);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
var len = -1;
while ((len = fis.read(b)) != -1) {
fos.write(b, 0, len);
}
fis.close();
fos.close();
}
function transfer(file_path, os) {
println(file_path);
var fis = new FileInputStream(file_path);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function write_os_to_file(file, os) {
var fis = new FileInputStream(file);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function download_file(file_name, file_path) {
$ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
resp.setHeader("Pragma", "No-cache");
resp.setHeader("Cache-Control", "no-cache, must-revalidate");
resp.setDateHeader("Expires", 0);
resp.setContentType("application/x-msdownload");
resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'UTF-8'));
var os = resp.getOutputStream();
//transfer(file_path, os);
write_os_to_file(file_path, os);
os.flush();
}
//按日期创建目录
function getDatePath() {
set_parameter_file_path();
var file_path = $ctx.parameter.pdf_path; //file_path = c:/hls_test_files/content_files/
var now = new Date()
y = now.getFullYear()
m = now.getMonth() + 1
m = m < 10 ? "0" + m : m
var datePath = file_path + y + "/" + m + "/";
return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
}
function collection_create_content() {
try {
var datePath = getDatePath();
FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
var attachment_batch_dl = $bm('hls.HLS811.hls_doc_file_templet_get_atm');
var result = attachment_batch_dl.queryAsMap({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table,
batch_flag: $ctx.parameter.batch_flag,
content_id: $ctx.parameter.content_id
});
var from_file_data = result.getChildren();
for (var i = 0;i < from_file_data.length;i++) {
if (!$ctx.parameter.file_path) {
set_parameter_file_path();
}
var to_file_path = $ctx.parameter.file_path;
var record_data = from_file_data[i];
//if (record_data.file_exists_flag != 'Y') {
var to_file_name = record_data.to_file_name;
var from_file_path = record_data.file_path;
var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
var guid_file_name_tables = guid_file_name_path.getChildren();
to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'doc' + record_data.content_id;
copyFile(from_file_path, to_file_path);
try {
$bm('csh.CSH501.csh_transaction_return_print').update({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table
});
var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id.toString(), 'COMMON');
} catch (e) {
raise_app_error(e);
}
// word转pdf
var pdf_file_path=to_file_path;
var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
//var outputfilename= record_data.to_file_name +'.pdf';
var filename_str = record_data.to_file_name;
var outputfilename= filename_str.substr(0, filename_str.length - 5) +'.pdf';
var pdf_file = new File(outputfilepath);
var file_size = 0;
if (pdf_file.exists()) {
file_size = pdf_file.length();
}
$bm('hls.HLS811.hls_file_content_copy_update').update({
table_name: 'HLS_DOC_FILE_CONTENT',
content_id: record_data.content_id,
file_name: outputfilename.toString(),
file_path: outputfilepath.toString(),
source_type: $ctx.parameter.source_type
});
//var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
//HlsFileUtil.downloadFile(encodeURI(to_file_path,'utf-8'),encodeURI(to_file_name,'utf-8'),resp);
//print(outputfilepath.toString());
//print(outputfilename.toString());
download_file(outputfilename.toString(),outputfilepath.toString());
}
$ctx.parameter.return_status = 'S';
$ctx.parameter.return_message = '执行成功';
} catch (e) {
$ctx.success = "true";
$ctx.parameter.return_status = 'E';
$ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
raise_app_error(e);
}
var result = {
result: $ctx.parameter.return_status,
message: $ctx.parameter.return_message
};
$ctx.parameter.json = JSON.stringify(result);
}
if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
collection_create_content();
}
]]></s:server-script>
</a:init-procedure>
<a:service-output/>
</a:service>
...@@ -899,7 +899,9 @@ ...@@ -899,7 +899,9 @@
$L.Masker.mask(Ext.getBody(), '正在执行......'); $L.Masker.mask(Ext.getBody(), '正在执行......');
$L.request({ $L.request({
url: $('csh_check_acr_link').getUrl(), url: $('csh_check_acr_link').getUrl(),
para: {}, para: {
csh_date: record.get('csh_date')
},
success: function (args) { success: function (args) {
$L.Masker.unmask(Ext.getBody()); $L.Masker.unmask(Ext.getBody());
if (args.result.p_err_msg) { if (args.result.p_err_msg) {
......
...@@ -183,8 +183,8 @@ ...@@ -183,8 +183,8 @@
//add by chenlingfeng 在没有传document_category和document_id的情况下 //add by chenlingfeng 在没有传document_category和document_id的情况下
if( !check_document_category){ if( !check_document_category){
if(dynamic_source_table == 'PRJ_PROJECT'||dynamic_source_table == 'prj_project'){ if(dynamic_source_table == 'PRJ_PROJECT'||dynamic_source_table == 'prj_project'){
if(!check_document_category){ if(!check_document_category && $ctx.parameter.layout_code!='PUR_ORDER_DETEAIL'){
check_document_category ='PROJECT'; check_document_category ='PROJECT';
} }
} }
......
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
$(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']); $(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']);
$(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']); $(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']);
$(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']); $(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']);
$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']); //$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']);
} }
......
...@@ -736,7 +736,7 @@ ...@@ -736,7 +736,7 @@
$(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']); $(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']);
$(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']); $(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']);
$(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']); $(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']);
$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']); //$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']);
} }
......
...@@ -721,7 +721,7 @@ ...@@ -721,7 +721,7 @@
$(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']); $(prj_quotation_ds_id).getAt(0).set('deposit', data.result.record['deposit']);
$(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']); $(prj_quotation_ds_id).getAt(0).set('lease_term_month', data.result.record['lease_term_month']);
$(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']); $(prj_quotation_ds_id).getAt(0).set('total_rental', data.result.record['total_rental']);
$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']); //$(prj_quotation_ds_id).getAt(0).set('lease_times', data.result.record['lease_times']);
} }
......
...@@ -23,10 +23,27 @@ ...@@ -23,10 +23,27 @@
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url_constru}"/> <a:screen-include screen="${/model/workflow_service_record/record/@service_url_constru}"/>
</a:case> </a:case>
<a:case value="N">
<a:switch test="/model/node_service_record/record/@division">
<a:case value="95">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url_operat}"/>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/> <a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
</a:case>
</a:switch>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
<a:case value="DCFL_CSH_PAYMENT_REQ">
<a:switch test="/model/node_service_record/record/@payment_division">
<a:case value="95">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url_operat_payment}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
</a:case>
</a:switch>
</a:case> </a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/> <a:screen-include screen="${/model/workflow_service_record/record/@service_url}"/>
......
...@@ -23,14 +23,34 @@ ...@@ -23,14 +23,34 @@
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_constru}"/> <a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_constru}"/>
</a:case> </a:case>
<a:case value="N">
<a:switch test="/model/node_service_info/record/@division">
<a:case value="95">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_operat}"/>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/> <a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
</a:case> </a:case>
</a:switch>
</a:case>
</a:switch> </a:switch>
</a:case> </a:case>
<a:case value="DCFL_CSH_PAYMENT_REQ">
<a:switch test="/model/node_service_info/record/@payment_division">
<a:case value="95">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_operat_payment}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
</a:case>
</a:switch>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/> <a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url}"/>
</a:case> </a:case>
<a:case value="OL_PROCURE_WFL">
<a:screen-include screen="${/model/submiter_ht_wfl_service/record/@service_url_purchase}"/>
</a:case>
</a:switch> </a:switch>
</a:case> </a:case>
</a:switch> </a:switch>
......
...@@ -46,6 +46,23 @@ ...@@ -46,6 +46,23 @@
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url_constru}"/> <a:screen-include screen="${/model/approver_ht_node_service/record/@service_url_constru}"/>
</a:case> </a:case>
<a:case value="N">
<a:switch test="/model/node_service_info/record/@division">
<a:case value="95">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url_constru}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
</a:case>
</a:switch>
</a:case>
</a:switch>
</a:case>
<a:case value="DCFL_CSH_PAYMENT_REQ">
<a:switch test="/model/node_service_info/record/@payment_division">
<a:case value="95">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url_operat_payment}"/>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/> <a:screen-include screen="${/model/approver_ht_node_service/record/@service_url}"/>
</a:case> </a:case>
......
...@@ -343,10 +343,27 @@ ...@@ -343,10 +343,27 @@
<a:case value="Y"> <a:case value="Y">
<a:screen-include screen="${/model/node_service_record/record/@service_url_constru}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/> <a:screen-include screen="${/model/node_service_record/record/@service_url_constru}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case> </a:case>
<a:case value="N">
<a:switch test="/model/node_info_record/record/@division">
<a:case value="95">
<a:screen-include screen="${/model/node_service_record/record/@service_url_operat}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/> <a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
</a:switch>
</a:case> </a:case>
</a:switch> </a:switch>
</a:case>
<a:case value="DCFL_CSH_PAYMENT_REQ">
<a:switch test="/model/node_info_record/record/@payment_division">
<a:case value="95">
<a:screen-include screen="${/model/node_service_record/record/@service_url_operat_payment}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
<a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
</a:case>
</a:switch>
</a:case> </a:case>
<a:case value="*"> <a:case value="*">
<a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/> <a:screen-include screen="${/model/node_service_record/record/@service_url}&amp;winid=zj_wfl_approve_win&amp;instance_id=${/parameter/@instance_id}"/>
......
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