diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index b90436f9e..41d66f6ca 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -1260,10 +1260,10 @@ and ldsa.order_status in ('70','80') - and ldsa.warehouse_id in - - #{item} - + + + + and ldl.warehouse_id in #{item} @@ -1386,6 +1386,10 @@ LEFT JOIN logpm_distrilbution_bill_lading AS ldbl ON ldbls.bill_lading_id = ldbl.id ldsa.order_status in ('70','80') + and ldbls.warehouse_id in + + #{item} + AND ldsa.waybill_number like concat(#{param.waybillNumber},"%")