From f144c0729d1d40e4b8c1e2154c2323243ecb7ff5 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 21 Feb 2025 11:19:28 +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

---
 .../com/glxp/api/res/basic/SysWorkplaceQueueResponse.java     | 1 +
 .../mybatis/mapper/basic/SysWorkplaceQueueMapper.xml          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
index 2082d885e..56965a023 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
@@ -91,6 +91,7 @@ public class SysWorkplaceQueueResponse {
      * 所属工位名称
      */
     private String workplaceName;
+    private String prepnSpec;
 
     /**
      * 灯组标签
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 215fbca26..343492d80 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -41,10 +41,10 @@
         select swq.*,
                bp.nameCode,
                COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
-               bp.cpmctymc,sys_workplace.workplaceName
+               bp.cpmctymc,sys_workplace.workplaceName,bp.prepnSpec
         from sys_workplace_queue swq
                  left join
-             (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg
+             (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg, bp.prepnSpec
               from basic_udirel bu
                        left join basic_products bp ON bu.uuid = bp.uuid
               group by bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc) as bp ON bp.id = swq.relId