Merge remote-tracking branch 'origin/dev' into dev

11 months ago · 66994f145d
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@ -377,7 +377,7 @@
        LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number
        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id
        where ldslNew.is_deleted = 0
-
+        AND ldslNew.warehouse_id=#{warehouseId}