From cf40d1d5b71a3719806f4ade3ae6162fb99a344a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 10 May 2024 19:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java        | 7 +++++++
 .../service/impl/DistributionSignforServiceImpl.java     | 9 +++++++++
 2 files changed, 16 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 02a9df503..5631a0dd3 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
@@ -581,7 +581,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				throw new CustomerException(403, "预约单已取消");
 			}
 		}
+		List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+			.eq((DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
+		);
 
+		if (!abnormalEntities.isEmpty()) {
+			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+			return Resp.scanFail("包件已在"+collect+"存在异常", "包件已存在异常装车或签收");
+		}
 
 //		-----------------------------------2023-09-25  签收调整----------------------------------------------------------------
 //		首先这里需要查看该包件是否属于该配送任务
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 52cc51a4e..d8a6c9872 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
@@ -2454,6 +2454,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
+			List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+				.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
+			);
+			if (!abnormalEntities.isEmpty()) {
+				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+				return Resp.scanFail("包件已在"+collect+"存在异常", "包件已存在异常装车或签收");
+			}
 			if (Func.isNotEmpty(list)) {
 				//满足条件此码必定为库存品
 				//判断该库存品是否属于当前客户
@@ -2478,6 +2485,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					if (loadscanEntity.getSignforState().equals(2)) {
 						return Resp.scanFail("重复扫描", "包件已签收");
 					}
+
+
 					//存在装车记录，进行修改即可
 					//进行签收记录数据的维护
 					loadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));