From 1368cc55aa78468dabd4ad12da631764a95a6491 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 22 Jan 2026 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?remove=EF=BC=9A=E5=8F=96=E6=B6=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java | 3 --- .../org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java | 3 --- .../wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java | 3 --- .../wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java | 3 --- .../wms/sch_manage/service/util/tasks/IntermediateOutTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/PalletOutTask.java | 3 --- .../wms/sch_manage/service/util/tasks/PalletizingAddTask.java | 3 --- .../wms/sch_manage/service/util/tasks/PalletizingDownTask.java | 3 --- .../wms/sch_manage/service/util/tasks/PreProcessingInTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/ProduceInTask.java | 3 --- .../org/nl/wms/sch_manage/service/util/tasks/RawInTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/TabletingInTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java | 3 --- 15 files changed, 45 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java index 3b927b7..afcd5fd 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java @@ -160,9 +160,6 @@ public class CallMaterialTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java index a760b56..d385406 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java @@ -176,9 +176,6 @@ public class CenterInTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java index f800e0b..3cb90d4 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java @@ -175,9 +175,6 @@ public class EmptyDiskConveyTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java index cb6f986..5eb0bed 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java @@ -176,9 +176,6 @@ public class EmptyDiskEnterTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java index 6e3d1a6..6b0e68f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java @@ -167,9 +167,6 @@ public class IntermediateOutTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java index ca953e6..44822d6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java @@ -182,9 +182,6 @@ public class MaterialBackTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java index aca0199..63f9fbe 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java @@ -177,9 +177,6 @@ public class PalletOutTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java index 50f47b3..3fbc58f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java @@ -162,9 +162,6 @@ public class PalletizingAddTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java index ca38cea..246dcde 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java @@ -177,9 +177,6 @@ public class PalletizingDownTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java index 4c41146..2331853 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java @@ -171,9 +171,6 @@ public class PreProcessingInTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java index c8d9651..2feeb88 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java @@ -176,9 +176,6 @@ public class ProduceInTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java index 8c83f50..4d3250a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java @@ -183,9 +183,6 @@ public class RawInTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java index 9d1f86a..955a8f2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java @@ -208,9 +208,6 @@ public class TabletingInTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java index 42050f6..c28d711 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java @@ -180,9 +180,6 @@ public class WrappingDownTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java index 4659d77..51d4f5a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java @@ -178,9 +178,6 @@ public class WrappingUpTask extends AbstractTask { if (ObjectUtil.isEmpty(taskObj)) { throw new BadRequestException("该任务不存在"); } - if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) { - throw new BadRequestException("任务状态必须为生成才能取消任务"); - } this.cancelTask(taskObj); }