Skip to content

L
leaf-hlcm
Commit 16f488ab authored by 18083's avatar 18083
Browse files
Options

经租上线代码同步更新

parent 4ae1f804
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1529 additions and 60 deletions
src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_query.lwm
View file @ 16f488ab
...@@ -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
src/main/webapp/WEB-INF/classes/hls/HLS801/csh_current_period_query.lwm
View file @ 16f488ab
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<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>
......
src/main/webapp/WEB-INF/classes/hls/HLS801/sys_role_flag.lwm
View file @ 16f488ab
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
'NO', 'NO',
(Select decode(t.role_code, (Select decode(t.role_code,
'0009', '0009',
'NO',
'0038',
'NO', 'NO',
'0014', '0014',
'YES', 'YES',
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
View file @ 16f488ab
...@@ -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 =
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_database_query.lwm
View file @ 16f488ab
...@@ -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>
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
View file @ 16f488ab
...@@ -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 =
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
View file @ 16f488ab
...@@ -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'
......
src/main/webapp/WEB-INF/classes/rpt/RPT556/con_je_vat_current_quarter_query.lwm
View file @ 16f488ab
...@@ -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})
......
src/main/webapp/WEB-INF/classes/rpt/RPT556/con_je_vat_quarter_query.lwm
View file @ 16f488ab
...@@ -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 =
......
src/main/webapp/WEB-INF/classes/rpt/RPT556/con_je_vat_total_query_quarter.lwm
View file @ 16f488ab
...@@ -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'
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_approve_history.lwm
View file @ 16f488ab
...@@ -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>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_display.lwm
View file @ 16f488ab
...@@ -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>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_info_query.lwm
View file @ 16f488ab
...@@ -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>
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_approve_history.lwm
View file @ 16f488ab
...@@ -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.*
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_node_service_wait_to_do.lwm
View file @ 16f488ab
...@@ -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.*
......
src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow_service_display.lwm
View file @ 16f488ab
...@@ -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
......
src/main/webapp/WEB-INF/server-script/layoutconfig/project_modify_entrance_g_project_result_queryfields.js
View file @ 16f488ab
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();
src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
View file @ 16f488ab
...@@ -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) {
......
src/main/webapp/modules/zjwfl/ZJWFL1060/zj_wfl_monitoring_node_approve_history.lview
View file @ 16f488ab
...@@ -23,6 +23,23 @@ ...@@ -23,6 +23,23 @@
<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:screen-include screen="${/model/workflow_service_record/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_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: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:case>
......
src/main/webapp/modules/zjwfl/ZJWFL3010/zj_wfl_approve_history_for_submitter.lview
View file @ 16f488ab
...@@ -23,6 +23,23 @@ ...@@ -23,6 +23,23 @@
<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:screen-include screen="${/model/submiter_ht_wfl_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/submiter_ht_wfl_service/record/@service_url_operat_payment}"/>
</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>
...@@ -31,6 +48,9 @@ ...@@ -31,6 +48,9 @@
<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>
......
src/main/webapp/modules/zjwfl/ZJWFL3040/zj_wfl_my_approved_application_history.lview
View file @ 16f488ab
...@@ -45,6 +45,23 @@ ...@@ -45,6 +45,23 @@
<a:switch test="/model/node_service_info/record/@is_constru_unit"> <a:switch test="/model/node_service_info/record/@is_constru_unit">
<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 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>
<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}"/>
......
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @ 16f488ab
...@@ -343,6 +343,23 @@ ...@@ -343,6 +343,23 @@
<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: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: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: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:case>
......
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