From 998038585b9db8cc210622568f103707ef418ce1 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 15 Sep 2023 20:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionDeliveryInfoVO.java        |  43 +++++
 .../DistributionReservationStocklistVO.java   |   5 +
 blade-service/logpm-distribution/pom.xml      |   1 +
 .../DistributionStockArticleController.java   |   3 -
 .../mapper/DistributionDeliveryInfoMapper.xml |  18 +++
 .../mapper/DistributionParcelListMapper.xml   |   2 +-
 .../mapper/DistributionReservationMapper.java |   9 +-
 .../mapper/DistributionReservationMapper.xml  |  46 ++++++
 .../DistributionDeliveryListServiceImpl.java  | 148 ++++++++++--------
 .../DistributionReservationServiceImpl.java   |  82 ++++++----
 .../impl/DistributionSignforServiceImpl.java  |  60 +++----
 11 files changed, 285 insertions(+), 132 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
index c542c3222..97353ad13 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
@@ -280,6 +280,49 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "预约签收状态")
 	private String reservationSigningStatus;
+
+	/**
+	 * 预约备货状态
+	 */
+	@ApiModelProperty(value = "预约备货状态")
+	private String assignStatus;
+
+	/**
+	 * 预约备货区
+	 */
+	@ApiModelProperty(value = "预约签收状态")
+	private String stockupArea;
+
+
+	/**
+	 * 备货时间
+	 */
+	@ApiModelProperty(value = "预约签收状态")
+	private Date stockupDate;
+
+	/**
+	 * 出库时间
+	 */
+	@ApiModelProperty(value = "预约签收状态")
+	private Date outboundDate;
+
+	/**
+	 * 备货人
+	 */
+	@ApiModelProperty(value = "预约签收状态")
+	private String forkliftName;
+
+	/**
+	 * 备货状态
+	 */
+	@ApiModelProperty(value = "备货状态")
+	private String stockupStatusName;
+
+	/**
+	 * 指派状态
+	 */
+	@ApiModelProperty(value = "指派状态")
+	private String assignStatusName;
 //	/**
 //	 * 配送方式
 //	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java
index e913898f2..f0ba31fe4 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationStocklistVO.java
@@ -46,6 +46,11 @@ public class DistributionReservationStocklistVO extends DistributionReservationS
 	 */
 	@ApiModelProperty(value = "货物名称")
 	private String descriptionGoods;
+	/**
+	 * 物料编号
+	 */
+	@ApiModelProperty(value = "物料编号")
+	private String cargoNumber;
 	/**
 
 	 /**
diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml
index 2bae384d8..4ac90fb83 100644
--- a/blade-service/logpm-distribution/pom.xml
+++ b/blade-service/logpm-distribution/pom.xml
@@ -100,6 +100,7 @@
 
 
 
+
     </dependencies>
 
     <build>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
index fb3ec8182..5c3bb3773 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
@@ -124,9 +124,6 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleVO>> selectStockArticleInfoList(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
-
-
-
 		R r = distributionStockArticleService.selectStockArticleInfoList(distributionStockArticle,query);
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index f7a5f00b5..813743307 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -88,6 +88,22 @@
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
+        ldss.assign_status assignStatus,
+        ldss.stockup_area stockupArea,
+        ldss.stockup_date stockupDate,
+        ldss.outbound_date outboundDate,
+        ldss.forklift_name forkliftName,
+        ldss.stockup_status stockupStatus,
+        CASE
+        WHEN ldss.stockup_status ='10' THEN '待分配'
+        WHEN ldss.stockup_status ='20' THEN '待备货'
+        WHEN ldss.stockup_status ='30' THEN '备货中'
+        WHEN ldss.stockup_status ='40' THEN '已完成'
+        END  stockupStatusName,
+        CASE
+        WHEN ldss.assign_status ='10' THEN '未指派'
+        WHEN ldss.assign_status ='20' THEN '已指派'
+        END  assignStatusName,
         CASE
         WHEN ldr.is_urgent ='1' THEN '否'
         else '是'
@@ -103,6 +119,8 @@
         FROM
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        JOIN logpm_distribution_stockup_info AS ldsi ON ldr.id = ldsi.reservation_id
+        JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
         <where>
             lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
         </where>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 95090fa27..fed18126c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -443,7 +443,7 @@
             LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id AND lwtg.association_type = 3
             LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwtg.association_id AND lwtg.association_type = 3
         WHERE
-            ldpl.stock_article_id = #{stockArticleId} and ldpl.order_package_reservation_status in ('10','20')
+            ldpl.stock_article_id = #{stockArticleId} and ldpl.order_package_reservation_status in ('10','20') and ldpl.order_package_reservation_status = '10'
 
     </select>
 
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 aca07f51d..3fad5ccc7 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
@@ -197,10 +197,17 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 */
 	DistributionStockupEntity selectStockup(@Param("reservationId")Long id);
 
+	/**
+	 * 查询预约计划的备货任务
+	 * @param id
+	 * @return
+	 */
+	List<DistributionStockupEntity> selectStockupList(@Param("reservationIds")List<Long> ids);
+
 	/**
 	 * 根基配送ID 查询预约单信息
 	 * @param id
 	 * @return
 	 */
-    List<DistributionReservationEntity> findByDeliveryId(@Param("id")Long id);
+	List<DistributionReservationEntity> findByDeliveryId(@Param("id")Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index c7e943d81..be33d7d96 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -885,6 +885,52 @@
         WHERE
             ldsi.reservation_id = #{reservationId}
     </select>
+    <select id="selectStockupList" resultType="com.logpm.distribution.entity.DistributionStockupEntity">
+                SELECT
+            lds.id,
+            lds.tenant_id,
+            lds.create_user,
+            lds.create_time,
+            lds.update_user,
+            lds.update_time,
+            lds.STATUS,
+            lds.is_deleted,
+            lds.create_dept,
+            lds.reserve1,
+            lds.reserve2,
+            lds.reserve3,
+            lds.reserve4,
+            lds.reserve5,
+            lds.stockup_date,
+            lds.stockup_user,
+            lds.stockup_status,
+            lds.stockup_area,
+            lds.assign_status,
+            lds.stockip_allocation,
+            lds.goods_area_id,
+            lds.forklift_id,
+            lds.loader_id,
+            lds.team_responsibility,
+            lds.fix_time,
+            lds.assign_time,
+            lds.type_service,
+            lds.stockup_user_id,
+            lds.warehouse_id,
+            lds.forklift_name,
+            lds.loader_name,
+            lds.stockup_code,
+            lds.remarks,
+            lds.annulment,
+            lds.outbound_date
+        FROM
+            logpm_distribution_stockup_info AS ldsi
+            INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
+        WHERE
+            ldsi.reservation_id in
+            <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
+                     #{item.id}
+            </foreach>
+    </select>
 
     <select id="findByDeliveryId"
             resultMap="reservationResultMap">
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 c6f64ceb8..3bb613fe1 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
@@ -45,6 +45,7 @@ import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionReservationWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
+import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
@@ -134,6 +135,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IBasicdataWarehouseClient warehouseClient;
 	private final IDisStockListDetailService disStockListDetailService;
 	private final DistributionStockListMapper distributionStockListMapper;
+	private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
 	private final IBasicPrintTemplateClient basicPrintTemplateClient;
 
 	@Override
@@ -152,15 +154,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			.collect(Collectors.toList());
 		distributionDeliveryList.setWarehouseIdList(collect);
 		List<DistributionDeliveryListEntity> distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList);
-
-
 		return page.setRecords(distributionDeliveryListEntities);
 	}
 
 
 	@Override
 	public List<DistributionDeliveryListExcel> exportDistributionDeliveryList(Wrapper<DistributionDeliveryListEntity> queryWrapper) {
-
 		List<DistributionDeliveryListExcel> distributionDeliveryListList = baseMapper.exportDistributionDeliveryList(queryWrapper);
 		//distributionDeliveryListList.forEach(distributionDeliveryList -> {
 		//	distributionDeliveryList.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionDeliveryList.getType()));
@@ -484,6 +483,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //					}
 				//	}
 			}
+			warehouseUpdownTypeClient.downPackage(distrilbutionloadingscanDTO.getBarcode());
 			distributionLoadscanService.saveBatch(distributionLoadscanEntities);
 //			//找出该包条码
 //			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
@@ -906,7 +906,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> list = reservationPackageEntityList.stream().map(DistributionReservationPackageEntity::getParceListId).collect(Collectors.toList());
 		List<DistributionParcelListEntity> distributionParcelListEntityList = distributionParcelListService.list(new QueryWrapper<DistributionParcelListEntity>().lambda().in(DistributionParcelListEntity::getId, list));
 
-
 		List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 		boolean packageLoadingFlag = parcelListEntityList.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue()));
 		List<DisStockListDetailEntity> stockListDetailEntityList = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
@@ -919,7 +918,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return R.fail("该客户存在库存品暂未备货   一键装车失败!!!");
 		}
 		if (packageLoadingFlag && inventoryLoadingFlag) {
-			//此时包件和库存品均已完成装车，这里不需要进行装车；需要进行进行提示
+			//此时包件和库存品均已完成装车，这里不需要进行装车;需要进行进行提示
 			//这里需要对包件、库存品包件进行库位信息的解绑
 		} else {
 			if (!packageLoadingFlag) {
@@ -974,6 +973,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						distributionLoadscanService.save(loadscanEntity);
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+						warehouseUpdownTypeClient.downPackage(parcelListEntity.getOrderPackageCode());
 						//异步修改包件状态
 						distributionAsyncService.changeMarketDeliveryListStatus(loadscanEntity.getOrderPackageCode(), loadscanEntity.getDeliveryId());
 					}
@@ -1024,6 +1024,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						distributionLoadscaninvnService.save(loadscaninvnEntity);
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						Integer j = distributionSignforMapper.updateloadByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+//						warehouseUpdownTypeClient.downStock()
 						//异步修改包件状态   //对于存在库存品的这里还需要将库存品从对应的信息中进行扣除
 						distributionAsyncService.changeMarketDeliveryListStatus(loadscaninvnEntity.getOrderPackageCode(), loadscaninvnEntity.getDeliveryId());
 						DistributionStockListEntity stockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda().eq(DistributionStockListEntity::getId, loadscaninvnEntity.getInventoryId()));
@@ -2286,8 +2287,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListEntity.setUnloadingTeamName(stockupInfo.getUnloaderName());
 		}
 		if (Func.isNotEmpty(stockupInfo.getLoaderId()) && Func.isNotEmpty(stockupInfo.getLoaderName())) {
-			deliveryListEntity.setUnloadingTeamId(stockupInfo.getLoaderId());
-			deliveryListEntity.setUnloadingTeamName(stockupInfo.getLoaderName());
+			deliveryListEntity.setLoadingTeamId(stockupInfo.getLoaderId());
+			deliveryListEntity.setLoadingTeamName(stockupInfo.getLoaderName());
 		}
 		deliveryListEntity.setOrderNumber(orderTotal.get());
 		deliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());
@@ -2672,31 +2673,33 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//查询配送下的预约信息和配送司机信息
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(id);
 		DistributionDeliveryListVO deliveryListVO = Func.copy(deliveryListEntity, DistributionDeliveryListVO.class);
-		switch (deliveryListEntity.getKind()) {
-			case "1":
-				//查询自主配送
-				QueryWrapper<DistributionDeliverySelfEntity> qw = new QueryWrapper<>();
-				qw.lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, id);
-				List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfService.getBaseMapper().selectList(qw);
-				List<DistributionDeliverySelfVO> deliverySelfVOS = new ArrayList<>();
-				distributionDeliverySelfEntities.forEach(s -> {
-					DistributionDeliverySelfVO deliverySelfVO = Func.copy(s, DistributionDeliverySelfVO.class);
-					deliverySelfVOS.add(deliverySelfVO);
-				});
-				deliveryListVO.setDeliverySelfVO(deliverySelfVOS);
-				break;
-			case "2":
-				QueryWrapper<DistributionDeliveryTripartiteEntity> tqw = new QueryWrapper<>();
-				tqw.lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, id);
-				DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteService.getBaseMapper().selectOne(tqw);
-				DistributionDeliveryTripartiteVO deliveryTripartiteVO = Func.copy(tripartiteEntity, DistributionDeliveryTripartiteVO.class);
-				deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
-				break;
+		if (Func.isNotEmpty(deliveryListVO)){
+			switch (deliveryListEntity.getKind()) {
+				case "1":
+					//查询自主配送
+					QueryWrapper<DistributionDeliverySelfEntity> qw = new QueryWrapper<>();
+					qw.lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, id);
+					List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfService.getBaseMapper().selectList(qw);
+					List<DistributionDeliverySelfVO> deliverySelfVOS = new ArrayList<>();
+					distributionDeliverySelfEntities.forEach(s -> {
+						DistributionDeliverySelfVO deliverySelfVO = Func.copy(s, DistributionDeliverySelfVO.class);
+						deliverySelfVOS.add(deliverySelfVO);
+					});
+					deliveryListVO.setDeliverySelfVO(deliverySelfVOS);
+					break;
+				case "2":
+					QueryWrapper<DistributionDeliveryTripartiteEntity> tqw = new QueryWrapper<>();
+					tqw.lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, id);
+					DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteService.getBaseMapper().selectOne(tqw);
+					DistributionDeliveryTripartiteVO deliveryTripartiteVO = Func.copy(tripartiteEntity, DistributionDeliveryTripartiteVO.class);
+					deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
+					break;
+			}
 		}
 		//查询备货信息进行数据回显
 		//2、查询出备货信息
-		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
-		deliveryListVO.setStockupInfo(stockupEntity);
+//		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
+//		deliveryListVO.setStockupInfo(stockupEntity);
 		List<DistributionReservationEntity> reservationVOS = distributionReservationMapper.getMarketReservationInfo(id);
 		deliveryListVO.setReservationInfos(DistributionReservationWrapper.build().listVO(reservationVOS));
 		return deliveryListVO;
@@ -2794,56 +2797,67 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListEntity.setVehicleName(vehicleNubs.deleteCharAt(vehicleNubs.length() - 1).toString());
 		}
 		//查询出原来配送信息的备货任务
-		DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId());
+//		DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(deliveryListEntity.getId());
 		//这里查询出该备货任务的执行情况，如果该任务处于已完成的状态需要创建新的备货任务，其他的备货状态则是进行备货任务的修改
-		DistributionStockupDTO stockupInfo = deliveryListDTO.getStockupInfo();
+//		DistributionStockupDTO stockupInfo = deliveryListDTO.getStockupInfo();
 		//前端进行校验这个备货任务是否发生改变，没有发生改变则不需要传递此参数
-		if (!Func.isEmpty(stockupInfo)) {
-			if (Func.isNotEmpty(stockupInfo.getForkliftName())) {
-				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.weizhipai.getValue());
-				deliveryStockupInfo.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
-				deliveryStockupInfo.setForkliftName(stockupInfo.getForkliftName());
-				deliveryStockupInfo.setForkliftId(stockupInfo.getForkliftId());
-				//不存在备货人员，此时该任务的状态处于未指派、待分配的状态
-			} else {
-				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.yizhipai.getValue());
-			}
-			if (Func.isNotEmpty(stockupInfo.getGoodsAreaId())) {
-				deliveryStockupInfo.setGoodsAreaId(stockupInfo.getGoodsAreaId());
-				deliveryStockupInfo.setStockupArea(stockupInfo.getGoodsAreaName());
-			}
-//			---------------------------2023-09-06  取消班组职能字段维护------------------------------------
-//			if (Func.isNotEmpty(stockupInfo.getLoaderId())) {
-//				deliveryStockupInfo.setLoaderId(stockupInfo.getLoaderId());
-//				deliveryStockupInfo.setLoaderName(stockupInfo.getLoaderName());
+//		if (!Func.isEmpty(stockupInfo)) {
+//			if (Func.isNotEmpty(stockupInfo.getForkliftName())) {
+//				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.weizhipai.getValue());
+//				deliveryStockupInfo.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+//				deliveryStockupInfo.setForkliftName(stockupInfo.getForkliftName());
+//				deliveryStockupInfo.setForkliftId(stockupInfo.getForkliftId());
+//				//不存在备货人员，此时该任务的状态处于未指派、待分配的状态
+//			} else {
+//				deliveryStockupInfo.setAssignStatusName(StockAssignStatusConstant.yizhipai.getValue());
 //			}
-//			if (Func.isNotEmpty(stockupInfo.getLoadAndUnload())) {
-//				deliveryStockupInfo.setTeamResponsibility(stockupInfo.getLoadAndUnload());
+//			if (Func.isNotEmpty(stockupInfo.getGoodsAreaId())) {
+//				deliveryStockupInfo.setGoodsAreaId(stockupInfo.getGoodsAreaId());
+//				deliveryStockupInfo.setStockupArea(stockupInfo.getGoodsAreaName());
+//			}
+////			---------------------------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.getStockupDate())) {
-				deliveryStockupInfo.setStockupDate(stockupInfo.getStockupDate());
-			}
-			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(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(deliveryListDTO.getUnloadingTeamId())) {
+			deliveryListEntity.setUnloadingTeamId(deliveryListDTO.getUnloadingTeamId());
 		}
-		if (Func.isNotEmpty(stockupInfo.getLoaderId()) && Func.isNotEmpty(stockupInfo.getLoaderName())) {
-			deliveryListEntity.setUnloadingTeamId(stockupInfo.getLoaderId());
-			deliveryListEntity.setUnloadingTeamName(stockupInfo.getLoaderName());
+		if (Func.isNotEmpty(deliveryListDTO.getUnloadingTeamName())) {
+			deliveryListEntity.setUnloadingTeamName(deliveryListDTO.getUnloadingTeamName());
 		}
-		deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		if (Func.isNotEmpty(deliveryListDTO.getTaskTime())) {
+			deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		}
+		if (Func.isNotEmpty(deliveryListDTO.getFee())) {
+			deliveryListEntity.setTaskTime(deliveryListDTO.getTaskTime());
+		}
+//		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.setCustomersNumber(clientTotal.get());
 		//对配送进行更改
 		this.updateById(deliveryListEntity);
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 b00c2beaf..81129a74a 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
@@ -40,6 +40,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.*;
+import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
@@ -610,7 +611,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//构建中间表信息
 				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
 				reservationStockupEntity.setStockupId(id);
-				reservationStockupEntity.setStockUpType(StockupTypeConstant.shangpei.getValue());
+				reservationStockupEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
 				reservationStockupEntity.setReservationId(reservationEntity.getId());
 				result = distributionStockupInfoService.save(reservationStockupEntity);
 				if (!result) {
@@ -667,22 +668,30 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		String reservationIds = allocationDTO.getReservationIds();
 		//创建备货任务
 		DistributionStockupDTO stockup = allocationDTO.getStockup();
-		DistributionStockupEntity stockupentity = Func.copy(stockup, DistributionStockupEntity.class);
+//		DistributionStockupEntity stockupentity = Func.copy(stockup, DistributionStockupEntity.class);
 		List<Long> ids = Func.toLongList(reservationIds);
-		DistributionStockupEntity distributionStockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
+//		DistributionStockupEntity distributionStockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
 		Integer stockListTotal = distributionReservationStocklistMapper.getStockListTotal(ids);
 		//这里判断是否选择了司机
-		if (Func.isEmpty(stockupentity.getForkliftId())) {
-			//这里就是米有选择司机
-			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
-			distributionStockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
-		} else {
-			distributionStockupEntity.setAssignTime(new Date());
-			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
-			distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
-			distributionStockupEntity.setForkliftId(stockup.getForkliftId());
-			distributionStockupEntity.setForkliftName(stockup.getForkliftName());
-		}
+//		if (Func.isEmpty(stockupentity.getForkliftId())) {
+//			//这里就是米有选择司机
+//			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
+//			distributionStockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+//		} else {
+//			distributionStockupEntity.setAssignTime(new Date());
+//			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
+//			distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
+//			distributionStockupEntity.if (Func.equals(reservationEntity.getStockupStatus(), ReservationStockupStatusConstant.weibeihuo.getValue())) {
+//				//如果预约已经备货
+//				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
+//				stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
+//				stockupInfoEntity.setReservationId(ids.get(i));
+//				stockupInfoEntity.setStockupId(distributionStockupEntity.getId());
+//				distributionStockupInfoService.save(stockupInfoEntity);
+//				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
+//			}(stockup.getForkliftId());
+//			distributionStockupEntity.setForkliftName(stockup.getForkliftName());
+//		}
 
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
 		//设置车次号
@@ -708,11 +717,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//查询根据预约ID查询这些预约的备货状态
 		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()));
+		DistributionStockupEntity stockupEntity = null;
 		if (flag) {
-			if (Func.isNotEmpty(stockup.getGoodsAreaName())) {
-				distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName());
-				distributionStockupEntity.setGoodsAreaId(stockup.getGoodsAreaId());
-			}
+			stockupEntity = new DistributionStockupEntity();
+			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
+			stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+			//这里就需要构建备货任务中间表
+//			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());
@@ -720,23 +734,26 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			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.getOutboundDate())) {
+//				distributionStockupEntity.setOutboundDate(stockup.getOutboundDate());
+//			}
+//			if (Func.isNotEmpty(stockup.getStockupDate())) {
+//				distributionStockupEntity.setStockupDate(stockup.getStockupDate());
+//			}
 //			if (Func.isNotEmpty(stockup.getLoadAndUnload())) {
 //				distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
 //			}
+//			distributionStockupEntity.setStockupUser(user.getUserName());
+//			distributionStockupEntity.setStockupUserId(user.getUserId());
 			BladeUser user = AuthUtil.getUser();
-			distributionStockupEntity.setStockupUser(user.getUserName());
-			distributionStockupEntity.setStockupUserId(user.getUserId());
-			distributionStockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
+			stockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
 			//编码生成规则 BH+仓库编码+年月日+序号00001
-			distributionStockupEntity.setStockupCode(bianMa());
-			distributionStockupEntity.setWarehouseId(myCurrentWarehouse.getId());
-			distributionStockupService.save(distributionStockupEntity);
+			stockupEntity.setStockupCode(bianMa());
+			stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+			stockupEntity.setStockupDate(new Date());
+			stockupEntity.setOutboundDate(new Date());
+			stockupEntity.setWarehouseId(myCurrentWarehouse.getId());
+			distributionStockupService.save(stockupEntity);
 		}
 		HashSet<String> warehouseNames = new HashSet<>();
 		for (int i = 0; i < ids.size(); i++) {
@@ -746,7 +763,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
 				stockupInfoEntity.setReservationId(ids.get(i));
-				stockupInfoEntity.setStockupId(distributionStockupEntity.getId());
+				stockupInfoEntity.setStockupId(stockupEntity.getId());
 				distributionStockupInfoService.save(stockupInfoEntity);
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 			}
@@ -896,6 +913,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setOrderCode(String.join(",", hashSet));
 //		distributionDeliveryListEntity.setTaskTime(allocationDTO.getTaskTime());
 		distributionDeliveryListEntity.setNoteNumber(Func.random(13, RandomType.INT));
+		distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
 		String taskTime = allocationDTO.getTaskTime();
 //		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 //		Date parse = null;
@@ -1518,13 +1536,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
 			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
 		}
-
 		distributionDeliveryListEntity.setWarehouseName(String.join(",", deliveryWarehouseName));
 //		distributionDeliveryListEntity.setOrderCode(String.join(",", orderNumber));
 		distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
 		distributionDeliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());
 		distributionDeliveryListEntity.setNoteNumber(Func.random(13, RandomType.INT));
 		distributionDeliveryListEntity.setCustomersNumber(clientTotal.get());
+		distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());
 		distributionDeliveryListEntity.setWarehouseId(myCurrentWarehouse.getId());
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 5478b8627..71d4330ea 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -765,7 +765,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer aLong2 = 0;
 			distributionAppDeliveryListVO.setVehicleStatus_name("已配车");
 			distributionAppDeliveryListVO.setDeliStatus_name("配送中");
-			if (distributionAppDeliveryListVO.getDeliveryStatus().equals("4")) {
+			if (distributionAppDeliveryListVO.getDeliveryStatus().equals("3")) {
 				distributionAppDeliveryListVO.setDeliStatus_name("完成");
 			}
 			if (distributionAppDeliveryListVO.getKind().equals("1")) {
@@ -881,7 +881,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper<DistributionDeliveryTripartiteEntity>().lambda()
 				.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionSignfor.getDeliveryId())
 			);
-			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
+			distributionDeliverySelfEntity= Func.copy(distributionDeliveryTripartiteEntity, DistributionDeliverySelfEntity.class);
+//			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 
@@ -1341,32 +1342,35 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public List<DistributionReservationStocklistVO> signforInventoryList(Long signforId) {
 		List<DistributionReservationStocklistVO> distributionReservationStocklistVOS = distributionSignforMapper.selectInventory(signforId);
-		distributionReservationStocklistVOS.forEach(i->{
-			List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda().eq(DisStockListDetailEntity::getReservationId, i.getReservationId()).eq(DisStockListDetailEntity::getStockListId, i.getStocklistId()));
-			switch (i.getLoadingStatus()){
-				case "10":
-					i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.weizhuangche.getName());
-					break;
-				case "20":
-					i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.bufenzhuangche.getName());
-
-					break;
-				case "30":
-					i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.yizhuangche.getName());
-					break;
-			}
-			switch (i.getSigningStatus()){
-				case "10":
-					i.setSigningStatusName(ReservationInventorySigningStatusConstant.weiqianshou.getName());
-					break;
-				case "20":
-					i.setSigningStatusName(ReservationInventorySigningStatusConstant.bufenqianshou.getName());
-					break;
-				case "30":
-					i.setSigningStatusName(ReservationInventorySigningStatusConstant.yiqianshou.getName());;
-			}
-				i.setDetailVOS(DistributionDisStockListWrapper.build().listVO(list));
-		});
+			distributionReservationStocklistVOS.forEach(i->{
+				if (Func.isNotEmpty(i)){
+					List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda().eq(DisStockListDetailEntity::getReservationId, i.getReservationId()).eq(DisStockListDetailEntity::getStockListId, i.getStocklistId()));
+					switch (i.getLoadingStatus()){
+						case "10":
+							i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.weizhuangche.getName());
+							break;
+						case "20":
+							i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.bufenzhuangche.getName());
+
+							break;
+						case "30":
+							i.setLoadingStatusName(ReservationInventoryLoadingStatusConstant.yizhuangche.getName());
+							break;
+					}
+					switch (i.getSigningStatus()){
+						case "10":
+							i.setSigningStatusName(ReservationInventorySigningStatusConstant.weiqianshou.getName());
+							break;
+						case "20":
+							i.setSigningStatusName(ReservationInventorySigningStatusConstant.bufenqianshou.getName());
+							break;
+						case "30":
+							i.setSigningStatusName(ReservationInventorySigningStatusConstant.yiqianshou.getName());;
+					}
+					i.setDetailVOS(DistributionDisStockListWrapper.build().listVO(list));
+				}
+
+			});
 
 		return distributionReservationStocklistVOS;
 	}