From 7b70c3920d35d45bce40da15a7baa4a8a5136488 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 15:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E5=8C=85=E4=BB=B6=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 4 ++-- .../mapper/DistributionReservationMapper.java | 2 +- .../service/IDistributionDeliveryListService.java | 2 +- .../impl/DistributionDeliveryListServiceImpl.java | 14 ++++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index fa4319395..c22afa381 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -147,8 +147,8 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/packdetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList") - public R> packdetail(@RequestParam Map distributionDeliveryInfoDTO, Query query) throws ParseException { - List parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO); + public R> packdetail(@RequestParam Map distributionDeliveryInfoDTO, Query query) throws ParseException { + IPage parcelListEntityList = distributionDeliveryListService.getPackageListByDeliverylistId(Condition.getPage(query), distributionDeliveryInfoDTO); // IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryInfopackdetail(Condition.getPage(query), distributionDeliveryInfoDTO); return R.data(parcelListEntityList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 378ae4d32..bbef2c2a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -123,7 +123,7 @@ public interface DistributionReservationMapper extends BaseMapper getReservationPackage(IPage page,@Param("orderIds") List orderIds,@Param("param")Map param); + IPage getReservationPackage(IPage page,@Param("orderIds") List orderIds,@Param("param")Map param); /** * 删除预约单 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index af3f906bf..bd76a2a1c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -190,7 +190,7 @@ public interface IDistributionDeliveryListService extends BaseService updateMarketDeliveryList(DistributionDeliveryListDTO deliveryListDTO); - List getPackageListByDeliverylistId(IPage page, Map distributionDeliveryInfoDTO) throws ParseException; + IPage getPackageListByDeliverylistId(IPage page, Map distributionDeliveryInfoDTO) throws ParseException; /** * 查询商配计划科操作订单列表 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 ab3ab5ebc..71cb1a046 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 @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicPrintTemplateClient; @@ -4106,7 +4107,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getPackageListByDeliverylistId(IPage page, Map distributionDeliveryInfoDTO) throws ParseException { + public IPage getPackageListByDeliverylistId(IPage page, Map distributionDeliveryInfoDTO) throws ParseException { if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))) { log.info("参数缺失deliveryId"); return null; @@ -4124,7 +4125,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOIPage = new Page<>(); List loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); Map loadingDataMap = null; if (Func.isNotEmpty(loadscanEntities)) { @@ -4136,10 +4137,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); if (Func.isNotEmpty(orderIds)) { //查询该客户的非零但订单包间 - List parcelListEntityList = distributionReservationMapper.getReservationPackage(page,orderIds, distributionDeliveryInfoDTO); + IPage parcelListEntityList = distributionReservationMapper.getReservationPackage(page,orderIds, distributionDeliveryInfoDTO); + parcelListVOIPage.setTotal(parcelListEntityList.getTotal()); // List parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO); log.info(">>>>>> parcelListEntityList {}",parcelListEntityList); - List parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList); + List parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords()); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { log.info(">>>>>> distributionParcelListVO {}",distributionParcelListVO); if (Func.isNotEmpty(loadingDataMap)) { @@ -4352,8 +4354,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl