增加配送详情包件列表分页参数

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);
 
 	/**
 	 * 删除预约单

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());
 							}