diff --git 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 index 991c55ff7..0331af41b 100644 --- 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 @@ -340,7 +340,7 @@ AND ldrs.stock_list_status != 2 group by ldsl.cargo_number ) t - LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number + LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0 LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) LEFT JOIN ( diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index a4405af43..c6910f8ec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -956,7 +956,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { + if (!listYou.isEmpty()) { // boolean b = listYou.stream().anyMatch(a -> a.getAllocationId().equals(p.getAllocationId())); if (b) { @@ -1040,7 +1040,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { + if (!listYou.isEmpty()) { // boolean b = listYou.stream().anyMatch(a -> a.getAllocationId().equals(p.getAllocationId())); if (b) {