Merge branch 'pre-production'

1 year ago · 7798e31691
1 changed files with 2 additions and 2 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@ -589,7 +589,7 @@
               (
                   select COUNT(id)
                   from logpm_dis_stock_list_detail
-                   where reservation_id = lddd.bill_lading_id  and stock_package_code is NOT null
+                   where reservation_id = lddd.bill_lading_id  and stock_package_code is NOT null AND stock_list_id = lddd.stock_list_id
        )                                         realNum,
               lddd.id                                   deliveryDetailsId
        from logpm_distribution_delivery_details lddd