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