库存品过滤

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

@@ -449,7 +449,7 @@
             FROM
             logpm_distribution_stock_list
         <where>
-            service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId}
+            service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0
             <if test="par.incomingBatch != null and par.incomingBatch != ''">
               and  incoming_batch like concat('%',#{par.incomingBatch},'%')
             </if>

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

@@ -2138,11 +2138,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					Integer a = distributionDeliveryListMapper.updateloadingTimeById(distributionLoadscaninvnEntity.getDeliveryId());
 					//更新签收表的装车数量
 					Integer j = distributionSignforMapper.updateloadByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getLoadedNub());
+					//处理出库问题
+					distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
 					//异步处理状态信息
 					distributionAsyncService.changeMarketDeliveryListStatus(distributionLoadscaninvnEntity.getOrderPackageCode(), distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId());
-					//处理出库问题
 					//扣减出库数量
-					distributionStockListMapper.deductionQuantityStock(distributionLoadscaninvnEntity.getInventoryId(), distributionLoadscaninvnEntity.getLoadedNub());
 //					DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId()));
 //					BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock());
 //					BigDecimal loadedNub = new BigDecimal(distributionLoadscaninvnEntity.getLoadedNub());