From 110d8dad4ce5c43a747afd50cbf6e6acbe0708bc Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 2 Jan 2024 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96PC=20=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=BD=A6=E6=AC=A1=20=E5=8C=85=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListMapper.java       |   2 +-
 .../mapper/DistributionDeliveryListMapper.xml |   5 +-
 .../mapper/DistributionReservationMapper.java |   2 +-
 .../mapper/DistributionReservationMapper.xml  |  23 +-
 .../service/IDistributionAsyncService.java    |   4 +-
 .../impl/DistributionAsyncServiceImpl.java    |  16 +-
 .../DistributionDeliveryListServiceImpl.java  | 342 +++++++++++-------
 .../impl/DistributionSignforServiceImpl.java  |  16 +-
 .../factory/mt/feign/MtOrderMainClinet.java   |   8 +-
 9 files changed, 259 insertions(+), 159 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
index 2d206fd1f..8767d0b61 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
@@ -390,7 +390,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	DistributionReservationEntity selectReservationByPackageAndDeliveryId(@Param("orderPackageCode") String orderPackageCode,@Param("deliveryListId") Long deliveryId);
 
 
-	List<DistributionParcelListEntity> getZeroPackageListByDeliveryId(@Param("deliveryListId")Long deliveryId,@Param("stockArticleId")Long stockArticleId);
+	List<DistributionParcelListEntity> getZeroPackageListByDeliveryId(@Param("deliveryListId")Long deliveryId,@Param("orderIds")List<Long> orderIds);
 
 	/**
 	 * 查询配送任务的计划
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index d26596e2e..2c04d3b3a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -1620,7 +1620,10 @@
             INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id
             INNER JOIN logpm_distribution_parcel_number AS ldpn ON ldpl.id = ldpn.parcel_list_id
         WHERE
-            lddl.id = #{deliveryListId} and ldrs.stock_article_id = #{stockArticleId}
+            lddl.id = #{deliveryListId} and ldrs.stock_article_id in
+        <foreach collection="orderIds" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
     </select>
     <select id="selectReservationStockByDeliveryId"
             resultType="com.logpm.distribution.entity.DistributionReservationStockarticleEntity">
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 e0a6b5a38..aab024bac 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("reservationId") Long id,@Param("stockArticleId") Long id1,@Param("param")Map<String,Object> param);
+	List<DistributionParcelListEntity> getReservationPackage(@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
 
 	/**
 	 * 删除预约单
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 c94a24761..8584b323d 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
@@ -694,16 +694,14 @@
         ldpl.*,
         ldpl.quantity AS reservationNum
         FROM
-        logpm_distribution_reservation_package AS ldrp
-        INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+        logpm_distribution_signfor AS lds
+        LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_reservation_stockarticle AS ldsa ON ldr.id = ldsa.reservation_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.reservation_id = ldsa.reservation_id and ldrp.stock_article_id = ldsa.stock_article_id
+        LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+
         <where>
-            ldrp.packet_bar_status in ('1','3')
-            <if test="reservationId !=null and reservationId!= ''">
-                and ldrp.reservation_id = #{reservationId}
-            </if>
-            <if test="stockArticleId !=null and stockArticleId!= ''">
-                and ldrp.stock_article_id = #{stockArticleId}
-            </if>
+            lds.delivery_id = #{param.deliveryId}  and ldrp.packet_bar_status in ('1','3')
             <if test="param.waybillNumber !=null and param.waybillNumber != ''">
                 and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')
             </if>
@@ -743,11 +741,18 @@
             <if test="param.thirdProduct !=null and param.thirdProduct != ''">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="orderIds !=null and orderIds!= ''">
+                and ldrp.stock_article_id  in
+                <foreach collection="orderIds" item="id" separator="," close=")" open="(">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectPackageByReservationAndStockArticle"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT
+        DISTINCT
         ldpl.id,
         ldpl.tenant_id,
         ldpl.create_user,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java
index c17767741..37a75915b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java
@@ -275,12 +275,12 @@ public interface IDistributionAsyncService {
 	 * 推送信息到工厂
 	 * @param distributionParcelListEntity
 	 */
-    void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,Long warehouseId);
+    void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,String warehouseName);
 
 	/**
 	 * 推送文员
 	 */
-	void sendReviewFactory(Long signingId,Long warehouseId);
+	void sendReviewFactory(Long signingId,String warehouseName,Long warehouseId);
 
 	/**
 	 * 异步维护包件状态
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 6766b4b00..a973598ec 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1433,7 +1433,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	@Override
 	@Async
-	public void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,Long warehouseId) {
+	public void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,String warehouseName) {
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(distributionParcelListEntity.getStockArticleId());
 		log.info(">>>>>>>>>>> 签收推送 对象 {}",distributionParcelListEntity);
 		if (Func.isNotEmpty(stockArticleEntity)){
@@ -1442,7 +1442,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				case "梦天":
 					//推送到梦天
 					try {
-						orderMainClinet.sendOrderPackageScan(distributionParcelListEntity.getOrderPackageCode(),signingTime,reservationId.toString(),reservationCode,warehouseId.toString());
+						orderMainClinet.sendOrderPackageScan(distributionParcelListEntity.getOrderPackageCode(),signingTime,reservationId.toString(),reservationCode,warehouseName);
 					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
@@ -1456,7 +1456,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Override
 	@Transactional
 	@Async
-	public void sendReviewFactory(Long signingId,Long warehouseId) {
+	public void sendReviewFactory(Long signingId,String warehouseName,Long warehouseId) {
 		String brands= "梦天";//可追加
 
 		//查询签收信息
@@ -1483,7 +1483,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				if (Func.isNotEmpty(distributionStockArticleEntities)){
 					String[] split = Func.split(brands, ",");
 					//包件信息列表
-					brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseId,distributionReservationEntity.getId(),distributionDeliveryListEntity.getOrderCode());
+					brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName,distributionReservationEntity.getId(),distributionDeliveryListEntity.getOrderCode(),warehouseId);
 				}
 			}
 
@@ -1720,7 +1720,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	}
 
-	private Map<String,List<MtReceiveContentDTO>> handkeBrandsPackageList(String[] split, List<DistributionStockArticleEntity> distributionStockArticleEntities, Long warehouseId,Long reservationId,String deliveryCode) {
+	private Map<String,List<MtReceiveContentDTO>> handkeBrandsPackageList(String[] split, List<DistributionStockArticleEntity> distributionStockArticleEntities, String warehouseName,Long reservationId,String deliveryCode,Long warehouseId) {
 		Map<String,List<MtReceiveContentDTO>> packageList = new HashMap<>();
 		Map<String, List<DistributionStockArticleEntity>> orderMap = distributionStockArticleEntities.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getBrand));
 		for (String s : split) {
@@ -1734,9 +1734,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								String signingTime = distributionLoadscanMapper.selectPackageSigningTime(distributionParcelListEntity.getId());
 								MtReceiveContentDTO mtReceiveContentDTO = new MtReceiveContentDTO();
 								//查询签收时间
-								mtReceiveContentDTO.setWarehouse(warehouseId.toString());//仓库Id
-								mtReceiveContentDTO.setOrderCode(distributionStockArticleEntity.getOrderCode());//仓库Id
-								mtReceiveContentDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode());//仓库Id
+								mtReceiveContentDTO.setWarehouse(warehouseName);//仓库名称
+								mtReceiveContentDTO.setOrderCode(distributionStockArticleEntity.getOrderCode());//
+								mtReceiveContentDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode());//
 								mtReceiveContentDTO.setOperateDate(signingTime);//操作时间
 								mtReceiveContentDTO.setInvoiceOrderCode(deliveryCode);//发货编号
 								mtReceiveContentDTOS.add(mtReceiveContentDTO);
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 eebf03560..d345495f9 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
@@ -832,8 +832,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 		}
 		//查询已装车件数
-		String str = getLoadingMsg(distrilbutionloadingscanDTO);
-		return Resp.scanSuccess("装车成功", str);
+//		String str = getLoadingMsg(distrilbutionloadingscanDTO);
+
+		Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId());
+		StringBuilder str = new StringBuilder();
+		str.append("装车").append(carLaodNum + "件");
+		return Resp.scanSuccessWithData("装车成功", str.toString(),carLaodNum);
 	}
 
 
@@ -4046,6 +4050,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public List<DistributionParcelListVO> getPackageListByDeliverylistId(IPage<DistributionParcelListEntity> page, Map<String,Object> distributionDeliveryInfoDTO) throws ParseException {
 		if (Func.isEmpty(distributionDeliveryInfoDTO.get("deliveryId"))){
+			log.info("参数缺失deliveryId");
 			return null;
 		}
 		Long deliveryId = Long.parseLong((String) distributionDeliveryInfoDTO.get("deliveryId")) ;
@@ -4069,145 +4074,230 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
-		for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
-			if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId(),distributionDeliveryInfoDTO);
-				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
-				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
-					if (Func.isNotEmpty(loadingDataMap)) {
-						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
-						if (Func.isNotEmpty(loadscanEntity)) {
-							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
-								distributionParcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
-								distributionParcelListVO.setSigningTime(loadscanEntity.getSigningTime());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
-								distributionParcelListVO.setScanUser(loadscanEntity.getScanUser());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
-								distributionParcelListVO.setDriverName(loadscanEntity.getDriverName());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
-								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getScanTime())) {
-								distributionParcelListVO.setLoadingTime(sf.parse(loadscanEntity.getScanTime()));
-							}
-							if (Func.isNotEmpty(loadscanEntity.getSigningUser())) {
-								distributionParcelListVO.setSigningUser(loadscanEntity.getSigningUser());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
-								switch (loadscanEntity.getScanStatus()) {
-									case "1":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
-										break;
-									case "2":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
-										break;
-									case "3":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
-										break;
-									case "4":
-										distributionParcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
-										break;
+		if (Func.isNotEmpty(reservationStockarticleEntityList)){
+					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<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
+						for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
+							if (Func.isNotEmpty(loadingDataMap)) {
+								DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
+								if (Func.isNotEmpty(loadscanEntity)) {
+									if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
+										distributionParcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
+										distributionParcelListVO.setSigningTime(loadscanEntity.getSigningTime());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
+										distributionParcelListVO.setScanUser(loadscanEntity.getScanUser());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
+										distributionParcelListVO.setDriverName(loadscanEntity.getDriverName());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
+										distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getScanTime())) {
+										distributionParcelListVO.setLoadingTime(sf.parse(loadscanEntity.getScanTime()));
+									}
+									if (Func.isNotEmpty(loadscanEntity.getSigningUser())) {
+										distributionParcelListVO.setSigningUser(loadscanEntity.getSigningUser());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
+										switch (loadscanEntity.getScanStatus()) {
+											case "1":
+												distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+												break;
+											case "2":
+												distributionParcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
+												break;
+											case "3":
+												distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+												break;
+											case "4":
+												distributionParcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
+												break;
+										}
+										distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+									}
 								}
-								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
+							distributionParcelListVOS.add(distributionParcelListVO);
 						}
+
 					}
-					distributionParcelListVOS.add(distributionParcelListVO);
-				}
-			} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
-				List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, reservationStockarticleEntity.getStockArticleId());
-				List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
-				for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
-					if (Func.isNotEmpty(loadingDataMap)) {
-						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(parcelListVO.getId());
-						if (Func.isNotEmpty(loadscanEntity)) {
-							if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
-								parcelListVO.setSigningTime(loadscanEntity.getSigningTime());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
-								parcelListVO.setScanUser(loadscanEntity.getScanUser());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
-								parcelListVO.setDriverName(loadscanEntity.getDriverName());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
-								parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
-							}
-							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
-								parcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
-							}
-							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
-								switch (loadscanEntity.getScanStatus()) {
-									case "1":
-										parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
-										break;
-									case "2":
-										parcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
-										break;
-									case "3":
-										parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
-										break;
-									case "4":
-										parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
-										break;
-									case "5":
-										parcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
-										break;
+					List<Long> zeroOrderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
+					if (Func.isNotEmpty(zeroOrderIds)){
+						//查询该客户的零但订单包间
+						List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, zeroOrderIds);
+						List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
+						for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
+							if (Func.isNotEmpty(loadingDataMap)) {
+								DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(parcelListVO.getId());
+								if (Func.isNotEmpty(loadscanEntity)) {
+									if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
+										parcelListVO.setSigningTime(loadscanEntity.getSigningTime());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
+										parcelListVO.setScanUser(loadscanEntity.getScanUser());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
+										parcelListVO.setDriverName(loadscanEntity.getDriverName());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
+										parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+									}
+									if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
+										parcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
+									}
+									if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
+										switch (loadscanEntity.getScanStatus()) {
+											case "1":
+												parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+												break;
+											case "2":
+												parcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
+												break;
+											case "3":
+												parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+												break;
+											case "4":
+												parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
+												break;
+											case "5":
+												parcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
+												break;
+										}
+										parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+									}
 								}
-								parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
+							distributionParcelListVOS.add(parcelListVO);
 						}
 					}
-					distributionParcelListVOS.add(parcelListVO);
-				}
-			} else {
-				log.error("###########订单数据isZero字段值错误,订单Id为:{}", reservationStockarticleEntity.getId());
-			}
-
+		}else {
+			//可能出现配送任务下的所有客户都是库存品
+			log.info("#############此配送任务下无订单信息，deliveryId:{}",deliveryId);
 		}
 
-		return distributionParcelListVOS;
-	}
 
-//		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
-//		parcelListVOS.forEach(p -> {
-//			DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getPackageId, p.getId()));
-//			if (Func.isNotEmpty(distributionLoadscanEntity)) {
-//				//该包件存在扫描记录
-//				String scanStatus = distributionLoadscanEntity.getScanStatus().toString();
-//				switch (scanStatus) {
-//					case "1":
-//						p.setScanStatus(LoadingStatusConstant.quxiao.getName());
-//						break;
-//					case "2":
-//						p.setScanStatus(LoadingStatusConstant.saomiao.getName());
-//						break;
-//					case "3":
-//						p.setScanStatus(LoadingStatusConstant.queren.getName());
-//						break;
-//					case "4":
-//						p.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
-//						break;
-//				}
-//				if (Func.isNotEmpty(distributionLoadscanEntity.getSigningTime())) {
-//					p.setSigningTime(distributionLoadscanEntity.getSigningTime());
-//				}
-//				if (Func.isNotEmpty(distributionLoadscanEntity.getScanUser())) {
-//					p.setScanUser(distributionLoadscanEntity.getScanUser());
+
+
+
+
+
+
+
+
+
+//		for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
+//			if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
+//				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId(),distributionDeliveryInfoDTO);
+//				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
+//				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
+//					if (Func.isNotEmpty(loadingDataMap)) {
+//						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
+//						if (Func.isNotEmpty(loadscanEntity)) {
+//							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
+//								distributionParcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
+//								distributionParcelListVO.setSigningTime(loadscanEntity.getSigningTime());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
+//								distributionParcelListVO.setScanUser(loadscanEntity.getScanUser());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
+//								distributionParcelListVO.setDriverName(loadscanEntity.getDriverName());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
+//								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getScanTime())) {
+//								distributionParcelListVO.setLoadingTime(sf.parse(loadscanEntity.getScanTime()));
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getSigningUser())) {
+//								distributionParcelListVO.setSigningUser(loadscanEntity.getSigningUser());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
+//								switch (loadscanEntity.getScanStatus()) {
+//									case "1":
+//										distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+//										break;
+//									case "2":
+//										distributionParcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
+//										break;
+//									case "3":
+//										distributionParcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+//										break;
+//									case "4":
+//										distributionParcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
+//										break;
+//								}
+//								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+//							}
+//						}
+//					}
+//					distributionParcelListVOS.add(distributionParcelListVO);
 //				}
-//				if (Func.isNotEmpty(distributionLoadscanEntity.getDriverName())) {
-//					p.setDriverName(distributionLoadscanEntity.getDriverName());
+//			} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
+//				List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, reservationStockarticleEntity.getStockArticleId());
+//				List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
+//				for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
+//					if (Func.isNotEmpty(loadingDataMap)) {
+//						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(parcelListVO.getId());
+//						if (Func.isNotEmpty(loadscanEntity)) {
+//							if (Func.isNotEmpty(loadscanEntity.getSigningTime())) {
+//								parcelListVO.setSigningTime(loadscanEntity.getSigningTime());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getScanUser())) {
+//								parcelListVO.setScanUser(loadscanEntity.getScanUser());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getDriverName())) {
+//								parcelListVO.setDriverName(loadscanEntity.getDriverName());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
+//								parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+//							}
+//							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
+//								parcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity());
+//							}
+//							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
+//								switch (loadscanEntity.getScanStatus()) {
+//									case "1":
+//										parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+//										break;
+//									case "2":
+//										parcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName());
+//										break;
+//									case "3":
+//										parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName());
+//										break;
+//									case "4":
+//										parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
+//										break;
+//									case "5":
+//										parcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
+//										break;
+//								}
+//								parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+//							}
+//						}
+//					}
+//					distributionParcelListVOS.add(parcelListVO);
 //				}
+//			} else {
+//				log.error("###########订单数据isZero字段值错误,订单Id为:{}", reservationStockarticleEntity.getId());
 //			}
 //
-//		});
-//		return parcelListVOS;
-//	}
+//		}
+
+		return distributionParcelListVOS;
+	}
+
+
 
 
 	@Override
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 ddd7ae07e..3d49d63fd 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
@@ -441,7 +441,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
 		distributionSignfor.setExamineUserName(user.getNickName());
 		this.updateById(distributionSignfor);
-		distributionAsyncService.sendReviewFactory(id, myCurrentWarehouse.getId());
+		distributionAsyncService.sendReviewFactory(id, myCurrentWarehouse.getName(),myCurrentWarehouse.getId());
 		return R.success("操作成功");
 	}
 
@@ -944,7 +944,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			//维护签收包件状态
 			distributionStockArticleService.maintenanceOrderInfo(collect.get(0).getOrderCode(),myCurrentWarehouse.getId());
 			//推送信息至工厂
-			distributionAsyncService.sendFactory(collect.get(0), signingTime, distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getId());
+			distributionAsyncService.sendFactory(collect.get(0), signingTime, distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName());
 			//TODO 这里就需要一个异步的包件状态维护方法
 		} else if (Func.isEmpty(collect)) {
 			//这里就需要对该包件信息是否属于该配送计划进行判定。如果属于该配送计划则是串货。不是那么则需要提示是否异常签收或者返回的操作
@@ -954,7 +954,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
 			);
 			if (Func.isNotEmpty(one) && one.getConditions() == 2) {
-				log.error("#####################此包件不是定制品", one.getConditions());
+				log.error("#####################此包件不是定制品 {}", one.getConditions());
 				return Resp.scanFail("此包件不是定制品", "此包件不是定制品");
 			}
 			List<DistributionParcelListEntity> parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
@@ -963,7 +963,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			if (Func.isNotEmpty(distributionParcelListEntities) && distributionParcelListEntities.size() == 1) {
 				//这里按道理也具备签收条件，需要标注该装车记录不正常
-				log.error("#####################distributionParcelListEntities窜货", distributionParcelListEntities);
+				log.error("#####################distributionParcelListEntities窜货 {}", distributionParcelListEntities);
 				return Resp.scanFail("窜货", "窜货");
 			} else {
 				//判断该货物是否属于该客户
@@ -2511,12 +2511,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				}
 			}
 		}
-		String signingTime = simpleDateFormat.format(new Date());
+
 		List<Long> packageIds = new ArrayList<>();
 		List<String> orderCodes = new ArrayList<>();
 		log.info(">>>>>>>>>>> tag {}",8);
 		if (Func.isNotEmpty(parcelListEntityList)) {
 			for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
+				String signingTime = simpleDateFormat.format(new Date());
 				//查询是否进行装车
 				DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 					.eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId())
@@ -2604,7 +2605,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(), loadscanEntities.getReservationId(), loadscanEntities.getDeliveryId());
 					}
 				}
-				distributionAsyncService.sendFactory(parcelListEntity, signingTime, reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getId());
+				distributionAsyncService.sendFactory(parcelListEntity, signingTime, reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName());
 				packageIds.add(parcelListEntity.getId());
 				orderCodes.add(parcelListEntity.getOrderCode());
 
@@ -2617,12 +2618,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (Func.isNotEmpty(packageIds)) {
 				distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
 				//批量推送
-				distributionAsyncService.sendReviewFactory(distributionSignforEntity.getId(), myCurrentWarehouse.getId());
+				distributionAsyncService.sendReviewFactory(distributionSignforEntity.getId(), myCurrentWarehouse.getName(),myCurrentWarehouse.getId());
 			}
 		}
 
 		//维护客户信息状态
 		reservationEntity.setLoadingStatus(ReservationLoadingStatusConstant.yizhuangche.getValue());
+
 		reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
 		distributionReservationMapper.updateById(reservationEntity);
 		log.info(">>>>>>>>>>> tag {}",9);
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java
index 7902372c9..d37cc9261 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java
@@ -30,8 +30,8 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 	@GetMapping(TOP)
 	public R sendOrderPackageScan(String orderPackageCode, String operationTime, String distributionContactId, String distributionContactCode, String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException {
 		log.info(">>>>>>> 签收扫描 start");
-//		return mtFactoryDataService.qianshouScanForNewSystem(orderPackageCode,operationTime,distributionContactId,destinationWarehouse);
-		return null;
+		return mtFactoryDataService.qianshouScanForNewSystem(orderPackageCode,operationTime,distributionContactId,destinationWarehouse);
+//		return null;
 	}
 
 
@@ -39,7 +39,7 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 	@PostMapping(SENDRECEIVEINFOBYNEWSYSTEM)
 	public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws NoSuchAlgorithmException, JsonProcessingException {
 		log.info(">>>>>>> 文员复核 start");
-//		return mtFactoryDataService.sendReceiveInfoByNewSystem(mtReceiveDTO);
-		return null;
+		return mtFactoryDataService.sendReceiveInfoByNewSystem(mtReceiveDTO);
+//		return null;
 	}
 }