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' and warehouse_id = #{warehouseId}