From 3b60fb6f3aed944b06fb2abc60f87d3f42dbff7d Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 25 Apr 2025 16:45:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E5=BA=93=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=BB=BB=E5=8A=A1=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java | 5 ++++- lms/nladmin-ui/.env.development | 4 ++-- lms/nladmin-ui/src/views/wms/sch/task/index.vue | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index 6e96975a4..3ad577019 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -211,7 +211,10 @@ public class TwoOutTask extends AbstractAcsTask { try { this.immediateNotifyAcs(null); }catch (Exception ex){ - log.warn("载具出库批量下发异常",ex.getMessage()); + log.warn("载具出库批量下发异常",ex.getMessage()); + if (!ex.getMessage().equals("存在相同的任务号")){ + throw new BadRequestException(ex.getMessage()); + } } } }, "cratergv", 30, this); diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development index 0c07ee0df..13c9fc5ce 100644 --- a/lms/nladmin-ui/.env.development +++ b/lms/nladmin-ui/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8013' -VUE_APP_WS_API = 'ws://localhost:8013' +VUE_APP_BASE_API = 'http://10.1.3.91:8013' +VUE_APP_WS_API = 'ws://10.1.3.91:8013' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 9d418f9d8..74651f490 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -269,14 +269,16 @@ export default { crudTask.getFinishType().then(data => { this.finishTypeList = data }) - this.crud.query.createTime = [new Date().daysAgo(7), new Date()] + const afterD = new Date(new Date().getTime() + 2 * 8.64E7) + this.crud.query.createTime = [new Date().daysAgo(3), afterD] }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { if (this.query_flag) { - this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh') - this.crud.query.end_time = (new Date()).strftime('%F', 'zh') + const afterD = new Date(new Date().getTime() + 2 * 8.64E7) + this.crud.query.begin_time = (new Date().daysAgo(3)).strftime('%F', 'zh') + this.crud.query.end_time = (afterD).strftime('%F', 'zh') this.query_flag = false } },