diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 989d84e26..388318126 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -449,7 +449,7 @@ FROM logpm_distribution_stock_list - service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} + service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0 and incoming_batch like concat('%',#{par.incomingBatch},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 4e6d7a690..092f76e58 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2138,11 +2138,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionStockListEntity::getId, distributionLoadscaninvnEntity.getInventoryId())); // BigDecimal quantityStock = new BigDecimal(distributionStockListEntity.getQuantityStock()); // BigDecimal loadedNub = new BigDecimal(distributionLoadscaninvnEntity.getLoadedNub());