From 451cf4ef5de17c19befa9222b4b633f967299ef7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 1 Nov 2024 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BB=B4=E6=8A=A4=E5=8C=85=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistrilbutionBillLadingServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index a07fa914b..2d7f265a2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -404,7 +404,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl printEntityList = distributionPrintService.list(Wrappers.query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())); + List printEntityList = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()) + ); if (!printEntityList.isEmpty()) { boolean blobFlag = printEntityList.stream().anyMatch(p -> p.getSite().contains("blob")); if (blobFlag) { @@ -623,7 +625,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list1 = distributionParcelListService.list(Wrappers.query().lambda() - .eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId())); + .eq(DistributionParcelListEntity::getStockArticleId, i.getStockArticleId()) + .eq(DistributionParcelListEntity::getIsTransfer, 0) + ); int sum = list1.stream().filter(ii -> ii.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.daiyuyue.getValue())).collect(Collectors.toList()).stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); if (sum == 0) { log.debug("####{}当前订单备货包件为空，无法创建任务！", byId.getOrderCode()); @@ -2292,6 +2296,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl