From 78cf390d5cdac918463fb84182f9c739ec8d22ef Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 16:44:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/res/collect/CollectOrderBizResponse.java  | 1 +
 .../com/glxp/api/service/collect/IoCollectLedGroupService.java  | 2 +-
 .../mybatis/mapper/collect/IoCollectOrderBizMapper.xml          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index e722f2c64..1dfe13285 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -184,6 +184,7 @@ public class CollectOrderBizResponse {
     private String checkCode;
 
     private String queueCode;
+    private String prepnSpec;
     private Integer ledNum;
 
     /**
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
index eb91d0e4a..d4700239d 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
@@ -157,7 +157,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
         //如果为null 当前灯组已满
         if (orderLeds.isEmpty()) {
             // 如果没有可用灯组，抛出异常或返回 null
-            throw new JsonException("当前灯组已满!");
+            throw new JsonException("没有可用灯组!");
         }
         SysOrderLed orderLed = orderLeds.get(0);
         //if 没有满 设置订单id
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index 965db569f..0ba9e7ece 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -8,6 +8,7 @@
                bp.zczbhhzbapzbh,
                bp.manufactory,
                COALESCE(bp.bzgg, icob.ggxh) AS spec,
+               bp.prepnSpec AS prepnSpec,
                sys_workplace_queue.code
         FROM io_collect_order_biz icob
                  left join basic_udirel bu on icob.relId = bu.id