From 1a35c62c8d761d84fc82e51553862f9e9c6096f6 Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 13 Oct 2023 09:19:53 +0800 Subject: [PATCH] =?UTF-8?q?DistributionParcelNumberServiceImpl=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionReservationController.java | 2 +- .../IDistributionReservationService.java | 2 +- .../DistributionParcelNumberServiceImpl.java | 1 + .../DistributionReservationServiceImpl.java | 58 ++++++++++++++++--- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index cf5653467..d539ac05b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -301,7 +301,7 @@ public class DistributionReservationController extends BladeController { @GetMapping("/getReservationPackageList") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入distrbutionReservation") - public R getReservationPackageList(@RequestParam String reservationId) { + public R getReservationPackageList(@RequestParam Long reservationId) { R reservationPackage = reservationService.getReservationPackageList(reservationId); return reservationPackage; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 88ecffcde..152d872a1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -165,7 +165,7 @@ public interface IDistributionReservationService extends BaseService getReservationPackageList(String reservationId); + R getReservationPackageList(Long reservationId); List selectListByIds(List reservationIds); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java index 18f450f1d..a7e468a07 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelNumberServiceImpl.java @@ -52,6 +52,7 @@ import java.util.stream.Collectors; @Slf4j public class DistributionParcelNumberServiceImpl extends BaseServiceImpl implements IDistributionParcelNumberService { + @Lazy @Autowired private IDistributionParcelListService distributionParcelListService; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index d672a533e..cbd17a84c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -30,10 +30,7 @@ import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.mapper.*; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; -import com.logpm.distribution.wrapper.DistributionParcelListWrapper; -import com.logpm.distribution.wrapper.DistributionReservationWrapper; -import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; -import com.logpm.distribution.wrapper.DistributionStockListWrapper; +import com.logpm.distribution.wrapper.*; import com.logpm.oldproject.entity.WayBillEntity; import com.logpm.oldproject.feign.IWayBillClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; @@ -179,6 +176,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationPackageList(String reservationId) { - if (Func.isBlank(reservationId)) { + public R getReservationPackageList(Long reservationId) { + if (Func.isNotEmpty(reservationId)) { log.error("参数异常reservationId+{" + reservationId + "}"); return R.fail("服务器正忙!!"); } - List distributionParcelListEntityList = distributionReservationPackageMapper.getReservationPackageList(reservationId); - List parcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntityList); - return R.data(parcelListVOS); + List distributionReservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() + .eq(DistributionReservationStockarticleEntity::getReservationId, reservationId) + .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); + ArrayList distributionParcelListVOS = new ArrayList<>(); + if (Func.isNotEmpty(distributionReservationStockarticleEntityList)){ + distributionReservationStockarticleEntityList.forEach(rs->{ + if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())){ + List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationPackageEntity::getReservationId, reservationId) + .eq(DistributionReservationPackageEntity::getStockArticleId, rs.getStockArticleId()) + .ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); + if (Func.isNotEmpty(reservationPackageEntityList)){ + reservationPackageEntityList.forEach(rp->{ + DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); + distributionParcelListVOS.add(DistributionParcelListWrapper.build().entityVO(parcelListEntity)); + }); + }else { + log.error("####################此预约下订单查询包件信息错误,订单ID为:{}",rs.getStockArticleId()); + } + }else if (rs.getIsZero().equals(IsOrNoConstant.yes.getValue())){ + List reservationZeroPackageEntities = distributionReservationZeroPackageService.list(Wrappers.query().lambda() + .eq(DistributionReservationZeroPackageEntity::getReservationId, reservationId) + .eq(DistributionReservationZeroPackageEntity::getStockArticleId, rs.getStockArticleId()) + .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); + if (Func.isNotEmpty(reservationZeroPackageEntities)){ + reservationZeroPackageEntities.forEach(rp->{ + + + }); + + + }else { + log.error("####################此预约下零担订单查询品类信息错误,订单ID为:{}",rs.getStockArticleId()); + } + }else { + log.error("##################3预约订单isZero字段值错误,订单ID为:{}",rs.getStockArticleId()); + } + }); + + } + + +// List distributionParcelListEntityList = distributionReservationPackageMapper.getReservationPackageList(reservationId); +// List parcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntityList); + return R.data(distributionParcelListVOS); } @Override