|
|
@ -626,23 +626,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
//判断该货物都属于同一客户才能进行装车
|
|
|
|
//判断该货物都属于同一客户才能进行装车
|
|
|
|
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); |
|
|
|
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); |
|
|
|
boolean isBelongToReservation = parcelListEntities.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())); |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 111111111 isBelongToReservation={}",isBelongToReservation); |
|
|
|
if (isBelongToReservation) { |
|
|
|
if (isBelongToReservation) { |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 222222222"); |
|
|
|
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda() |
|
|
|
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda() |
|
|
|
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) |
|
|
|
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) |
|
|
|
.ne(DistributionLoadscanEntity::getScanStatus, 1) |
|
|
|
.ne(DistributionLoadscanEntity::getScanStatus, 1) |
|
|
|
.eq(DistributionLoadscanEntity::getTrayNo, distrilbutionloadingscanDTO.getBarcode())); |
|
|
|
.eq(DistributionLoadscanEntity::getTrayNo, distrilbutionloadingscanDTO.getBarcode())); |
|
|
|
boolean trayLoadingStatus = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())); |
|
|
|
boolean trayLoadingStatus = parcelListEntities.stream().allMatch(p -> p.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())); |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 333333333 trayLoadingStatus={} loadscanEntityList={}",trayLoadingStatus,loadscanEntityList); |
|
|
|
if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0 && trayLoadingStatus) { |
|
|
|
if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0 && trayLoadingStatus) { |
|
|
|
return Resp.scanFail("重复扫描", "重复扫描"); |
|
|
|
return Resp.scanFail("重复扫描", "重复扫描"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 444444444 parcelListEntities={}",parcelListEntities); |
|
|
|
if (Func.isEmpty(parcelListEntities) || parcelListEntities.size() <= 0) { |
|
|
|
if (Func.isEmpty(parcelListEntities) || parcelListEntities.size() <= 0) { |
|
|
|
return Resp.scanFail("操作失败", "该托盘上无货物信息"); |
|
|
|
return Resp.scanFail("操作失败", "该托盘上无货物信息"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 55555555555 distrilbutionloadingscanDTO={}",distrilbutionloadingscanDTO); |
|
|
|
if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) { |
|
|
|
if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) { |
|
|
|
//存在客户 这里就是针对客户进行的整托装车
|
|
|
|
//存在客户 这里就是针对客户进行的整托装车
|
|
|
|
// List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
|
|
|
|
// List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
|
|
|
|
Map<Long, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2)); |
|
|
|
Map<Long, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2)); |
|
|
|
boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId()))); |
|
|
|
boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId()))); |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 6666666666 reservationFlag={}",reservationFlag); |
|
|
|
if (reservationFlag) { |
|
|
|
if (reservationFlag) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId()); |
|
|
|
warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId()); |
|
|
@ -657,6 +663,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); |
|
|
|
parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); |
|
|
|
distributionParcelListService.updateById(parcelListEntity); |
|
|
|
distributionParcelListService.updateById(parcelListEntity); |
|
|
|
DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 77777777777 distributionDeliverySelfEntity={}",distributionDeliverySelfEntity); |
|
|
|
if (Func.isNotEmpty(distributionDeliverySelfEntity.getDeliveryId())) { |
|
|
|
if (Func.isNotEmpty(distributionDeliverySelfEntity.getDeliveryId())) { |
|
|
|
loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
loadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); |
|
|
|
} |
|
|
|
} |
|
|
@ -700,14 +707,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
distributionLoadscanService.saveBatch(reservationLoadscanEntities); |
|
|
|
distributionLoadscanService.saveBatch(reservationLoadscanEntities); |
|
|
|
//这里则进行整托装车的数据构建
|
|
|
|
//这里则进行整托装车的数据构建
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 101010101010 存在其他客户货物"); |
|
|
|
return Resp.scanFail("整托装车失败", "存在其他客户货物"); |
|
|
|
return Resp.scanFail("整托装车失败", "存在其他客户货物"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 101010101010 存在其他客户货物"); |
|
|
|
return Resp.scanFail("整托装车失败", "存在其他客户货物"); |
|
|
|
return Resp.scanFail("整托装车失败", "存在其他客户货物"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
|
|
|
|
log.info("#########!!!!!!!!!!!!!!!!!--------- 101010101010 查询托盘货物失败"); |
|
|
|
return Resp.scanFail("查询托盘货物失败", "查询托盘货物失败"); |
|
|
|
return Resp.scanFail("查询托盘货物失败", "查询托盘货物失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|