From ff5fc6c92d13d704cfdb6d356446cd99b5ccb982 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Thu, 8 May 2025 15:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=E4=BF=AE=E5=A4=8D---=E7=AB=99?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=AB=99=E5=8F=B0=E6=9C=AA?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/serviceImplements/WorkServiceImplements.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
index 0051721..59f8f29 100644
--- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
+++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
@@ -677,9 +677,14 @@ public class WorkServiceImplements implements IWorkService {
             List<Stand> usablePickStands = allPickStands.stream().filter(stand -> stand.getStandStatus() == 0).toList();
             if (usablePickStands.size() != allPickStands.size()) {
                 logger.info("站台未全部释放，不执行分配。");
+                return;
             }
             // 映射出站台号
             List<String> standIds = usablePickStands.stream().map(Stand::getStandId).distinct().toList();
+            if (standIds.isEmpty()) {
+                logger.info("没有站台能够分配，不执行分配。");
+                return;
+            }
             // 查询出所有的工作流
             List<WorkFlow> allCurrentWorks = workFlowService.list();
             // 查询这些站台是否已经分配了工作
@@ -740,7 +745,8 @@ public class WorkServiceImplements implements IWorkService {
                     .eq(ETagLocation::getELocationStatus, 0)
                     .orderByAsc(ETagLocation::getSequenceId));
             // 获取已经添加的电子标签库位分配
-            List<ELocationConfig> oldELocationConfigs = eLocationConfigService.list();
+            List<ELocationConfig> oldELocationConfigs = eLocationConfigService.list(new LambdaQueryWrapper<ELocationConfig>()
+                    .in(ELocationConfig::getWorkStation, standIds));
             if (oldELocationConfigs != null && !oldELocationConfigs.isEmpty()) {
                 logger.info("存在旧的标签配置，不执行分配。");
                 return;