From b71128c690e408034d6f94fcbe9983948ae40364 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 16 Aug 2024 20:21:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=BB=E9=99=A4=E6=B2=A1=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=E7=9A=84=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.xml | 2 +- .../service/impl/DistributionStockupServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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) { From c3bd73dc6c9e4f294c753682f967691ef9ab6c42 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 16 Aug 2024 20:32:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=A8=E5=BA=93=E6=95=B0=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionStockupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 9fb86c28d3c9e6305c39719fcdfc737f330613e3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 16 Aug 2024 20:34:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=8D=E5=9C=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?0=20=E7=9A=84=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockListController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); }