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