Skip to content

L
leaf-hlcm
Commit 7d5aa7d6 authored by homunculus's avatar homunculus
Browse files
Options

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

parents 538277e2 a913c671
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3201 additions and 340 deletions
src/main/database/Init/Sys_code/INITIALIZE_SYSCODE_SEAL_NUMBER.sql
View file @ 7d5aa7d6
......@@ -18,6 +18,9 @@ sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TW_NUMBER','一式两
sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','ZHS','');
sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_TH_NUMBER','一式三份','US','');
sys_code_pkg.insert_sys_code_value('SEAL_NUMBER','SEAL_O_F_NUMBER','一式四份','ZHS','');
sys_code_pkg.update_sys_code_value('SEAL_NUMBER','SEAL_O_F_NUMBER','一式四份','US','');
end;
/
commit;
......
src/main/database/Package/con_contract_change_req_pkg.pck 0 → 100644
View file @ 7d5aa7d6
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/database/Package/cus_con_change_req_pkg.pck
View file @ 7d5aa7d6
......@@ -175,7 +175,7 @@ create or replace package body cus_con_change_req_pkg is
if p_req_type = 'LEASE_CHAG' then
cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id => v_change_req_id,
p_document_table => 'CON_CONTRACT_CHANGE_REQ',
p_instruments_types => '权力义务转让文本',
p_instruments_types => '权利义务转让文本',
p_common_seal => 'Y',
p_corporate_visa_seal => 'Y',
p_legal_seal => 'N',
......
src/main/database/Package/cus_con_contract_repo_pkg.pck
View file @ 7d5aa7d6
......@@ -199,7 +199,7 @@ create or replace package body cus_con_contract_repo_pkg is
p_con_special_seal => 'N',
p_financial_seal => 'N',
p_supervisio_seal => 'N',
p_seal_number => 'SEAL_O_TW_NUMBER',
p_seal_number => 'SEAL_O_F_NUMBER',
p_user_id => p_user_id);
cus_con_change_req_pkg.insert_hls_document_use_seal(p_change_req_id => v_change_req_id,
p_document_table => 'CON_CONTRACT_CHANGE_REQ',
......@@ -210,7 +210,7 @@ create or replace package body cus_con_contract_repo_pkg is
p_con_special_seal => 'N',
p_financial_seal => 'N',
p_supervisio_seal => 'N',
p_seal_number => 'SEAL_O_TW_NUMBER',
p_seal_number => 'SEAL_O_F_NUMBER',
p_user_id => p_user_id);
p_change_req_id := v_change_req_id;
end;
......
src/main/database/Package/cus_con_et_pkg.pck
View file @ 7d5aa7d6
......@@ -117,7 +117,7 @@ create or replace package body cus_con_et_pkg is
p_con_special_seal => 'N',
p_financial_seal => 'N',
p_supervisio_seal => 'N',
p_seal_number => 'SEAL_O_TW_NUMBER',
p_seal_number => 'SEAL_O_F_NUMBER',
p_user_id => p_user_id);
p_change_req_id := v_change_req_id;
end create_change_req_et;
......@@ -177,6 +177,7 @@ create or replace package body cus_con_et_pkg is
and f.cf_type = 1
and f.contract_id = p_contract_id;
--上一次完全核销现金流
begin
select (p_et_date - f.due_date + 1) fund_possession_time
into v_fund_possession_time
from con_contract_cashflow f
......@@ -186,6 +187,10 @@ create or replace package body cus_con_et_pkg is
and f.cf_type = 1
and f.cf_direction != 'NONCASH'
and f.contract_id = p_contract_id;
exception
when no_data_found then
v_fund_possession_time := 1;
end;
v_fund_possession_cost := v_sum_unreceived_principal *
nvl(v_fund_possession_time, 1) *
NVL(p_et_interest_rate,
......
src/main/database/Register_function/REGISTER_CON_ET003.sql
View file @ 7d5aa7d6
......@@ -30,6 +30,7 @@ sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_et_date_am
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.calc_cashflow');
sys_function_assign_pkg.func_bm_load('CON_ET003','basic.hls_division_for_lov');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON_ET001.submit_change_req');
sys_function_assign_pkg.func_bm_load('CON_ET003','cont.CON701.hls_bp_master_v_all_lov');
--分配菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET003',p_enabled_flag=>'Y',P_USER_ID=>-1);
......
src/main/database/Table/Alter/CSH_PAYMENT_REQ_LN.SQL 0 → 100644
View file @ 7d5aa7d6
alter table csh_payment_req_ln add (vender_bank_account_id number);
comment on column csh_payment_req_ln.vender_bank_account_id is '厂商银行账户id';
\ No newline at end of file
src/main/database/Table/CSH_PAYMENT_REQ_LN.sql 0 → 100644
View file @ 7d5aa7d6
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool CON_CONTRACT.log
PROMPT
PROMPT CREATING TABLE TRAIN_CONFIG
PROMPT ============================
PROMPT
WHENEVER SQLERROR CONTINUE
DROP TABLE CON_CONTRACT;
WHENEVER SQLERROR EXIT FAILURE ROLLBACK
BEGIN
alter table csh_payment_req_ln add (amount_vender number);
alter table csh_payment_req_ln add (amount_agent number);
alter table csh_payment_req_ln add (down_payment_rushoff number);
comment on column csh_payment_req_ln.amount_vender is '应付厂商金额';
comment on column csh_payment_req_ln.amount_agent is '应付代理店金额';
comment on column csh_payment_req_ln.down_payment_rushoff is '首付款抵冲金额';
end;
SPOOL OFF
EXIT
\ No newline at end of file
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 7d5aa7d6
......@@ -11,6 +11,9 @@
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT v.contract_id,
v.vender_id,
v.other_payment2,
'NEW' approval_status,
v.invoice_uploaded_flag,
v.invoice_uploaded_flag_n,
v.times,
......@@ -35,7 +38,8 @@
v.bp_name,
v.bp_code,
v.applied_pay_amount,
v.residual_amount AS amount,
--v.residual_amount AS amount,
0.00 AS amount,
--v.due_amount- NVL(v.applied_pay_amount,0) AS amount,
v.bp_category_desc,
v.search_term_1,
......@@ -192,11 +196,9 @@
WHERE gc.currency_code = t.currency) currency_name,
TO_CHAR(f.due_date, 'yyyy-mm-dd') due_date,
NVL(f.due_amount, 0) - NVL(f.received_amount, 0) residual_amount,
DECODE(f.cf_item,
'62',
NULL,
NVL(${@payment_bp_id},
csh_payment_req_pkg.get_bp_id(t.contract_id))) bp_id,
(select c.bp_id_tenant
from con_contract c
where c.contract_id=t.contract_id ) bp_id,
DECODE(f.cf_item,
'62',
NULL,
......@@ -266,6 +268,24 @@
-- )price
i.price,
i.factory_price,
--获得厂商的相关信息
(select hli.vender_id
from hls_lease_item hli
where hli.lease_item_id =
(select lease_item_id
from con_contract_lease_item c
where c.contract_id = t.contract_id)) vender_id,
--首付款抵充金
(select nvl(hd.other_payment2,0)
from hls_fin_calculator_hd hd
where hd.calc_session_id =
(select PQ.CALC_SESSION_ID
from prj_quotation pq
where pq.document_id = (select cc.project_id
from con_contract cc
where cc.contract_id =f.contract_id)
and pq.document_category = 'PROJECT')) other_payment2,
DECODE(t.division, '10', 'CNYA', '00', 'CNYA', '01', 'CNYB') sap_bvtyp,
(SELECT v.code_value_name
FROM sys_code_values_v v
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm 0 → 100644
View file @ 7d5aa7d6
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: qwm
$Date: 2013-5-24 下午03:50:31
$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 *
from (select c.contract_number,
c.contract_name,
hbm.bp_name,
cpr.bp_bank_account_id,
(select times
from con_contract_cashflow ccc
where ccc.cashflow_id = cpr.ref_doc_line_id) times,
(select ccc.due_amount
from con_contract_cashflow ccc
where ccc.cashflow_id = cpr.ref_doc_line_id) due_amount,
(select description
from hls_cashflow_item hci, con_contract_cashflow ccc
where hci.cf_item = ccc.cf_item
and hci.cf_type = ccc.cf_type
and ccc.cashflow_id = cpr.ref_doc_line_id) CF_DESCRIPTION,
--bp_id 存的是哪个字段
(select bp_name
from hls_bp_master hbm
where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N,
(select hbm.bank_account_num
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NUM,
(select hbm.bank_account_name
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NAME,
--应付我司金额
cpr.amount_agent,
cpr.amount_vender,
(select bp_name
from hls_bp_master hbm
where hbm.bp_id =
(select ccli.vender_id
from con_contract_lease_item ccli,
hls_lease_item hli
where ccli.lease_item_id = hli.lease_item_id
and ccli.contract_id = c.contract_id)) vender_name,
(select hbm.bank_account_name
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_ID,
(select hbm.bank_account_num
from hls_bp_master_bank_account hbm
where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_number,
cpr.amount,
--首付款抵充金额
(select nvl(hd.other_payment2, 0)
from hls_fin_calculator_hd hd
where hd.calc_session_id =
(select PQ.CALC_SESSION_ID
from prj_quotation pq
where pq.document_id =
(select cc.project_id
from con_contract cc
where cc.contract_id = c.contract_id)
and pq.document_category = 'PROJECT')) other_payment2,
(SELECT gc.currency_name
FROM gld_currency_v gc
WHERE gc.currency_code = cpr.currency_code) currency_name,
cpr.payment_req_ln_id,
cpr.payment_req_id,
cpr.payment_req_ln_type,
cpr.ref_doc_id,
cpr.ref_doc_line_id,
cpr.ref_doc_category
from csh_payment_req_ln cpr, con_contract c, hls_bp_master hbm
where cpr.ref_doc_category = 'CONTRACT'
and c.contract_id = cpr.ref_doc_id
and hbm.bp_id = c.bp_id_tenant) v
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="v.payment_req_id =${@payment_req_id}"/>
</bm:data-filters>
<!-- <bm:query-fields>
<bm:query-field name="payment_req_id" queryOperator="="/>
</bm:query-fields>-->
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/hls_lease_item_vender_name_for_lov.lwm 0 → 100644
View file @ 7d5aa7d6
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: qwm
$Date: 2013-5-24 上午11:25:41
$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
distinct vender_name
from hls_lease_item
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="vender_name" databaseType="varchar" datatype="java.lang.String" physicalName="vender_name" forDisplay="true" forQuery="true" prompt="厂商名称"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="vender_name" queryOperator="like"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 7d5aa7d6
......@@ -175,24 +175,43 @@
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
$('${/parameter/@layout_code}_submit_approval').disable();
var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var req_ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
var req_record = $(req_ds_id).getAt(0);
var case_type = '';
var document_type = '${/parameter/@document_type}';
var calc_session_id = req_record.get('calc_session_id');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable()) && $(req_ds_id2).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
// if (req_record.dirty) {
// Leaf.showMessage('${l:HLS.PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// return;
// }
// 回款賬戶變更
if('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY'){
var bank_account_num_s =req_record.get('bank_account_num_s');
var bank_account_num_c =req_record.get('bank_account_num_c');
if(bank_account_num_s == bank_account_num_c){
Leaf.showMessage('警告', '现扣款账号和原扣款账号不能重复！');
return;
}else{
$('${/parameter/@layout_code}_submit_approval').disable();
$('${/parameter/@layout_code}_save').disable();
if('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY'){
if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
$('${/parameter/@layout_code}_quote').disable();
}
$('${/parameter/@layout_code}_user_button1').disable();
setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
}
}else {
$('${/parameter/@layout_code}_submit_approval').disable();
$('${/parameter/@layout_code}_save').disable();
if ('${/parameter/@layout_code}' == 'CON_CHANGE_MODIFY') {
$('${/parameter/@layout_code}_quote').disable();
}
$('${/parameter/@layout_code}_user_button1').disable();
setTimeout(window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](con731_submit), 2000);
}
} else {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
......@@ -485,7 +504,7 @@
}
}else if (name == 'description') {
if (record.get('important_flag') == 'Y') {
return '<font color="RED">' + value + '</font>';
return '<span style="color: RED; ">' + value + '</span>';
}
return value;
}
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 7d5aa7d6
......@@ -218,15 +218,6 @@
}
}
};
//查询时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
if (ds == $(ds_us_id)) {debugger
$(ds).setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
$(ds).setQueryParameter('change_req_id','${/parameter/@change_req_id}');
$(ds).query();
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/cont/CON_REPO001/con_contract_change_repo_detail.lview
View file @ 7d5aa7d6
......@@ -341,7 +341,7 @@
return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}else if (name == 'description') {
if (record.get('important_flag') == 'Y') {
return '<font color="RED">' + value + '</font>';
return '<span style="color: RED; ">' + value + '</span>';
}
return value;
}
......@@ -366,9 +366,9 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
var ds_us_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_03', 'hls_document_use_seal');
if (ds == $(ds_us_id)) {debugger
$(ds).setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
$(ds).setQueryParameter('change_req_id','${/parameter/@change_req_id}');
$(ds).query();
ds.setQueryParameter('document_table','CON_CONTRACT_CHANGE_REQ');
ds.setQueryParameter('change_req_id','${/parameter/@change_req_id}');
ds.query();
}
};
]]></script>
......
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