From 8bf533ced62064e782472dda66f756d1096194a6 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 10 Jul 2024 14:14:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=AF=B9=E8=AE=A2=E5=8D=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=93=8D=E4=BD=9C=E7=9A=84=E9=97=AE=E9=A2=98=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=96=B9=E7=89=A9=E6=96=99=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=90=9C=E7=B4=A2=E7=BB=93=E7=AE=97=E5=B9=B3=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockArticleController.java | 2 +- .../service/impl/DistributionSignforServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 7ed5051a6..9e40e588d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -350,7 +350,7 @@ public class DistributionStockArticleController extends BladeController { public R updateClient(@Valid @RequestBody DistributionStockArticleEntity distributionStockArticle) { Long id = distributionStockArticle.getId(); DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(id); - if (!OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(oldStockArticle)) { + if (!OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(oldStockArticle.getReservationStatus())) { return R.fail(oldStockArticle.getOrderCode() + "存在预约信息"); } DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index f78d50758..5afeff5fa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -378,9 +378,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl