Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z

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();
 

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>

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 ''区域编码''',