From 4baeae1df6539f14834e0127b0a20f37235e2086 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 23 Dec 2025 10:29:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4=E5=B8=A6=E4=B8=8A=E6=97=B6=E5=88=86?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/TwoOutTask.java | 8 +++--- .../wms/sch/service/impl/TaskServiceImpl.java | 4 +-- .../src/views/wms/sch/task/index.vue | 27 ++++++++++++++----- 3 files changed, 28 insertions(+), 11 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 2056cbdd6..9ab232f3a 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 @@ -16,6 +16,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata.st.service.StructattrService; import org.nl.wms.basedata.st.service.dto.StructattrDto; import org.nl.wms.sch.AcsTaskDto; @@ -71,7 +72,6 @@ public class TwoOutTask extends AbstractAcsTask { List taskArr = new ArrayList<>(); // 用于判断下发几个任务组 - int flag = 2; // 判断当前正在执行或者下发的任务有几种规格：根据任务组进行判断，同一任务组代表同一木箱规格 List likeAllArr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status IN ('05','06') and is_delete = '0' " ) @@ -80,9 +80,11 @@ public class TwoOutTask extends AbstractAcsTask { Map> likeArr = likeAllArr.stream() .collect(Collectors.groupingBy(row -> row.getString("task_group_id"))); + + int flag = Integer.parseInt(SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("out_queue_num").getValue()); // 判断长度 - if (likeArr.size() >= 2) { - log.warn("twoOutTasklikeArr>2"); + if (likeArr.size() >= flag) { + log.warn("twoOutTasklikeArr>out_queue_num"); return null; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 50d3d58ff..0f4278d10 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -93,10 +93,10 @@ public class TaskServiceImpl implements TaskService { map.put("finishTypeList", whereJson.getString("finishTypeList")); } if (StrUtil.isNotEmpty(whereJson.getString("begin_time"))) { - map.put("begin_time", whereJson.getString("begin_time").substring(0, 10)+" 00:00:00"); + map.put("begin_time", whereJson.getString("begin_time")); } if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) { - map.put("end_time", whereJson.getString("end_time").substring(0, 10)+" 99:99:99"); + map.put("end_time", whereJson.getString("end_time")); } if (StrUtil.isNotEmpty(whereJson.getString("is_delete"))) { map.put("is_delete", whereJson.getString("is_delete")); 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 c6d9b33c5..c0b1acf3d 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -83,7 +83,7 @@ { this.finishTypeList = data }) - const afterD = new Date(new Date().getTime() + 2 * 8.64E7) - this.crud.query.createTime = [new Date().daysAgo(3), afterD] + const today = new Date() + const year = today.getFullYear() + const month = String(today.getMonth() + 1).padStart(2, '0') + const day = String(today.getDate()).padStart(2, '0') + + // 2. 构造固定时分秒的时间字符串（符合datetime-local格式） + const startTime = `${year}-${month}-${day - 3} 00:00:00` + const endTime = `${year}-${month}-${day} 23:59:59` + this.crud.query.createTime = [startTime, endTime] }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { if (this.query_flag) { - 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') + const today = new Date() + const year = today.getFullYear() + const month = String(today.getMonth() + 1).padStart(2, '0') + const day = String(today.getDate()).padStart(2, '0') + + // 2. 构造固定时分秒的时间字符串（符合datetime-local格式） + const startTime = `${year}-${month}-${day - 3} 00:00:00` + const endTime = `${year}-${month}-${day} 23:59:59` + this.crud.query.createTime = [startTime, endTime] + this.crud.query.begin_time = startTime + this.crud.query.end_time = endTime this.query_flag = false } },