From 22377c76374271a3953d0bf229c2966d5d723ae3 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 25 Oct 2023 18:00:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 11 ++++++++++- .../impl/DistributionStockArticleServiceImpl.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 26b52f164..47d2c1bfa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2902,10 +2902,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageListInfo = s.getPackageListInfo(); DistributionReservationPackageEntity reservationPackageEntity1 = distributionReservationPackageService.getById("1717072702285783041"); + log.info("reservationEntity.getId()>>>>>>>>{}", reservationEntity.getId()); + log.info("s.getId()>>>>>>>>{}",s.getId()); List list = distributionReservationPackageService.list(Wrappers.query().lambda() .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()) .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()) - .apply("packet_bar_status != '2' ")); + .apply("packet_bar_status != '2' ") + ); + List distributionReservationPackageEntities = distributionReservationPackageMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()) + .eq(DistributionReservationPackageEntity::getStockArticleId, s.getId()) + .ne(DistributionReservationPackageEntity::getPacketBarCode, "2") + ); +// List byReservationIdAndStockArticleId = distributionReservationPackageMapper.getByReservationIdAndStockArticleId(reservationEntity.getId(), s.getId()); Map> oldPackageList =list.stream().collect(Collectors.groupingBy(DistributionReservationPackageEntity::getParceListId)); 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 73983f9aa..aaf950b1c 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 @@ -982,6 +982,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionParcelListEntitys = distributionParcelListMapper.selectListByOderId(id,collect); //查询订单下的所有库存品 + //List distributionStockListVOS = distributionParcelListMapper.selectStockListByOderId(id,collect); queryOrderVO.setWrapNum(distributionParcelListEntitys.size()); queryOrderVO.setInventoryNum(0); queryOrderVO.setList(distributionParcelListEntitys);