Skip to content

L
leaf-hlcm
Commit 62cf254f authored by lizhe's avatar lizhe
Browse files
Options

Merge remote-tracking branch 'origin/remote_dev' into remote_dev

parents 987a92d4 43bd122b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1189 additions and 200 deletions
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_invoice_inf_import_total.lwm 0 → 100644
View file @ 62cf254f
<?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
acp_invoice_import_pkg.ACP_INVOICE_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_user_id => ${/session/@user_id},
p_contract_id => ${@contract_id});
end;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
acp_invoice_import_pkg.submit_wfl( p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id},
p_company_id => ${/session/@company_id});
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/cont/CON202/con_contract_tmpt_clause_main.lwm
View file @ 62cf254f
......@@ -62,6 +62,7 @@
<bm:field name="first_contract_flag"/>
<bm:field name="finance_type"/>
<bm:field name="secondary_lease"/>
<bm:field name="secondary_lease_new"/>
<bm:field name="marital_status_flag"/>
<bm:field name="sp_sign_flag"/>
<bm:field name="vender_id"/>
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly.lwm
View file @ 62cf254f
......@@ -123,8 +123,7 @@
from con_cashflow_monthly_temp t, hls_bp_master m, gld_accounts g
where m.bp_id = t.agent_bp_id
and g.account_id(+) = t.account_id
and t.session_id = ${/session/@session_id}
union
union
select tt.unreceived_sum_amount,
tt.overdue_sum_amount,
not_due_sum_amount,
......@@ -325,7 +324,6 @@
t.vender_id,
t.division
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.contract_id, t.bp_id, t.agent_bp_id,t.vender_id,t.division) tt,
hls_bp_master m
where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_agent.lwm
View file @ 62cf254f
......@@ -162,8 +162,7 @@
t.account_id,
t.account_code
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.agent_bp_id,
group by t.agent_bp_id,
t.division,
t.account_id,
t.account_code) tt,
......@@ -319,8 +318,7 @@
t.agent_bp_id,
t.division
from con_cashflow_monthly_temp t
where t.session_id = ${/session/@session_id}
group by t.agent_bp_id, t.division) tt,
group by t.agent_bp_id, t.division) tt,
hls_bp_master m
where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
order by ttt.agent_bp_id,ttt.division, ttt.account_id_n
......
src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_lease_item.lwm
View file @ 62cf254f
......@@ -161,7 +161,7 @@
t.account_code,
t.agent_bp_id
from con_cashflow_monthly_temp t,hls_bp_master hm
where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
where hm.bp_id=t.agent_bp_id
group by t.division, t.account_id, t.account_code,t.agent_bp_id) tt,
gld_accounts g
where g.account_id(+) = tt.account_id
......@@ -312,7 +312,7 @@
t.division,
t.agent_bp_id
from con_cashflow_monthly_temp t,hls_bp_master hm
where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
where hm.bp_id=t.agent_bp_id
group by t.division,t.agent_bp_id) tt) ttt #WHERE_CLAUSE#
order by ttt.division, ttt.account_id_n
......
src/main/webapp/WEB-INF/classes/cont/CON930/insert_con_cash_temp_data_job.lwm 0 → 100644
View file @ 62cf254f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: WangYu
$Date: 2014-4-25 上午09:30:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_cashflow_monthly_pkg.insert_con_cash_temp_data_job(
p_session_id =>${/session/@session_id},
p_due_date =>to_date(${@due_date},'yyyy-mm-dd'),
p_user_id =>${/session/@user_id},
p_business_type =>${@business_type});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 62cf254f
......@@ -207,8 +207,8 @@
and pq.document_category = 'PROJECT')) other_payment2,
i.pattern,
i.machine_number,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250 and CF_STATUS != 'BLOCK'),0)repur_con_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250 and CF_STATUS != 'BLOCK'),0)repur_con_ddct_amt,
nvl(t.entrusted_amount,0) entrusted_amount,
decode(t.business_type,'LEASEBACK',(f.due_amount-nvl((select to_number(hd.other_payment2)
from hls_fin_calculator_hd hd
......
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @ 62cf254f
......@@ -36,6 +36,7 @@
<a:field name="withhold_way_n" displayField="code_value_name" options="con202_withway_ds" returnField="withhold_way" valueField="code_value"/>
<a:field name="pay_method_n" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="secondary_lease_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease" valueField="code_value"/>
<a:field name="secondary_lease_new_n" displayField="code_value_name" options="secondary_lease_ds" returnField="secondary_lease_new" valueField="code_value"/>
<a:field name="marital_status_flag_n" displayField="code_value_name" options="marital_status_flag_ds" returnField="marital_status_flag" valueField="code_value"/>
<a:field name="sp_sign_flag_n" displayField="code_value_name" options="sp_sign_flag_ds" returnField="sp_sign_flag" valueField="code_value"/>
<a:field name="finance_type"/>
......@@ -126,7 +127,8 @@
<a:column name="bp_category_n" editor="lov" prompt="商业伙伴类型" width="100"/>
<a:column name="vender_id_n" editor="lov" prompt="厂商" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="二次租赁" width="100"/>
<a:column name="secondary_lease_n" editor="cb" prompt="旧机二次租赁" width="100"/>
<a:column name="secondary_lease_new_n" editor="cb" prompt="新机二次租赁" width="100"/>
<a:column name="bp_class_n" editor="cb" prompt="商业伙伴分类" width="100"/>
<a:column name="business_type_n" editor="lov" prompt="业务类型" width="80"/>
<a:column name="business_type" editor="lov" prompt="业务类型" width="80"/>
......
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ 62cf254f
......@@ -7,7 +7,10 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
<a:view>
<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>
<!--<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>-->
<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/>
<a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/>
<script><![CDATA[
function CON321_con_contract_query() {
if ($('con_contract_cashflow_monthly_query_ds').validate()){
......@@ -53,7 +56,7 @@
Leaf.request({
url: $('con_cashflow_pre_query_id').getUrl(),
para: {
due_date : record.get('due_date'),
/*due_date : record.get('due_date'),
division:record.data.division,
bp_id : record.get('bp_id'),
business_type : record.get('business_type'),
......@@ -65,7 +68,7 @@
not_overday3:record.get('not_overday3'),
not_overday4:record.get('not_overday4'),
not_overday5:record.get('not_overday5'),
not_overday6:record.get('not_overday6')
not_overday6:record.get('not_overday6')*/
},
success: function(res) {
Leaf.Masker.unmask (Ext.getBody());
......@@ -85,6 +88,30 @@
}
}
function CON321_con_contract_update() {
var headers_ds = $('con_contract_cashflow_monthly_query_ds');
var record = headers_ds.getAt(0);
Leaf.Masker.mask(Ext.getBody(), '正在更新数据，请稍等...');
Leaf.request({
url: $('con_cashflow_pre_update_id').getUrl(),
para: {
due_date : record.get('due_date'),
business_type : record.get('business_type')
},
success: function(res) {
Leaf.Masker.unmask (Ext.getBody());
},
failure: function() {
Leaf.Masker.unmask (Ext.getBody());
},
error: function() {
Leaf.Masker.unmask (Ext.getBody());
},
scope: this
});
}
function CON321_con_contract_reset() {
$('con_contract_cashflow_monthly_query_ds').reset();
}
......@@ -149,6 +176,7 @@
<a:screenBody>
<a:screenTopToolbar>
<a:gridButton click="CON321_con_contract_query" text="HLS.QUERY"/>
<a:gridButton click="CON321_con_contract_update" text="更新全量数据"/>
<a:gridButton click="CON321_con_contract_reset" text="HLS.RESET"/>
</a:screenTopToolbar>
<a:form bindTarget="con_contract_cashflow_balance_query_ds" column="3" title="收付款预定查询" marginWidth="40">
......@@ -224,8 +252,7 @@
<a:column name="not_due_amount_4" align="center" prompt="未到期4个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_5" align="center" prompt="未到期5个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_6" align="center" prompt="未到期6个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_8" align="center" prompt="未到期8个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_9" align="center" prompt="未到期9个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_10" align="center" prompt="未到期10个月" renderer="Leaf.formatMoney" width="80"/>
......@@ -289,6 +316,7 @@
<a:column name="not_due_amount_68" align="center" prompt="未到期68个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_69" align="center" prompt="未到期69个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_70" align="center" prompt="未到期70个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
<!--<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/>-->
<a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/>
......
src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview
View file @ 62cf254f
......@@ -18,6 +18,7 @@
<a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id"
url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
......@@ -172,7 +173,14 @@
}
var header_id = return_id;
var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
var url;
if ('${/parameter/@upload_flag}' == 'Y') {
url = $('transaction_return_uploadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
} else {
url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
......
src/main/webapp/modules/hls/HLS536/hls_journal_attach_trans_upload.lview
View file @ 62cf254f
......@@ -13,6 +13,7 @@
var year=data[0].year;
var month=data[0].month;
var factory = new Packages.org.apache.commons.fileupload.disk.DiskFileItemFactory();
factory.setSizeThreshold(10);
var up = new Packages.org.apache.commons.fileupload.servlet.ServletFileUpload(factory);
var items = up.parseRequest(request);
var i = items.iterator();
......@@ -57,7 +58,7 @@
if(output!=null){
output.close();
}
raise_app_error('上传文件出错,请联系管理员！');
raise_app_error('上传文件出错,请联系管理员！'+String(e.javaException.getMessage()));
println('上传文件出错,请联系管理员！e');
}
var file_length=get_file_length(file_path+file_name);
......
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