diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index b6f547a73..6a41919c1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -1274,7 +1274,9 @@ AND ldpl.order_package_loading_status = 10 AND ldpl.conditions = 1 AND order_package_status IN (10,20) - and ldpl.stock_article_id = #{param.orderId} and ldpl.warehouse_id = #{warehouseId} + and ldpl.stock_article_id = #{param.orderId} + and ldpl.warehouse_id = #{warehouseId} + and ldpl.is_transfer = 0 and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 6debb5690..e5dddd1fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -9140,10 +9140,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl