|
|
|
@ -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(",")); |
|
|
|
|