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();