盘点自动分配 盘点确认

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

@@ -197,7 +197,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from bas_cargo_space bcs
         left join bas_warehouse bw on bw.warehouse_id = bcs.warehouse_id
         left join bas_roadway br on br.roadway_id = bcs.roadway_id
-        ${params.dataScope}
+        left join bas_stock bs on bs.cargo_space_id = bcs.cargo_space_id
+        left join bas_product bp on bp.product_id = bs.product_id
         where br.out_locked = 'N'
         <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
         <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>

ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare8"    column="spare8"    />
         <result property="spare9"    column="spare9"    />
         <result property="productName"    column="product_name"    />
+        <result property="orderId"    column="order_id"    />
 
     </resultMap>
 
@@ -52,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bcs.cargo_space_name,
                csd.spare7,
                csd.spare8,
-               csd.spare9
+               csd.spare9,
+               csd.order_id
         from check_stockin_detail csd
         left join bas_product bp on csd.product_id = bp.product_id
         left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id
@@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
             <if test="spare9 != null">spare9,</if>
+            <if test="orderId != null">order_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
@@ -170,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
             <if test="spare9 != null">#{spare9},</if>
+            <if test="orderId != null">#{orderId},</if>
          </trim>
     </insert>
     <insert id="insertCheckStockinDetailHistory">