From 99eeae8b4ed985900c0f56f40bcadf94c74edaf2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 24 Feb 2025 10:44:41 +0800
Subject: [PATCH] =?UTF-8?q?2/24=20=E7=81=AF=E7=BB=84=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E6=A7=BD=E4=BD=8D=E4=BF=A1=E6=81=AF1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/collect/IoCollectOrderResponse.java   |  3 ++
 .../collect/IoCollectLedGroupService.java     |  2 +-
 .../collect/IoCollectOrderBizService.java     | 34 ++++++++++++++-----
 .../mapper/collect/IoCollectOrderMapper.xml   |  2 ++
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
index 3953acd74..7e10f4fbf 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
@@ -183,6 +183,9 @@ public class IoCollectOrderResponse {
      */
     private Integer checkCodeStatus;
 
+    private Integer ledNum;
+
+
 
     public String getFromName() {
 
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 863bce120..c51615d77 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
@@ -167,7 +167,7 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
                 .orderByAsc(SysOrderLed::getLedNum));
         //如果为null 当前灯组已满
         if (orderLeds.isEmpty()) {
-            // 如果没有可用灯组，抛出异常或返回 null
+            // 如果没有可用灯组，抛出异常或返回 null  或者返回其他数字
             throw new JsonException("没有可用灯组!");
         }
         SysOrderLed orderLed = orderLeds.get(0);
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
index cafc978eb..f36a31e08 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
@@ -37,7 +37,16 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
     }
 
     public String setProductName(CollectOrderBizResponse collectOrderBizResponse){
-            StringBuilder sb = new StringBuilder();
+        String[] parts = collectOrderBizResponse.getWorkplaceQueueCode().split("-");
+        String shelf = "";
+        String layer = "";
+        // 检查分割后的数组长度是否符合预期
+        if (parts.length == 3) {
+            // 分别赋值给对应的变量
+             shelf = parts[0];  // 货架
+             layer = parts[1];  // 层
+        }
+        StringBuilder sb = new StringBuilder();
             if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) {
                 sb.append(collectOrderBizResponse.getRegionName());
             }
@@ -47,18 +56,25 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
                 }
                 sb.append(collectOrderBizResponse.getFreightName());
             }
-            if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) {
-                if (sb.length() > 0) {
-                    sb.append("-");
-                }
-                sb.append(collectOrderBizResponse.getQueueName());
+        if (layer != null && !layer.isEmpty()) {
+            if (sb.length() > 0) {
+                sb.append("-");
             }
-            if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) {
+            sb.append(layer + "层");
+        }
+
+//            if (collectOrderBizResponse.getQueueName() != null && !collectOrderBizResponse.getQueueName().isEmpty()) {
 //                if (sb.length() > 0) {
 //                    sb.append("-");
 //                }
-                sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")");
-            }
+//                sb.append(collectOrderBizResponse.getQueueName());
+//            }
+//            if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) {
+//                if (sb.length() > 0) {
+//                    sb.append("-");
+//                }
+//                sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")");
+//            }
             return sb.toString();
     }
 
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index a7493232b..baf83f845 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -30,6 +30,7 @@
                ico.orderTime,
                ico.uploadStatus,
                ico.uploadError,
+               sol.ledNum,
                ico.errorMsg,
                row_number() over ( order by case
                                                 when ico.orderTime is null then ico.createTime
@@ -40,6 +41,7 @@
                  left join basic_bussiness_type on ico.busType = basic_bussiness_type.action
                  left join basic_corp bc on ico.fromCorp = bc.erpId
                  left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
+                 left join sys_order_led sol on sol.orderId = ico.billNo
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')