修复异常签收判定BUG

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

@@ -808,15 +808,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (shangpeiFlag) {
 						List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()) && r.getId().equals(distrilbutionloadingscanDTO.getReservationId())).collect(Collectors.toList());
 						//查询是否满足商配异常装车
-						boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
+						boolean flag = reservationEntities.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
-						if (reservationEntities.size() == 1) {
+						if (flag){
-							if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) {
+							return R.fail(5000, "异常装车");
-								log.info("异常装车未指定客户");
+
+						}else {
+							if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())){
 								return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车");
+							}else {
+								return Resp.scanFail("窜货", "窜货");
 							}
-							return R.fail(5000, "异常装车");
-						} else {
-							return Resp.scanFail("窜货", "窜货");
 						}
 					} else {
 						log.error("配送计划预约类型错误:{}", reservationEntityList);