From 4733638c32c29808b38738d92f6abef1416cacde Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 26 Apr 2024 10:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99=E9=92=88=E5=AF=B9=E5=B7=B2?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=8C=85=E4=BB=B6=E8=BF=9B=E8=A1=8C=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

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 8a23fffff..3640f3a32 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
@@ -2508,16 +2508,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(stockupEntity)) {
 			assert deliveryListVO != null;
 			deliveryListVO.setStockupInfo(stockupEntity);
-			//3、查询司机信息
-			if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
-				//自主配送
-				List<DistributionDeliverySelfVO> deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id);
-				deliveryListVO.setDeliverySelfVO(deliverySelfVO);
-			} else {
-				//外协配送
-				DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id);
-				deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
-			}
+		}
+
+		//3、查询司机信息
+		if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
+			//自主配送
+			List<DistributionDeliverySelfVO> deliverySelfVO = distributionDeliverySelfMapper.getDeliverySelfInfo(id);
+			deliveryListVO.setDeliverySelfVO(deliverySelfVO);
+		} else {
+			//外协配送
+			DistributionDeliveryTripartiteVO deliveryTripartiteVO = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(id);
+			deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
 		}
 		return deliveryListVO;
 	}
@@ -5970,6 +5971,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						//包件存在装车才能进行滞留
 						//通过配送任务和包件确定预约信息
 						DistributionLoadscanEntity distributionLoadscanEntity = loadscanEntityList.get(0);
+						if (2 == distributionLoadscanEntity.getSignforState()){
+							log.info("滞留扫描失败，包件已签收>>>>>>>>>>>>>>>>>>>>>>>reservationId:{},packageCode:{}",distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getOrderPackageCode());
+							return Resp.scanFail("包件已签收","包件已签收");
+						}
 						DistributionRetentionScanVo retentionScanVo = baseMapper.selectRetentionPackage(distributionLoadscanEntity.getOrderPackageCode(), distributionLoadscanEntity.getDeliveryId());
 						retentionScanVos.add(retentionScanVo);
 					}
@@ -5981,8 +5986,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					);
 					if (Func.isNotEmpty(loadscaninvnEntityList)) {
 						if (loadscaninvnEntityList.size() == 1) {
+
 							//库存品存在装车数据才能进行滞留操作
 							DistributionLoadscaninvnEntity loadscaninvnEntity = loadscaninvnEntityList.get(0);
+							if (2 == loadscaninvnEntity.getSignforState()){
+								return Resp.scanFail("包件已签收","包件已签收");
+							}
 							DistributionRetentionScanVo inventoryPackage = baseMapper.selectRetentionInventoryPackage(loadscaninvnEntity.getOrderPackageCode(), loadscaninvnEntity.getDeliveryId());
 							retentionScanVos.add(inventoryPackage);
 						}