From 725f2c60d88da195bc45b704d84d76fadc667928 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 16 May 2024 17:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=E7=AD=BE=E6=94=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E5=8C=85=E4=BB=B6=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/DistributionSignforServiceImpl.java    | 17 +++++++++++++++++
 .../DistrilbutionBillLadingServiceImpl.java     |  1 +
 2 files changed, 18 insertions(+)

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 1fc40a4e6..cae24a1db 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
@@ -2701,6 +2701,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				log.error("########缺失参数,barcodes:{}", distrilbutionloadingscanDTO.getBarcodes());
 				return R.fail("存在已签收包件!!");
 			}
+			List<Long> ids = parcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+			List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+					.in(DistributionLoadscanAbnormalEntity::getPackageId, ids)
+			);
+			if (!abnormalEntities.isEmpty()) {
+				//判断此包件的异常是否是当前扫描车次和客户
+				//首先判断存在异常是否不属于当前车次和客户
+				boolean a = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
+				if (a){
+					//该异常属于其他车次
+					String code = abnormalEntities.stream().filter(c -> !deliveryListEntity.getId().equals(c.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(c.getReservationId())).map(DistributionLoadscanAbnormalEntity::getPackageCode).collect(Collectors.joining(","));
+					log.info("包件已在其他车次存在异常 >>>>包条码:{}",code);
+					log.info("包件已在其他车次存在异常 >>>>当前车次:{},异常车次:{}",deliveryListEntity.getTrainNumber(),abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")));
+					return R.fail(code+"已在其他车次执行异常!!");
+				}
+				//判断具体的装车信息
+			}
 		}
 		List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
 		//查询该客户是否存在该包件信息
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 25422d924..7f3f8cfc2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -1715,6 +1715,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 					.eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLading.getId())
 					.eq(DistrilbutionBillPackageEntity::getStockArticleId, k)
+					.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2")
 				);
 				//没有数据
 				if (list.isEmpty()) {