From 01b33361f44399ccc4a4c9bb18d72c392c5d0e26 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 14:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=95=86=E9=85=8D=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=8C=85=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 de1f94df5..ab3ab5ebc 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 @@ -2382,19 +2382,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl { DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId()); DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity); - if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { - List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda().eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()).eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); - if (Func.isNotEmpty(reservationPackageEntityList)) { - ArrayList distributionParcelListVOS = new ArrayList<>(); - reservationPackageEntityList.forEach(rp -> { - DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); - DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity); - distributionParcelListVOS.add(distributionParcelListVO); - }); - distributionStockArticleVO.setPackageList(distributionParcelListVOS); - distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId())))); - } - } +// if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { +//// List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda().eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()).eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); +//// if (Func.isNotEmpty(reservationPackageEntityList)) { +//// ArrayList distributionParcelListVOS = new ArrayList<>(); +//// reservationPackageEntityList.forEach(rp -> { +//// DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); +//// DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity); +//// distributionParcelListVOS.add(distributionParcelListVO); +//// }); +//// distributionStockArticleVO.setPackageList(distributionParcelListVOS); +//// distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId())))); +//// } +// } distributionStockArticleVOS.add(distributionStockArticleVO); }); }