diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
index f71b3701a..54987f70a 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
@@ -178,15 +178,26 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "扫描件数")
 	private Integer scannedNumber;
 	/**
-	 * 装卸班组（id）
+	 * 装车班组（id）
 	 */
-	@ApiModelProperty(value = "装卸班组（id）")
+	@ApiModelProperty(value = "装车班组（id）")
 	private Long loadingTeamId;
 	/**
-	 * 装卸班组(名称)
+	 * 装车班组(名称)
 	 */
-	@ApiModelProperty(value = "装卸班组(名称)")
+	@ApiModelProperty(value = "装车班组(名称)")
 	private String loadingTeamName;
+
+	/**
+	 * 卸车班组（id）
+	 */
+	@ApiModelProperty(value = "装卸班组（id）")
+	private Long unloadingTeamId;
+	/**
+	 * 卸车班组(名称)
+	 */
+	@ApiModelProperty(value = "装卸班组(名称)")
+	private String unloadingTeamName;
 	/**
 	 * 装卸类型
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java
index e888baad8..eafc8a74a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java
@@ -72,17 +72,28 @@ public class DistributionStockupDTO{
 	private String loadAndUnload;
 
 	/**
-	 * 预约单编号
+	 * 装车班组ID
 	 */
-	@ApiModelProperty(value = "班组编号")
+	@ApiModelProperty(value = "装车班组ID")
 	private Long loaderId;
 
 	/**
-	 * 班组名称
+	 * 装车班组名称
 	 */
-	@ApiModelProperty(value = "班组名称")
+	@ApiModelProperty(value = "装车班组名称")
 	private String loaderName;
 
+	/**
+	 * 卸车班组ID
+	 */
+	@ApiModelProperty(value = "卸车班组ID")
+	private Long unloaderId;
+
+	/**
+	 * 卸车班组名称
+	 */
+	@ApiModelProperty(value = "卸车班组名称")
+	private String unloaderName;
 
 	/**
 	 * 备注
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 74d598d76..c801ebebd 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
@@ -241,9 +241,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				distributionStockupVO.setForkliftName(String.join(",",forkliftName));
 				distributionStockupVO.setStockupArea(String.join(",",goodsArea));
 				distributionStockupVO.setStockupUser(String.join(",",stockUser));
-				distributionStockupVO.setLoaderName(String.join(",",loaderName));
+//				distributionStockupVO.setLoaderName(String.join(",",loaderName));
 				distributionStockupVO.setOutboundDate(outboundDate);
-				distributionStockupVO.setTeamResponsibility(distributionStockupVOList.get(0).getTeamResponsibility());
+//				distributionStockupVO.setTeamResponsibility(distributionStockupVOList.get(0).getTeamResponsibility());
 				distributionDeliveryListVO.setStockupInfo(distributionStockupVO);
 
 			}else {
@@ -1637,15 +1637,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				deliveryStockupInfo.setGoodsAreaId(stockupInfo.getGoodsAreaId());
 				deliveryStockupInfo.setStockupArea(stockupInfo.getGoodsAreaName());
 			}
-			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
-
-				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
-				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
-			}
-
-			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
-				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
-			}
+//			---------------------------2023-09-06  取消班组职能字段维护------------------------------------
+//			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
+//				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
+//				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
+//			}
+//			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
+//				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
+//			}
 			if (Func.isNotEmpty(stockupInfo.getStockupDate())) {
 				deliveryStockupInfo.setStockupDate(stockupInfo.getStockupDate());
 			}
@@ -2065,6 +2064,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(deliveryListDTO.getRemarks())) {
 			deliveryListEntity.setRemarks(deliveryListDTO.getRemarks());
 		}
+		if (Func.isNotEmpty(stockupInfo.getUnloaderName()) && Func.isNotEmpty(stockupInfo.getUnloaderId())){
+			deliveryListEntity.setUnloadingTeamId(stockupInfo.getUnloaderId());
+			deliveryListEntity.setUnloadingTeamName(stockupInfo.getUnloaderName());
+		}
+		if (Func.isNotEmpty(stockupInfo.getLoaderId()) && Func.isNotEmpty(stockupInfo.getLoaderName())){
+			deliveryListEntity.setUnloadingTeamId(stockupInfo.getLoaderId());
+			deliveryListEntity.setUnloadingTeamName(stockupInfo.getLoaderName());
+		}
 		deliveryListEntity.setOrderNumber(orderTotal.get());
 		deliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
@@ -2588,30 +2595,37 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				deliveryStockupInfo.setGoodsAreaId(stockupInfo.getGoodsAreaId());
 				deliveryStockupInfo.setStockupArea(stockupInfo.getGoodsAreaName());
 			}
-
-			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
-				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
-				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
-			}
-
-			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
-				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
-			}
+//			---------------------------2023-09-06  取消班组职能字段维护------------------------------------
+//			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
+//				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
+//				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
+//			}
+//			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
+//				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
+//			}
 			if (Func.isNotEmpty(stockupInfo.getStockupDate())) {
 				deliveryStockupInfo.setStockupDate(stockupInfo.getStockupDate());
 			}
 			if (Func.isNotEmpty(stockupInfo.getRemarks())) {
 				deliveryStockupInfo.setRemarks(stockupInfo.getRemarks());
 			}
-			if (Func.isNotEmpty(stockupInfo.getRemarks())) {
-				deliveryStockupInfo.setRemarks(stockupInfo.getRemarks());
-			}
+//			if (Func.isNotEmpty(stockupInfo.getRemarks())) {
+//				deliveryStockupInfo.setRemarks(stockupInfo.getRemarks());
+//			}
 			deliveryStockupInfo.setOutboundDate(stockupInfo.getOutboundDate());
 			distributionStockupMapper.updateById(deliveryStockupInfo);
 		}
 		if (Func.isNotEmpty(deliveryListDTO.getRemarks())) {
 			deliveryListEntity.setRemarks(deliveryListDTO.getRemarks());
 		}
+		if (Func.isNotEmpty(stockupInfo.getUnloaderName()) && Func.isNotEmpty(stockupInfo.getUnloaderId())){
+			deliveryListEntity.setUnloadingTeamId(stockupInfo.getUnloaderId());
+			deliveryListEntity.setUnloadingTeamName(stockupInfo.getUnloaderName());
+		}
+		if (Func.isNotEmpty(stockupInfo.getLoaderId()) && Func.isNotEmpty(stockupInfo.getLoaderName())){
+			deliveryListEntity.setUnloadingTeamId(stockupInfo.getLoaderId());
+			deliveryListEntity.setUnloadingTeamName(stockupInfo.getLoaderName());
+		}
 		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
 		deliveryListEntity.setCustomersNumber(clientTotal.get());
 		//对配送进行更改
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 11a95f260..2dcaa8395 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
@@ -698,30 +698,26 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		List<DistributionReservationEntity> reservationEntityList = baseMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda().in(DistributionReservationEntity::getId, ids));
 		boolean flag = reservationEntityList.stream().anyMatch(s -> s.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue()));
 		if (flag) {
-			if (Func.isNotEmpty(stockup.getLoaderName())) {
-				distributionStockupEntity.setLoaderName(stockup.getLoaderName());
-				distributionStockupEntity.setLoaderId(stockup.getLoaderId());
-			}
 			if (Func.isNotEmpty(stockup.getGoodsAreaName())) {
 				distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName());
 				distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId());
 			}
-			if (Func.isNotEmpty(stockup.getGoodsAreaName())) {
-				distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName());
-				distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId());
-			}
-			if (Func.isNotEmpty(stockup.getLoadAndUnload())) {
-				distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
-			}
+//			if (Func.isNotEmpty(stockup.getGoodsAreaName())) {
+//				distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName());
+//				distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId());
+//			}
+//			if (Func.isNotEmpty(stockup.getLoadAndUnload())) {
+//				distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
+//			}
 			if (Func.isNotEmpty(stockup.getOutboundDate())) {
 				distributionStockupEntity.setOutboundDate(stockup.getOutboundDate());
 			}
 			if (Func.isNotEmpty(stockup.getStockupDate())) {
 				distributionStockupEntity.setStockupDate(stockup.getStockupDate());
 			}
-			if (Func.isNotEmpty(stockup.getLoadAndUnload())) {
-				distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
-			}
+//			if (Func.isNotEmpty(stockup.getLoadAndUnload())) {
+//				distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
+//			}
 			BladeUser user = AuthUtil.getUser();
 			distributionStockupEntity.setStockupUser(user.getUserName());
 			distributionStockupEntity.setStockupUserId(user.getUserId());
@@ -872,6 +868,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setDriverName(driverNames.deleteCharAt(driverNames.length() - 1).toString());
 			distributionDeliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
+		if (Func.isNotEmpty(stockup.getLoaderName())) {
+			distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
+			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
+		}
+		if (Func.isNotEmpty(stockup.getUnloaderId()) && Func.isNotEmpty(stockup.getUnloaderName()) ) {
+			distributionDeliveryListEntity.setUnloadingTeamId(stockup.getUnloaderId());
+			distributionDeliveryListEntity.setUnloadingTeamName(stockup.getUnloaderName());
+		}
 		distributionDeliveryListEntity.setWarehouseId(myCurrentWarehouse.getId());
 		distributionDeliveryListEntity.setWarehouseName(String.join(",", warehouseNames));
 		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
@@ -1254,10 +1258,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setStockupUserId(user.getUserId());
 		stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
-		stockupEntity.setLoaderId(stockup.getLoaderId());
+//		stockupEntity.setLoaderId(stockup.getLoaderId());
 		stockupEntity.setStockupArea(stockup.getGoodsAreaName());
 		stockupEntity.setOutboundDate(stockup.getOutboundDate());
-		stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
+//		stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
 		stockupEntity.setStockupDate(stockup.getStockupDate());
 		//编码生成规则 BH+仓库编码+年月日+序号00001
 		stockupEntity.setStockupCode(bianMa());
@@ -1493,6 +1497,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setRemarks(allocationDTO.getRemarks());
 
 		}
+		if (Func.isNotEmpty(stockup.getUnloaderId()) &&Func.isNotEmpty(stockup.getUnloaderName())  ){
+			distributionDeliveryListEntity.setUnloadingTeamId(stockup.getUnloaderId());
+			distributionDeliveryListEntity.setUnloadingTeamName(stockup.getUnloaderName());
+		}
+		if (Func.isNotEmpty(stockup.getLoaderId()) &&Func.isNotEmpty(stockup.getLoaderName())  ){
+			distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
+			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
+		}
 
 		distributionDeliveryListEntity.setWarehouseName(String.join(",", deliveryWarehouseName));
 //		distributionDeliveryListEntity.setOrderCode(String.join(",", orderNumber));