From a02cdf4a4ce06399b060caf85a4a1f110db85425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Wed, 24 Sep 2025 15:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java     | 4 ++--
 .../resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index a5f21db..9337636 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -255,8 +255,8 @@ public class ToWmsServiceImpl implements IToWmsService {
 
     private String getRoadway(int size) {
         return switch (size) {
-            case 1, 2 -> "1";
-            case 3, 4 -> "2";
+            case 1 -> "2";
+            case 2,3, 4 -> "2";
             default -> null;
         };
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 1bc2943..5e577dc 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT TOP 1 cargo_space_id as cargoSpaceId
         FROM bas_cargo_space
         WHERE status = '1'
+          and locked = 'N'
         <if test="warehouseId != null">
             and warehouse_id = #{warehouseId}
         </if>