From 2c8fd67be78c832f20dd702e10406dc31bac3cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 5 Jan 2026 13:37:53 +0800
Subject: [PATCH] 1

---
 .../modules/automatedWarehouse/task/WcsTaskScheduler.java   | 6 +++---
 .../other/service/impl/InventoryMoveServiceImpl.java        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
index b31f674..ae73155 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
@@ -52,9 +52,9 @@ public class WcsTaskScheduler {
     @Scheduled(fixedDelay = 2684)
     public void scheduleWcsTaskProcessing() {
         // 检查定时任务开关
-         if (!enabled) {
-             return;
-         }
+        //  if (!enabled) {
+        //      return;
+        //  }
         
         log.info("=== 开始处理WCS入库/出库相关业务 ===");
         
diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
index 28885c7..92c2925 100644
--- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
@@ -324,7 +324,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
 
                group.totalQty = group.totalQty.add(hu.getQty());
                // 拼接逻辑：如果为空直接赋值，否则加前缀
-               if (group.serialNos.isEmpty()) {
+               if (group.serialNos==null||group.serialNos.isEmpty()) {
                    group.serialNos = hu.getUnitId();
                } else {
                    group.serialNos += ";" + hu.getUnitId();