From 64dcbe1e79b9b828d70d8407c4679c915d5eded7 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 23 Aug 2023 18:42:25 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E7=A9=BA=E6=A1=86?= =?UTF-8?q?=E9=80=81=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/extendtask/wash/WashCallEmptyTask.java | 8 ++------ .../service/extendtask/wash/WashSendMaterialTask.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java index 5fbb72c5..eee1c6c2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java @@ -106,12 +106,8 @@ public class WashCallEmptyTask extends AbstractAcsTask { public String createTask(JSONObject param) { List list = taskService.list(new QueryWrapper() - .lt("task_status", StatusEnum.TASK_FINISH.getCode()).nested( - i->i.eq("point_code3", param.getString("device_code")) - .or() - .eq("point_code1", param.getString("device_code")) - ) - ); + .lt("task_status", StatusEnum.TASK_FINISH.getCode()) + .eq("point_code3", param.getString("device_code"))); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java index 487021b6..8d89ab9d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java @@ -80,7 +80,7 @@ public class WashSendMaterialTask extends AbstractAcsTask { .eq("point_code3", start_point_code)) ); if (!CollectionUtils.isEmpty(list)){ - throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); + throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()).toString(), param.getString("device_code"))); } SchBaseTask order = taskService.getById(param.getString("task_id")); JSONObject form = new JSONObject();