From 4a6ea591f7c6416283884ab9d9609a21071972c6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 8 Jan 2024 11:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java        | 9 +++++++--
 .../service/impl/DistributionSignforServiceImpl.java     | 2 +-
 2 files changed, 8 insertions(+), 3 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 069e08b23..64877518e 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
@@ -576,7 +576,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		AtomicInteger abnormalLoadingNum = new AtomicInteger();
 		DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
 		if (distributionDeliveryListEntity.getKind().equals("1")) {
-			distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+			if (!Objects.isNull(distrilbutionloadingscanDTO.getLoadingId())){
+				distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
+				if (Func.isEmpty(distributionDeliverySelfEntity)){
+					//通过装车扫描传递的车次ID发生变化，提示文员进行计划变更
+					return Resp.scanFail(13000,"任务发生改变，请刷新装车任务", "任务发生改变，请刷新装车任务",null);
+				}
+			}
 		} else {
 			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectById(distrilbutionloadingscanDTO.getLoadingId());
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
@@ -660,7 +666,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				}
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
 				if (shangpeiFlag) {
-
 					List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList());
 					//查看是否存在满足条件的预约单
 					if (reservationEntities.size() == 1) {
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 0fb91a453..2b0c9bcff 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
@@ -1180,7 +1180,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				if (flag) {
 					return R.fail(3006, "异常签收");
 				} else {
-					return Resp.scanFail("异常签收包件", "不满足签收条件");
+					return Resp.scanFail("不满足签收条件", "不满足签收条件");
 				}
 			}
 		} else {