From e8598a7d0097e1c3b5d56416bcaa6607b75956e2 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 11 May 2024 11:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=BC=82=E5=B8=B8=E8=A3=85?=
 =?UTF-8?q?=E8=BD=A6=E3=80=81=E7=AD=BE=E6=94=B6=E8=AF=AD=E9=9F=B3=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java  | 7 ++++++-
 .../service/impl/DistributionSignforServiceImpl.java       | 6 +++++-
 2 files changed, 11 insertions(+), 2 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 2b57aed87..9a936dc4b 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
@@ -600,9 +600,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		);
 
 		if (!abnormalEntities.isEmpty()) {
+			//判断异常是否属于自身
+			boolean flag = abnormalEntities.stream().allMatch(a -> distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) );
+			if (flag){
+				return Resp.scanFail("包件已存在异常", "包件已存在异常");
+			}
 			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
 			log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect);
-			return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
+			return Resp.scanFail("包件在其他车次存在异常", "包件在其他车次存在异常");
 		}
 		//异步确认包条扫描信息
 //		distributionAsyncService.changeOrderSignforStatus(distrilbutionloadingscanDTO.getBarcode());
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 e924b2ab6..17d9cfd16 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
@@ -724,7 +724,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					BladeUser user = AuthUtil.getUser();
 					if (Func.isNotEmpty(loadscaninvnEntity)) {
 						if (loadscaninvnEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
-							log.error(method + "库存品：" + s + "已经签收，无需重复签收");
+							log.info(method + "库存品：" + s + "已经签收，无需重复签收");
 							throw new RuntimeException("库存品：" + s + "已经签收，无需重复签收");
 						}
 						//存在装车数据，进行状态变更即可
@@ -2458,6 +2458,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
 			);
 			if (!abnormalEntities.isEmpty()) {
+				boolean flag = abnormalEntities.stream().allMatch(a -> distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) );
+				if (flag){
+					return Resp.scanFail("包件已存在异常", "包件已存在异常");
+				}
 				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
 				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
 				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");