出库单据

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;
         };
     }

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>