From 5002bac67bd01b057c88aa11255f8b58c26aa871 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 22 Jun 2024 14:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=85=E4=BB=B6=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryInfoServiceImpl.java | 133 +++++++++--------- 1 file changed, 69 insertions(+), 64 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 21970c548..45f318ff3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -80,6 +81,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl selectDistributionDeliveryInfoPage(IPage page, DistributionDeliveryInfoVO distributionDeliveryInfo) { List distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo); @@ -137,13 +139,19 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList); + LambdaQueryWrapper loadscanEntityWrapper = new LambdaQueryWrapper<>(); + loadscanEntityWrapper.eq(DistributionLoadscanEntity::getReservationId, reservationId); + if (!ids.isEmpty()) { + loadscanEntityWrapper.in(DistributionLoadscanEntity::getPackageId, ids); + } + if (!orderPackageCodes.isEmpty()) { + loadscanEntityWrapper.in(DistributionLoadscanEntity::getOrderPackageCode, orderPackageCodes); + } + loadscanEntityWrapper.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()); + + // 保持不变，优化性能需要注意的是ids和orderPackageCodes的处理 - List loadscanEntitys = distributionLoadscanService.list(Wrappers.query().lambda() - .in(DistributionLoadscanEntity::getPackageId, ids) - .eq(DistributionLoadscanEntity::getReservationId, reservationId) - .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) - .in(DistributionLoadscanEntity::getOrderPackageCode, orderPackageCodes) - ); + List loadscanEntitys = distributionLoadscanService.list(loadscanEntityWrapper); // 对加载的VO列表进行处理的逻辑抽取到一个独立的方法 processParcelListVOS(parcelListVOS, loadscanEntitys, reservationIdStr); @@ -163,50 +171,48 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl loadscanEntitys, DistributionParcelListVO p) { for (DistributionLoadscanEntity loadscanEntity : loadscanEntitys) { - if(loadscanEntity.getPackageId().equals(p.getId())&& loadscanEntity.getOrderPackageCode().equals(p.getOrderPackageCode())){ + if (loadscanEntity.getPackageId().equals(p.getId()) && loadscanEntity.getOrderPackageCode().equals(p.getOrderPackageCode())) { return loadscanEntity; } } @@ -278,7 +284,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl stockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(reservationId); @@ -387,7 +393,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl k2)); } if (ord.getIsZero().equals(IsOrNoConstant.no.getValue())) { - List parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, ord.getId(),myCurrentWarehouse.getId()); + List parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, ord.getId(), myCurrentWarehouse.getId()); List ks = new ArrayList<>(); AtomicInteger atomicInteger = new AtomicInteger(); // 装车数量 @@ -396,8 +402,8 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl getReservationPackageList(Map reservationPackageDTO, IPage page) { String method = "DistributionDeliveryInfoServiceImpl类,getReservationPackageList方法"; - if (Func.isEmpty(reservationPackageDTO.get("reservationId"))){ + if (Func.isEmpty(reservationPackageDTO.get("reservationId"))) { //参数缺失 - log.error(method+"reservationId参数缺失"); + log.error(method + "reservationId参数缺失"); return null; } - IPage reservationInventoryPackageVOIPage = distributionReservationMapper.selectInvenToryPackageByReservationInfo(reservationPackageDTO,page); - + IPage reservationInventoryPackageVOIPage = distributionReservationMapper.selectInvenToryPackageByReservationInfo(reservationPackageDTO, page); return reservationInventoryPackageVOIPage; @@ -656,13 +661,13 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl getReservationZeroPackageList(Map reservationPackageDTO, IPage page) { String method = "DistributionDeliveryInfoServiceImpl类,getReservationPackageList方法"; - if (Func.isEmpty(reservationPackageDTO.get("reservationId"))){ + if (Func.isEmpty(reservationPackageDTO.get("reservationId"))) { //参数缺失 - log.error(method+"reservationId参数缺失"); + log.error(method + "reservationId参数缺失"); return null; } - IPage reservationInventoryPackageVOIPage = distributionReservationMapper.selectZeroPackageByReservationInfo(reservationPackageDTO,page); - return reservationInventoryPackageVOIPage; + IPage reservationInventoryPackageVOIPage = distributionReservationMapper.selectZeroPackageByReservationInfo(reservationPackageDTO, page); + return reservationInventoryPackageVOIPage; }