From 48a5354caf7f9cd1aec87a3507cc4ee480698fb7 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 1 Apr 2024 22:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java    | 5 +++++
 1 file changed, 5 insertions(+)

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 9a42c9b98..dff00ae56 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
@@ -4572,6 +4572,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		if (distributionDeliveryListEntity.getDeliveryStatus().equals("3")){
+			return Resp.scanFail("该任务已完结！","该任务已完结!");
+		}
 		String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
 		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
 		Boolean b = false;
@@ -7114,6 +7117,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//查询配送内有效的客户信息
 		List<DistributionSignforEntity> signforEntities = baseMapper.selectSignforByDeliveryId(deliveryId);
 		boolean flag = signforEntities.stream().allMatch(s -> SignforStatusConstant.yiqianshou.getValue().equals(s.getSigningStatus()));
+		log.info(method+"维护配送状态>>>>>>>>>>>>deliveryId:{}",deliveryId);
+		log.info(method+"维护配送状态>>>>>>>>>>>>状态是否满足完成:{}",flag);
 		if (flag){
 			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 		}