From f9bc903442d55a6c5055c92111e21a56825197b9 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 18 May 2024 00:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionStockupServiceImpl.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 3d4704f79..7c5c71efa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -3212,7 +3212,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distrilbutionBillStockService.list(Wrappers.query().lambda(). eq(DistrilbutionBillStockEntity::getBillLadingId, reservationId) - .apply("order_status in (1,2)") + .apply("order_status in (1,3)") );//预约信息 if (!list.isEmpty()) { DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId()); @@ -3225,8 +3225,30 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl detailsEntities = distributionDeliveryDetailsService.list(Wrappers.query().lambda() + .eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId) + .ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2") + ); + if (!detailsEntities.isEmpty()) { + List ids = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).distinct().collect(Collectors.toList()); + List distributionStockListEntities = distributionStockListService.listByIds(ids); + if (!distributionStockListEntities.isEmpty()){ + if (distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).size() == 1 && distributionStockListEntities.stream().map(DistributionStockListEntity::getMallName).distinct().collect(Collectors.toList()).size() == 1) { + mallId = distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).get(0); + mallName = distributionStockListEntities.stream().map(DistributionStockListEntity::getMallName).distinct().collect(Collectors.toList()).get(0); + }else { + log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息reservationId:{}",reservationId); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场ID:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList())); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场名称:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketName).distinct().collect(Collectors.toList())); + } + }else { + log.info(">>>>>>>>>>>>>>>>自提单无定制品和库存品 无效字体计划billLadingId:{}",reservationId); + } + } } + } else { // 查询预约单上的商城 DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);