入库条码打印修改 生成入库作业 手动完成入库作业

ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml

@@ -180,8 +180,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmptyCargoSpaceByWarehouseId" resultType="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace">
         SELECT TOP 1 cargo_space_id as cargoSpaceId
         FROM bas_cargo_space
-        WHERE warehouse_id = #{warehouseId}
-          AND status = '1'
+        WHERE status = '1'
+        <if test="warehouseId != null">
+            and warehouse_id = #{warehouseId}
+        </if>
+        <if test="roadwayId != null">
+            and roadway_id = #{roadwayId}
+        </if>
         ORDER BY the_platoon, the_column, the_floor
     </select>