Commit 3217b419 authored by 18083's avatar 18083

手工凭证导入后台异常信息展示处理

parent b8f6d5f4
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lixi
$Date: 2011-8-1 上午10:21:39
$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 fnd_interface_headers_s.nextval header_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
select t1.journal_header_id, select t1.journal_header_id,
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
select t1.journal_header_id, select t1.journal_header_id,
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
...@@ -97,6 +99,7 @@ ...@@ -97,6 +99,7 @@
select t1.journal_header_id, select t1.journal_header_id,
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
...@@ -139,6 +142,7 @@ ...@@ -139,6 +142,7 @@
select t1.journal_header_id, select t1.journal_header_id,
t1.journal_submit_batch_id, t1.journal_submit_batch_id,
t1.journal_num, t1.journal_num,
t1.error_message,
(select c.company_short_name (select c.company_short_name
from fnd_companies_vl c from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name, where c.company_id = t1.je_company_id) js_company_short_name,
...@@ -175,7 +179,8 @@ ...@@ -175,7 +179,8 @@
AND EXISTS (SELECT 1 AND EXISTS (SELECT 1
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('017')) AND t.position_code IN ('017') or t.user_id = 10418
)
and t1.journal_type in('GENERAL_SALARIES','BPO_SALARIES','COST_IMPORT','FUND_POOL','GLOBAL_TEMPLATE','FINANCIAL_TEMPLATE') and t1.journal_type in('GENERAL_SALARIES','BPO_SALARIES','COST_IMPORT','FUND_POOL','GLOBAL_TEMPLATE','FINANCIAL_TEMPLATE')
) t1 ) t1
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
BEGIN BEGIN
hls_journal_import_pkg.insert_hls_journal_tmp(p_user_id => ${/session/@user_id}, hls_journal_import_pkg.insert_hls_journal_tmp(p_user_id => ${/session/@user_id},
p_header_id => ${/session/@session_id}, p_header_id => ${/model/header/record/@header_id},
p_company_id => ${/session/@company_id}, p_company_id => ${/session/@company_id},
p_template_type=>${@template_type} p_template_type=>${@template_type}
); );
......
...@@ -174,7 +174,6 @@ ...@@ -174,7 +174,6 @@
//反冲 //反冲
function hls536_journal_reverse(){ function hls536_journal_reverse(){
debugger;
var records = $('hls_journal_header_result_ds').getSelected(); var records = $('hls_journal_header_result_ds').getSelected();
if(records.length == 0){ if(records.length == 0){
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录!'); Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录!');
...@@ -383,11 +382,12 @@ ...@@ -383,11 +382,12 @@
<a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/> <a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/>
<a:column name="currency_desc" align="center" prompt="币种" width="80"/> <a:column name="currency_desc" align="center" prompt="币种" width="80"/>
<a:column name="total_amount_fuc_dr" align="right" prompt="金额" renderer="Leaf.formatMoney" width="120"/> <a:column name="total_amount_fuc_dr" align="right" prompt="金额" renderer="Leaf.formatMoney" width="120"/>
<a:column name="je_transaction_desc" prompt="凭证来源" width="150"/> <!--<a:column name="je_transaction_desc" prompt="凭证来源" width="150"/>-->
<a:column name="description" prompt="凭证摘要" width="220"/> <a:column name="description" prompt="凭证摘要" width="220"/>
<a:column name="je_detail_count" prompt="凭证行数量" width="50"/> <a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
<a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/> <a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
<a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/> <a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
<a:column name="error_message" prompt="错误信息" width="150"/>
<a:column name="attachment_file" prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/> <a:column name="attachment_file" prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">--> <!--<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">-->
<a:screen xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true"> <a:screen xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure> <a:init-procedure >
<a:model-execute model="hls.HLS536.delete_hls_journal_tmp"/> <!--<a:model-execute model="hls.HLS536.delete_hls_journal_tmp"/>-->
<a:import-excel header_id="${/session/@session_id}" attribute5="D:\u01,fnd_interface_headers,${/session/@session_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" /> <a:model-query model="acr.acr_get_sys_import_head_id" rootPath="header"/>
<a:import-excel header_id="${/model/header/record/@header_id}" attribute5="D:\u01,fnd_interface_headers,${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />
<!--<a:import-excel header_id="${/session/@session_id}" attribute5="D:\u01,fnd_interface_headers,${/session/@session_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />-->
<a:model-execute model="hls.HLS536.insert_hls_journal_tmp"/> <a:model-execute model="hls.HLS536.insert_hls_journal_tmp"/>
</a:init-procedure> </a:init-procedure>
......
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