diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index b37e5d760..e86651894 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionStockListDTO; @@ -79,7 +80,10 @@ public class DistributionStockListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockList") public R> list(@ApiIgnore @RequestParam Map distributionStockList, Query query) { - IPage pages = distributionStockListService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class)); + + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class); + queryWrapper.ne("quantity_stock", 0); + IPage pages = distributionStockListService.page(Condition.getPage(query), queryWrapper); return R.data(pages); } 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/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index c11b12534..98115554b 100644 --- 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 @@ -675,7 +675,7 @@ ) realNum, lddd.id deliveryDetailsId from logpm_distribution_delivery_details lddd - LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id + LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id and ldsl.quantity_stock !=0 LEFT JOIN ( SELECT association_value,warehouse_id, GROUP_CONCAT( DISTINCT ( allocation_id )) AS allocation_ids FROM logpm_warehouse_updown_goods WHERE association_type = 4 GROUP BY association_value,warehouse_id ) AS t2 ON ldsl.cargo_number = t2.association_value and ldsl.warehouse_id=t2.warehouse_id LEFT JOIN ( SELECT ldpl.material_code, 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) {