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 42fde1608..78e6a9e62 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
@@ -2632,6 +2632,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							trayList.addAll(trayGoodsClientTrayList);
 						}
 					});
+
 					//查询订制品装车数量
 					List<DistributionLoadscanEntity> packageListLoadingScan = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, reservationStockarticleEntity.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, reservationStockarticleEntity.getStockArticleId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
 					if (Func.isNotEmpty(packageListLoadingScan)) {
@@ -2653,8 +2654,24 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			distributionAppReservationVO.setTrayNum(0);
 			if (Func.isNotEmpty(trayList)) {
 //				Long count = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayId).count();
-				Long aaa = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayId).distinct().count();
-				distributionAppReservationVO.setTrayNum(aaa.intValue());
+				//查询满足条件的托盘码
+				List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionAppReservationVO.getId());
+				int trayNum = 0;
+				if (Func.isNotEmpty(distributionParcelListEntities)){
+					List<String> packageCodeList = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList());
+					List<WarehouseTrayGoodsEntity> collect = trayList.stream().distinct().collect(Collectors.toList());
+					for (WarehouseTrayGoodsEntity warehouseTrayGoodsEntity : collect) {
+						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(warehouseTrayGoodsEntity.getTrayId().toString(), warehouseTrayGoodsEntity.getTrayCode());
+						//判断该托盘上的货物都存在于计划之中
+						boolean isLoadingTrayFlag = trayIdList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).allMatch(t -> packageCodeList.contains(t));
+						if (isLoadingTrayFlag){
+							trayNum += 1;
+						}
+					}
+				}
+				//统计满足条件的托盘
+//				Long aaa = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayId).distinct().count();
+				distributionAppReservationVO.setTrayNum(trayNum);
 			}
 			List<DisStockListDetailEntity> stockListDetailEntityList = distributionReservationMapper.selectInventoryListByReservation(distributionAppReservationVO.getId());
 //				boolean inventoryStockupStatus = stockListDetailEntityList.stream().allMatch(i -> Func.isNotEmpty(i.getStockPackageCode()));
@@ -2672,38 +2689,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			} else {
 				distributionAppReservationVO.setIsload("否");
 			}
-
-
-//			List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionAppReservationVO.getId());
-//
-//			boolean stockArticleStockupStatus = parcelListEntities.stream().allMatch(s -> Func.isNotEmpty(s.getOrderPackageStockupStatus()) && s.getOrderPackageStockupStatus().equals(OrderPackageStockupStatusConstant.yibeihu.getValue()));
-//			if (stockArticleStockupStatus && inventoryStockupStatus) {
-//				distributionAppReservationVO.setIsstock("是");
-//			} else {
-//				distributionAppReservationVO.setIsstock("否");
-//			}
-//			boolean stockArticleLoadingStatus = parcelListEntities.stream().allMatch(s -> Func.isNotEmpty(s.getOrderPackageLoadingStatus()) && s.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
-//			boolean inventoryLoadingStatus = stockListDetailEntityList.stream().allMatch(i -> Func.isNotEmpty(i.getStockPackageCode()) && i.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue()));
-//			if (stockArticleLoadingStatus && inventoryLoadingStatus) {
-//				distributionAppReservationVO.setIsload("是");
-//			} else {
-//				distributionAppReservationVO.setIsload("否");
-//			}
-
-
-//			//查询备货是否完成
-//			int aLong = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
-//				.eq(DistributionStockEntity::getReservationId, distributionAppReservationVO.getId())
-//				.eq(DistributionStockEntity::getType, 1)
-//			).intValue();
-//			distributionAppReservationVO.setIsstock("是");
-//			distributionAppReservationVO.setIsload("是");
-//			if (aLong < distributionAppReservationVO.getReservationNum()) {
-//				distributionAppReservationVO.setIsstock("否");
-//			}
-//			if (distributionAppReservationVO.getLoadingNub() < distributionAppReservationVO.getReservationNum()) {
-//				distributionAppReservationVO.setIsload("否");
-//			}
 		}
 		return page.setRecords(customList);
 	}
@@ -5007,6 +4992,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.listByIds(longs);
 					List<DistributionParcelListEntity> reservationPackageList = distributionReservationMapper.selectPackageListByReservationId(Long.parseLong(distributionDeliveryList.getReservationId()));
 					Map<Long, DistributionParcelListEntity> packageMap = reservationPackageList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2));
+					//该托盘的所有包件满足该计划下的所有
 					boolean flag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(packageMap.get(p.getId())));
 					if (flag) {
 						c.setPackageList(DistributionParcelListWrapper.build().listVO(parcelListEntities));
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 5966dce47..0b85f1319 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -743,6 +743,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfPackage: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfPackage: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -848,6 +854,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfTray: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfTray: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -913,6 +924,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfOrder: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfOrder: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){
@@ -1065,6 +1081,12 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfOrder: 货区不存在 goodsAreaId={}",goodsAreaId);
 			return R.fail(403,"货区不存在");
 		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if("1".equals(areaType)){
+			log.warn("#################upShelfOrder: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"备货区不能上下架");
+		}
+
 		Long wid = goodsAreaEntity.getWarehouseId();
 		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
 		if(Objects.isNull(warehouseEntity)){