异常装车判定

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

@@ -787,10 +787,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (shangpeiFlag) {
 						List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName()) && r.getId().equals(distrilbutionloadingscanDTO.getReservationId())).collect(Collectors.toList());
 						//查看是否存在满足条件的预约单
-						boolean flag = reservationEntities.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
+						reservationEntities = reservationEntities.stream().filter(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList());
 
 						//存在多个，操作人指定具体客户即可
-						if (!reservationEntities.isEmpty() && flag) {
+						if (!reservationEntities.isEmpty() && reservationEntities.size() == 1) {
 							if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 								log.info("异常装车未指定客户");
 								return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车");