Skip to content

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

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

parents 7e7a1d93 63f4ad4b
Hide whitespace changes
Inline Side-by-side
Showing with 342 additions and 27 deletions
src/main/java/com/hand/hls/hlcm/hlinteface/JycDemo.java 0 → 100644
View file @ f9a27fd0
package com.hand.hls.hlcm.hlinteface;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
public class JycDemo {
public static String doGet(String httpUrl){
//链接
System.setProperty("javax.net.ssl.keyStore", "D:/jks/hlltrust2.jks");
System.setProperty("javax.net.ssl.keyStorePassword", "123456");
System.setProperty("https.protocols", "TLSv1.2");
System.out.println("======>2222222");
HttpURLConnection connection = null;
InputStream is = null;
BufferedReader br = null;
StringBuffer result = new StringBuffer();
try {
//创建连接
URL url = new URL(httpUrl);
connection = (HttpURLConnection) url.openConnection();
//设置请求方式、
connection.setRequestMethod("GET");
//设置连接超时时间
connection.setReadTimeout(15000);
//开始连接
connection.connect();
//获取响应数据
if (connection.getResponseCode() == 200) {
//获取返回的数据
is = connection.getInputStream();
if (null != is) {
br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
String temp = null;
while (null != (temp = br.readLine())) {
result.append(temp);
}
}
}
} catch (IOException e) {
e.printStackTrace();
} finally {
if (null != br) {
try {
br.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (null != is) {
try {
is.close();
} catch (IOException e) {
e.printStackTrace();
}
}
//关闭远程连接
connection.disconnect();
}
return result.toString();
}
public static void main(String[] args) throws Exception{
String message = doGet("https://sys-dev.hongling.sh.cn/hlcm_dev_2023/wjflwar2/getEquStatus?equNo=SY036EBJ27118&type=wj&reqClientIp=39.97.244.233");
System.out.println(message);
}
}
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm
View file @ f9a27fd0
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/> <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/> <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/> <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/> <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/> <bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
......
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_vender_lov.lwm
View file @ f9a27fd0
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<bm:fields> <bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/> <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/> <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/> <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/> <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ f9a27fd0
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
t1.bp_id_tenant, t1.bp_id_tenant,
t1.bp_id_agent_level1, t1.bp_id_agent_level1,
(select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name, (select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
(SELECT u.unit_name from exp_org_unit_v u,hls_bp_master h
WHERE u.unit_id = h.unit_id and h.bp_id=t1.bp_id_tenant) agent_name,
(SELECT sc.code_value_name (SELECT sc.code_value_name
FROM sys_code_values_v sc FROM sys_code_values_v sc
WHERE sc.code = 'CON500_CONTRACT_STATUS' WHERE sc.code = 'CON500_CONTRACT_STATUS'
...@@ -56,6 +58,7 @@ select t.parent_company_id company_id ...@@ -56,6 +58,7 @@ select t.parent_company_id company_id
<bm:field name="division"/> <bm:field name="division"/>
<bm:field name="business_type_n"/> <bm:field name="business_type_n"/>
<bm:field name="search_term_1"/> <bm:field name="search_term_1"/>
<bm:field name="agent_name"/>
</bm:fields> </bm:fields>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="contract_id" queryOperator="="/> <bm:query-field field="contract_id" queryOperator="="/>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js
View file @ f9a27fd0
...@@ -6,8 +6,13 @@ ...@@ -6,8 +6,13 @@
{ {
name : 'approval_date_to', name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')" queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
override(); override();
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js
View file @ f9a27fd0
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
{ {
name : 'approval_date_to', name : 'approval_date_to',
queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')" queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
......
src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js
View file @ f9a27fd0
...@@ -14,8 +14,13 @@ ...@@ -14,8 +14,13 @@
{ {
name : 'collection_classes', name : 'collection_classes',
queryexpression : "collection_classes = ${@collection_classes}" queryexpression : "collection_classes = ${@collection_classes}"
},
{
name : 'if_history',
queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
} }
]; ];
override(); override();
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ f9a27fd0
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
<a:column name="search_term_1" align="center" prompt="厂商合同编号" width="100"/> <a:column name="search_term_1" align="center" prompt="厂商合同编号" width="100"/>
<a:column name="business_type_n" align="center" prompt="业务类型" width="80"/> <a:column name="business_type_n" align="center" prompt="业务类型" width="80"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="100"/> <a:column name="contract_status_desc" prompt="合同状态" align="center" width="100"/>
<a:column name="agent_name" prompt="代理店简称" align="center" width="100"/>
<a:column name="bp_name" prompt="客户名" width="250"/> <a:column name="bp_name" prompt="客户名" width="250"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ f9a27fd0
...@@ -126,19 +126,107 @@ ...@@ -126,19 +126,107 @@
pay_type = 'MANAGE'; pay_type = 'MANAGE';
} }
new Leaf.Window({ if(ds_id==req_ln_ds_id){
id: 'choose_acount_window', if(req_ln_records[0].get('if_history') == 'Y'){
url: $('pageLink_choose_acount').getUrl(), Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
params: { new Leaf.Window({
winId: 'choose_acount_window', id: 'choose_acount_window',
ds_id: ds_id, url: $('pageLink_choose_acount').getUrl(),
button_id: 'create_with_sbo', params: {
pay_type: pay_type winId: 'choose_acount_window',
}, ds_id: ds_id,
title: '支付账号选择', button_id: 'create_with_sbo',
height: 260, pay_type: pay_type
width: 680 },
}); title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==con_ds_id){
if(con_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==manage_ds_id){
if(manage_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_with_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
}; };
//创建强制付款单生成 //创建强制付款单生成
...@@ -196,19 +284,108 @@ ...@@ -196,19 +284,108 @@
pay_type = 'MANAGE'; pay_type = 'MANAGE';
} }
new Leaf.Window({ if(ds_id==req_ln_ds_id){
id: 'choose_acount_window', if(req_ln_records[0].get('if_history') == 'Y'){
url: $('pageLink_choose_acount').getUrl(), Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
params: { new Leaf.Window({
winId: 'choose_acount_window', id: 'choose_acount_window',
ds_id: ds_id, url: $('pageLink_choose_acount').getUrl(),
button_id: 'create_without_sbo', params: {
pay_type: pay_type winId: 'choose_acount_window',
}, ds_id: ds_id,
title: '支付账号选择', button_id: 'create_without_sbo',
height: 260, pay_type: pay_type
width: 680 },
}); title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==con_ds_id){
if(con_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
if(ds_id==manage_ds_id){
if(manage_records[0].get('if_history') == 'Y'){
Leaf.showConfirm('${l:HLS.PROMPT}', '当前单据存在历史被关闭付款单，您确认生成吗？', function() {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
});
}else {
new Leaf.Window({
id: 'choose_acount_window',
url: $('pageLink_choose_acount').getUrl(),
params: {
winId: 'choose_acount_window',
ds_id: ds_id,
button_id: 'create_without_sbo',
pay_type: pay_type
},
title: '支付账号选择',
height: 260,
width: 680
});
}
}
}; };
//创建代付单 //创建代付单
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
...@@ -342,7 +519,52 @@ ...@@ -342,7 +519,52 @@
} }
}; };
//查询时调用(grid,table,gridBox)
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var formr_m_ds_id = '${/parameter/@layout_code}_M_F_QUERY__ds';
var req_ln_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var manage_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'M_RESULT', 'csh_payment_req_ln');
if(form_ds_id && ds.id==req_ln_ds_id){
var form_record = $(form_ds_id).getAt(0);
var if_history = form_record.get('if_history');
}
if(formr_r_ds_id && ds.id==con_ds_id){
var form_r_record = $(formr_r_ds_id).getAt(0);
var r_if_history = form_r_record.get('if_history');
}
if(formr_m_ds_id && ds.id==manage_ds_id){
var form_m_record = $(formr_m_ds_id).getAt(0);
var m_if_history = form_m_record.get('if_history');
}
if(ds.id==req_ln_ds_id && req_ln_ds_id){
if(if_history == 'Y'){
$(req_ln_ds_id).setQueryParameter('if_history','Y');
}else {
$(req_ln_ds_id).setQueryParameter('if_history','N');
}
}
if(ds.id==con_ds_id && con_ds_id){
if(r_if_history == 'Y'){
$(con_ds_id).setQueryParameter('if_history','Y');
}else {
$(con_ds_id).setQueryParameter('if_history','N');
}
}
if(ds.id==manage_ds_id && manage_ds_id){
if(m_if_history == 'Y'){
$(manage_ds_id).setQueryParameter('if_history','Y');
}else {
$(manage_ds_id).setQueryParameter('if_history','N');
}
}
};
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view> </a:view>
</a:screen> </a:screen>
\ No newline at end of file
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