From 61dc8aac4bb538b4c5ee62de58aa8b541e2f6ab4 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 23 Jan 2025 09:50:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1/23=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/service/collect/IoCollectLedGroupService.java  | 6 +++++-
 src/main/resources/schemas/schema_v2.4.sql                  | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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 0d1c41ecc..eb91d0e4a 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
@@ -155,11 +155,15 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
                 .eq(SysOrderLed::getOrderId, "")
                 .orderByAsc(SysOrderLed::getLedNum));
         //如果为null 当前灯组已满
+        if (orderLeds.isEmpty()) {
+            // 如果没有可用灯组，抛出异常或返回 null
+            throw new JsonException("当前灯组已满!");
+        }
         SysOrderLed orderLed = orderLeds.get(0);
         //if 没有满 设置订单id
         orderLed.setOrderId(orderIdFk);
         sysOrderLedService.updateById(orderLed);
-        //设置成功加入redis 一分钟超时时间 过期删除 然后根据订单id 清楚灯组
+        //设置成功加入redis 三分钟超时时间 过期删除 然后根据订单id 清楚灯组
         redisDelayedQueue.addTaskToQueue(orderIdFk + ";" + mac + ";" + bizId,3 * 60,"led_queue");
         return orderLed.getLedNum();
 
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 278911489..f5a3b6f54 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5148,6 +5148,10 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'enableRemind',
 
 
 CALL Pro_Temp_ColumnWork('io_order', 'warehouseId', 'int(10)', 1);
+#
+# UPDATE `sys_custom_config_detail`
+# SET `isShow` = 2
+# where `id` = 43071;
 
 CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow',
                          ' int NULL DEFAULT ''1''COMMENT ''区域编码''',

From 1c83099d6fc324c942ad8c22cd2e1f2d538b1fe6 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 23 Jan 2025 11:18:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index d4429f89c..c3359d123 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -124,6 +124,6 @@
           </if>
       </where>
       GROUP  BY isfi.workPlaceQueueCode
-      order by swf.row,isfi.workPlaceQueueCode
+      order by swf.freightRow,isfi.workPlaceQueueCode
   </select>
 </mapper>