From 2acc1fe98f3636d5ab4754132afc1ebe43590248 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 25 Nov 2023 16:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=9F=A5=E7=9C=8B=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8C=85=E4=BB=B6=E8=BF=87=E6=BB=A4=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=8C=85=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/springblade/common/utils/FileUtil.java | 2 +- .../service/impl/DistributionStockArticleServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java index 31d37a49e..964758b6b 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java @@ -66,7 +66,7 @@ public class FileUtil extends TimerTask { switch (type) { case "photo_1": //上门 - imgPath += "\\doorr"; + imgPath += "\\door"; break; case "photo_2": imgPath += "\\stacking"; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 417d4954f..385b8bd61 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1218,6 +1218,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl getPackageListByStockArticleId(IPage page, Long orderId) { List parcelListEntityList = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, orderId) .eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()) + .ne(DistributionParcelListEntity::getConditions, 2) .notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(), OrderPackageStatusConstant.yichuku.getValue())); List parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList); return page.setRecords(parcelListVOS);