From d5457f22dbfe6016c8cb19843c01ea5ff515ffe9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Jan 2024 14:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E9=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8C=85=E4=BB=B6=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionReservationMapper.java | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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 5b1c4d7c8..378ae4d32 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<DistributionRe
 	 * @param id1
 	 * @return
 	 */
-	List<DistributionParcelListEntity> getReservationPackage(@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
+	List<DistributionParcelListEntity> getReservationPackage(IPage<DistributionParcelListEntity> page,@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
 
 	/**
 	 * 删除预约单
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 e4803af7e..4626a364b 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
@@ -4136,7 +4136,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			List<Long> orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
 			if (Func.isNotEmpty(orderIds)) {
 				//查询该客户的非零但订单包间
-				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(orderIds, distributionDeliveryInfoDTO);
+				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(page,orderIds, distributionDeliveryInfoDTO);
 //				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO);
 				log.info(">>>>>> parcelListEntityList {}",parcelListEntityList);
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
@@ -4177,11 +4177,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										distributionParcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
 										break;
 									case "3":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+										distributionParcelListVO.setScanStatus(LoadingStatusConstant.queren.getName());
 										break;
 									case "4":
 										distributionParcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
 										break;
+									case "5":
+										distributionParcelListVO.setScanStatus(LoadingStatusConstant.buluzhuangche.getName());
+										break;
 								}
 								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}