diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue index f528257..1d9733d 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue @@ -29,17 +29,17 @@ export default { return { url: {list: '/inventory/inventoryDetail/list'}, columns: [ - {title: '容器编码', align: 'center', width: '25%', dataIndex: 'containerCode'}, - {title: '库位编码', align: 'center', width: '25%', dataIndex: 'locationCode'}, - {title: '库区', align: 'center', width: '20%', dataIndex: 'zoneCode'}, - {title: '物料编码', align: 'center', width: '20%', dataIndex: 'materialCode'}, - {title: '物料名称', align: 'center', width: '20%', dataIndex: 'materialName'}, - {title: '物料数量', align: 'center', width: '20%', dataIndex: 'qty'}, + {title: '容器编码', align: 'center', width: '15%', dataIndex: 'containerCode'}, + {title: '库位编码', align: 'center', width: '15%', dataIndex: 'locationCode'}, + {title: '库区', align: 'center', width: '15%', dataIndex: 'zoneCode'}, + {title: '物料编码', align: 'center', width: '15%', dataIndex: 'materialCode'}, + {title: '物料名称', align: 'center', width: '15%', dataIndex: 'materialName'}, + {title: '物料数量', align: 'center', width: '15%', dataIndex: 'qty'}, ], // 定义在这里的参数都是可以在外部传递覆盖的,可以更灵活的定制化使用的组件 default: { name: "编码", - width: 1200, + width: 1300, displayKey: 'containerCode', returnKeys: ['id', 'containerCode'], queryParamText: '容器编码', diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java index 434e741..209a7f7 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java @@ -149,17 +149,24 @@ public class OkHttpUtils { String errorString = StrUtil.format("执行GET请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString); throw new JeecgBootException(errorString, e); } catch (SocketTimeoutException e) { String errorString = StrUtil.format("执行GET请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString); + throw new JeecgBootException(errorString, e); + } catch (IOException e) { + String errorString = + StrUtil.format("执行GET请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); + ApiLoggerAspect.setApiLogException(apiLog, e); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString); throw new JeecgBootException(errorString, e); } catch (Exception e) { String errorString = StrUtil.format("执行GET请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); + ApiLoggerAspect.setApiLogException(apiLog, e); sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString); throw new JeecgBootException(errorString, e); } finally { @@ -210,17 +217,24 @@ public class OkHttpUtils { String errorString = StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString); throw new JeecgBootException(errorString, e); } catch (SocketTimeoutException e) { String errorString = StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString); + throw new JeecgBootException(errorString, e); + } catch (IOException e) { + String errorString = + StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); + ApiLoggerAspect.setApiLogException(apiLog, e); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString); throw new JeecgBootException(errorString, e); } catch (Exception e) { String errorString = StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); + ApiLoggerAspect.setApiLogException(apiLog, e); sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString); throw new JeecgBootException(errorString, e); } finally { @@ -262,13 +276,19 @@ public class OkHttpUtils { String errorString = StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString); throw new JeecgBootException(errorString, e); } catch (SocketTimeoutException e) { String errorString = StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); ApiLoggerAspect.setApiLogException(apiLog, e); - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString); + throw new JeecgBootException(errorString, e); + } catch (IOException e) { + String errorString = + StrUtil.format("执行POST请求异常,url: {},执行耗时:{}ms,异常信息:{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); + ApiLoggerAspect.setApiLogException(apiLog, e); + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString); throw new JeecgBootException(errorString, e); } catch (Exception e) { String errorString =