Skip to content

L
leaf-hlcm
Commit a4349bf3 authored by liyuan.chen's avatar liyuan.chen
Browse files
Options

Merge branch 'feature/商业伙伴维护修改等' into develop

parents bdb19a8a 1b41fda0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1193 additions and 148 deletions
pom.xml
View file @ a4349bf3
...@@ -159,6 +159,13 @@ ...@@ -159,6 +159,13 @@
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-2.2.2.jar</systemPath> <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-2.2.2.jar</systemPath>
</dependency> </dependency>
<dependency>
<groupId>com.gson</groupId>
<artifactId>sys-gson</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gson-2.6.2.jar</systemPath>
</dependency>
<!--end --> <!--end -->
......
src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
View file @ a4349bf3
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -609,7 +609,7 @@ ...@@ -609,7 +609,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -798,7 +798,7 @@ ...@@ -798,7 +798,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -866,7 +866,7 @@ ...@@ -866,7 +866,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0) + cwo.write_off_due_amount) As due_amount, 0) + cwo.write_off_due_amount) As due_amount,
--收款日 --收款日
...@@ -879,7 +879,7 @@ ...@@ -879,7 +879,7 @@
From csh_write_off tn From csh_write_off tn
Where tn.cashflow_id = Where tn.cashflow_id =
cwo.cashflow_id cwo.cashflow_id
And tn.creation_date <= And tn.creation_date &lt;=
cwo.creation_date), cwo.creation_date),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
...@@ -1011,7 +1011,7 @@ ...@@ -1011,7 +1011,7 @@
(Select cl.machine_number (Select cl.machine_number
From con_contract_lease_item cl From con_contract_lease_item cl
Where cl.contract_id = c.contract_id) As machine_number, Where cl.contract_id = c.contract_id) As machine_number,
to_char(Sysdate, &apos;yyyy"年"mm"月"dd"日"&apos;) As today to_char(Sysdate, 'yyyy"年"mm"月"dd"日"') As today
From con_contract c, hls_bp_master hb From con_contract c, hls_bp_master hb
Where c.bp_id_tenant = hb.bp_id Where c.bp_id_tenant = hb.bp_id
and c.contract_id = #{contractId} and c.contract_id = #{contractId}
......
src/main/resources/config.properties
View file @ a4349bf3
...@@ -9,7 +9,7 @@ redis.sentinel=\ ...@@ -9,7 +9,7 @@ redis.sentinel=\
redis.useSentinel=false redis.useSentinel=false
redis.ip=localhost redis.ip=localhost
redis.port=7777 redis.port=6379
redis.db=10 redis.db=10
#db.jndiName=java:comp/env/jdbc/hap_dev #db.jndiName=java:comp/env/jdbc/hap_dev
...@@ -19,7 +19,7 @@ redis.db=10 ...@@ -19,7 +19,7 @@ redis.db=10
db.type=oracle db.type=oracle
db.driverClassName=oracle.jdbc.driver.OracleDriver db.driverClassName=oracle.jdbc.driver.OracleDriver
db.url=jdbc:oracle:thin:@10.200.17.100:1521/HLS db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl
db.username=hl_cm_dev db.username=hl_cm_dev
db.password=hl_cm_dev db.password=hl_cm_dev
db.maxPoolSize=100 db.maxPoolSize=100
......
src/main/resources/profiles/dev/config.properties
View file @ a4349bf3
...@@ -9,7 +9,7 @@ redis.sentinel=\ ...@@ -9,7 +9,7 @@ redis.sentinel=\
redis.useSentinel=false redis.useSentinel=false
redis.ip=localhost redis.ip=localhost
redis.port=7777 redis.port=6379
redis.db=2 redis.db=2
#db.jndiName=java:comp/env/jdbc/hap_dev #db.jndiName=java:comp/env/jdbc/hap_dev
...@@ -19,7 +19,7 @@ redis.db=2 ...@@ -19,7 +19,7 @@ redis.db=2
db.type=oracle db.type=oracle
db.driverClassName=oracle.jdbc.driver.OracleDriver db.driverClassName=oracle.jdbc.driver.OracleDriver
db.url=jdbc:oracle:thin:@10.200.17.100:1521/HLS db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl
db.username=hl_cm_dev db.username=hl_cm_dev
db.password=hl_cm_dev db.password=hl_cm_dev
db.maxPoolSize=100 db.maxPoolSize=100
......
src/main/webapp/WEB-INF/classes/hls/HLS214N/hls_bp_master_req_create.lwm 0 → 100644
View file @ a4349bf3
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2015-11-12 下午2:15:58
$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_change_req_pkg.hls_bp_master_req_ins(p_bp_id => ${@bp_id},
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id},
p_change_type => ${@change_type},
p_change_req_id => ${@change_req_id});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" output="true" outputPath="@change_req_id"/>
</bm:parameters>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
hls_bp_master_change_req_pkg.hls_bp_master_basic_ins(p_bp_id => ${@bp_id},
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id},
p_change_req_id => ${@change_req_id});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="change_req_id" dataType="java.lang.Long" output="true" outputPath="@change_req_id"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS214N/hls_bp_master_req_submit.lwm 0 → 100644
View file @ a4349bf3
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2015-11-12 下午2:15:58
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
hls_bp_master_change_req_pkg.hls_bp_master_wfl_submit(p_change_req_id => ${@change_req_id},
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/uncertain.local.xml
View file @ a4349bf3
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<uncertain-engine defaultLogLevel="INFO"> <uncertain-engine defaultLogLevel="INFO">
<path-config logPath="D:\install_soft\jenkins_logs" uiPackageBasePath="D:\install_soft\apache-tomcat-jenkins\webapps\hlcm\lib\LeafUI\src"/> <path-config logPath="D:\Users\Leauan\Logs\HLCM_Log" uiPackageBasePath="D:\Users\Leauan\workspace\leaf-hlcm\target\hlcm\lib\LeafUI\src"/>
</uncertain-engine> </uncertain-engine>
\ No newline at end of file
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview
View file @ a4349bf3
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
modelaction="update"/> modelaction="update"/>
<a:link id="hls_bp_master_modify_link" <a:link id="hls_bp_master_modify_link"
url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_modify.lview"/> url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_modify.lview"/>
<a:link id="hls_bp_master_req_modify_link"
url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_req_modify.lview"/>
<a:link id="Identity_ccx_link" <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/> url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>
<a:link id="IcInfo_ccx_link" <a:link id="IcInfo_ccx_link"
...@@ -34,60 +36,112 @@ ...@@ -34,60 +36,112 @@
//信息变更 //信息变更
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
var data=$(ds_id).selected[0]; var record=$(ds_id).selected[0];
var bp_class = data.get('bp_class'); var param = record.data;
var bp_class = record.get('bp_class');
if(record.get('bp_wfl_status') == 'APPROVING'){
// 展示变更信息
param['function_code'] = 'HLS214BR';
param['function_usage'] = 'QUERY';
param['bp_class'] = bp_class;
param['change_req_id'] = record.get('invoice_change_id');
param['document_id'] = record.get('invoice_change_id');
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
}else {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var url = '${/request/@context_path}/autocrud/hls.HLS214N.hls_bp_master_req_create/update';
Leaf.request({
url: url,
para: {
bp_id: record.get('bp_id'),
change_type: 'INVOICE_REQ'
},
success: function (res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
if (res.result.change_req_id) {
debugger;
param['winid'] = 'bp_master_invoice_detail_win';
param['function_code'] = 'HLS214B';
param['bp_class'] = bp_class;
param['url_title'] = '开票申请信息';
param['change_req_id'] = res.result.change_req_id;
param['document_id'] = res.result.change_req_id;
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'MODIFY';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_billing_link', ds_id);
}
if(bp_class == 'NP'){
Leaf.showMessage('${l:PROMPT}', '只有法人类型商业伙伴才可以修改开票信息！');
return false;
}else if(bp_class == 'ORG'){
var invoice_bp_bank_account = data.get('invoice_bp_bank_account');
var invoice_title = data.get('invoice_title');
var invoice_bp_address_phone_num = data.get('invoice_bp_address_phone_num');
var phone =data.get('phone');
var taxpayer_type =data.get('taxpayer_type');
var invoice_bp_bank =data.get('invoice_bp_bank');
var ref_v07=data.get('ref_v07');
var bp_id=data.get('bp_id');
new Leaf.Window({
id: 'hls_bp_master_billing',
url: $('hls_bp_master_billing_link').getUrl(),
params: {
function_code:'HLS214NS',
invoice_bp_bank_account:invoice_bp_bank_account,
invoice_title:invoice_title,
invoice_bp_address_phone_num:invoice_bp_address_phone_num,
phone:phone,
taxpayer_type:taxpayer_type,
invoice_bp_bank:invoice_bp_bank,
bp_id:bp_id,
ref_v07:ref_v07
}, },
title: '开票信息', failure: function () {
fullScreen: true window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
}); });
} }
};
}
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master'); // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
function open_bp_modify_win(ds_id, record_id) { function open_bp_modify_win(ds_id, record_id) {
var user_category ='${/model/default_value/record/@user_category}'; debugger;
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var bp_class = record.get('bp_class');
var user_category ='${/model/default_value/record/@user_category}';
var submit_flag = record.get('submit_flag');
var param = record.data; var param = record.data;
param['function_code'] = 'HLS214D'; if(record.get('bp_wfl_status') == 'APPROVING'){
// debugger; // 展示原始信息，后续待定
// if (record.get('bp_category') == 'AGENT') { param['function_code'] = 'HLS215D';
// param['function_code'] = 'HLS228DL'; param['function_usage'] = 'QUERY';
// } param['bp_class'] = bp_class;
param['function_usage'] = 'MODIFY'; param['cond_para1'] = user_category;
param['bp_class'] = record.get('bp_class'); param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
param['cond_para1'] = user_category; hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}'; }else{
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id); if(submit_flag == 'Y'){
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var url = '${/request/@context_path}/autocrud/hls.HLS214N.hls_bp_master_req_create/execute';
Leaf.request({
url: url,
para: {
bp_id: record.get('bp_id') },
success: function (res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
if(res.result.change_req_id){
debugger;
param['function_code'] = 'HLS214F';
param['function_usage'] = 'MODIFY';
param['bp_class'] = bp_class;
param['change_req_id'] = res.result.change_req_id;
param['document_id'] = res.result.change_req_id;
param['cond_para1'] = user_category;
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_req_modify_link', ds_id);
}
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}else{
param['function_code'] = 'HLS214D';
param['function_usage'] = 'MODIFY';
param['bp_class'] = bp_class;
param['cond_para1'] = user_category;
param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
}
}
} }
function open_ccx_detail_win(ds_id, record_id) { function open_ccx_detail_win(ds_id, record_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