备货扫描库存品BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -265,11 +265,23 @@
         FROM
         logpm_distribution_stockup AS a
         LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
-        WHERE b.stock_status != 4
+        <where>
+            b.stock_status != 4
+            <if test="param.warehouseId != null and param.warehouseId != '' ">and a.warehouse_id =
+                #{param.warehouseId}
+            </if>
+            <if test="param.warehouseIdList != null">
+                and a.warehouse_id in
+                <foreach collection="param.warehouseIdList" item="a" open="(" separator="," close=")">
+                    #{a}
+                </foreach>
+            </if>
+        </where>
         GROUP BY b.stockup_id
         ) AS aa ON aa.stockup_id = lds.id
         <where>
-            lds.is_deleted = 0 AND aa.aaa > 0 AND ldsi.stock_status != 4
+            lds.is_deleted = 0  AND ldsi.stock_status != 4
+            <!--            AND aa.aaa > 0-->
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =  #{param.typeService}
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -2106,6 +2106,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			}
 			DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity();
 			reservationStocklistEntity.setId(one1.getId());
+			reservationStocklistEntity.setReservationId(one1.getReservationId());
 			//维护备货时间
 			if (ObjectUtils.isNull(one1.getStartTimeStocking())) {
 				reservationStocklistEntity.setStockStatus("2");