From 8e5dbaab1026d283069a4ce56639bf7f91c85323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM>
Date: Mon, 27 Oct 2025 15:15:55 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BA=91=E5=8D=97=E5=AF=8C=E4=BD=B3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conveyor/belt_conveyor/BeltConveyorDeviceDriver.java       | 3 +++
 .../org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java   | 1 -
 .../src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
index d726940..7a3bf5a 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
@@ -489,6 +489,9 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                         logDto2.setLog_level(4);
                         luceneExecuteLogService.deviceExecuteLog(logDto2);
                     }
+                } else {
+                    log.info("当前RFID没有读到值，无法发起任务。");
+                    return false;
                 }
             }
         }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index a4adb6b..8c16c15 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -454,7 +454,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             return result;
         } finally {
             MDC.remove(log_file_type);
-
         }
     }
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java
index 1ecabdf..c27b1d4 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java
@@ -64,7 +64,7 @@ public enum TaskStatusEnum {
 
     public static String getName(String code) {
         for (TaskStatusEnum c : TaskStatusEnum.values()) {
-            if (c.code == code) {
+            if (c.code .equals(code)) {
                 return c.name;
             }
         }