整托装车调整

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

@@ -625,7 +625,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					}
 					//判断该货物都属于同一客户才能进行装车
 					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
-					boolean isBelongToReservation = parcelListEntityList.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId()));
+					boolean isBelongToReservation = parcelListEntities.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId()));
 					if (isBelongToReservation) {
 						List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 							.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
@@ -703,8 +703,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								return Resp.scanFail("整托装车失败", "存在其他客户货物");
 							}
 						}
+					}else {
+						return Resp.scanFail("整托装车失败", "存在其他客户货物");
 					}
 				}
+			}else {
+				return Resp.scanFail("查询托盘货物失败", "查询托盘货物失败");
 			}
 		}
 		//查询已装车件数