diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 98b52e272..29898cc63 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -626,23 +626,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); boolean isBelongToReservation = parcelListEntities.stream().allMatch(tp -> parcelListEntityList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()).contains(tp.getId())); + log.info("#########!!!!!!!!!!!!!!!!!--------- 111111111 isBelongToReservation={}",isBelongToReservation); if (isBelongToReservation) { + log.info("#########!!!!!!!!!!!!!!!!!--------- 222222222"); List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) .ne(DistributionLoadscanEntity::getScanStatus, 1) .eq(DistributionLoadscanEntity::getTrayNo, distrilbutionloadingscanDTO.getBarcode())); 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) { return Resp.scanFail("重复扫描", "重复扫描"); } + log.info("#########!!!!!!!!!!!!!!!!!--------- 444444444 parcelListEntities={}",parcelListEntities); if (Func.isEmpty(parcelListEntities) || parcelListEntities.size() <= 0) { return Resp.scanFail("操作失败", "该托盘上无货物信息"); } + log.info("#########!!!!!!!!!!!!!!!!!--------- 55555555555 distrilbutionloadingscanDTO={}",distrilbutionloadingscanDTO); if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) { //存在客户 这里就是针对客户进行的整托装车 // List parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); Map 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()))); + log.info("#########!!!!!!!!!!!!!!!!!--------- 6666666666 reservationFlag={}",reservationFlag); if (reservationFlag) { try { warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId()); @@ -657,6 +663,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl