|
|
|
@ -2708,7 +2708,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
if (!abnormalEntities.isEmpty()) { |
|
|
|
|
//判断此包件的异常是否是当前扫描车次和客户
|
|
|
|
|
//首先判断存在异常是否不属于当前车次和客户
|
|
|
|
|
boolean a = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId())); |
|
|
|
|
boolean a = abnormalEntities.stream().allMatch(b -> !deliveryListEntity.getId().equals(b.getDeliveryListId()) || !distrilbutionloadingscanDTO.getReservationId().equals(b.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(",")); |
|
|
|
|