数字孪生：货位、库存、统计，

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

@@ -228,6 +228,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ORDER BY the_platoon, the_floor,the_column
     </select>
+    <select id="selectCargoSpaceWithStock" resultMap="BasCargoSpaceResult">
+        select
+            bcs.cargo_space_id,
+            bcs.cargo_space_name,
+            bcs.the_platoon,
+            bcs.the_column,
+            bcs.the_floor,
+            bcs.status,
+            bs.tray_code,
+            bs.product_id,
+            bs.product_name
+        from bas_cargo_space bcs
+        left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where bcs.status in ('1', '2')
+    </select>
+
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
         select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type,
         bcs.the_type_name, bcs.cargo_space_name, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked,