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<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
-                .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();