Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -601,13 +601,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		if (!abnormalEntities.isEmpty()) {
 			//判断异常是否属于自身
-			boolean flag = abnormalEntities.stream().allMatch(a -> distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) );
+			boolean flag = abnormalEntities.stream().allMatch(a -> !distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
 			if (flag){
-				return Resp.scanFail("包件已存在异常", "包件已存在异常");
+				//该异常属于其他车次
+				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect);
+				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
 			}
-			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
-			log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect);
-			return Resp.scanFail("包件在其他车次存在异常", "包件在其他车次存在异常");
 		}
 		//异步确认包条扫描信息
 //		distributionAsyncService.changeOrderSignforStatus(distrilbutionloadingscanDTO.getBarcode());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -2432,7 +2432,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (!abnormalEntities.isEmpty()) {
 				//判断此包件的异常是否是当前扫描车次和客户
 				//首先判断存在异常是否不属于当前车次和客户
-				boolean flag = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) && !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
+				boolean flag = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId()));
 				if (flag){
 					//该异常属于其他车次
 				    String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));