From 6dbd0c72bc073f01a2190a6bc2124746e8e221ff Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 18 Apr 2024 15:28:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=83=BD=E6=89=93=E5=8D=B0=E5=8F=96=E6=B6=88=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionReservationStockarticleEntity.java | 2 +- .../service/impl/DistributionDeliveryListServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java index 19d15fb48..c173a4b1e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java @@ -66,7 +66,7 @@ public class DistributionReservationStockarticleEntity extends TenantEntity { /** * 订单状态；1-正常、2-取消 */ - @ApiModelProperty(value = "订单码") + @ApiModelProperty(value = "订单状态") private String stockArticleStatus; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index f1c201155..a0f818d69 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -6535,6 +6535,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("reservation_id", reservationId); + queryWrapper.ne("stock_article_status", 2); List reservationStockarticleList = distributionReservationStockarticleService.list(queryWrapper); List> ls = new ArrayList<>(); BigDecimal totalPrice = BigDecimal.ZERO;