From 857655d8fbbb11cf672fe3015ff768bfd30bb83f Mon Sep 17 00:00:00 2001 From: kilo Date: Fri, 10 Nov 2023 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=89=98=E8=A3=85=E8=BD=A6=E6=89=98?= =?UTF-8?q?=E7=9B=98=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 12 ++++++------ .../service/impl/DistributionSignforServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) 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 2eff66055..98b52e272 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 @@ -644,14 +644,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 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()))); if (reservationFlag) { + try { + warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId()); + }catch (Exception e){ + log.error("#################货物下架错误：{}",distrilbutionloadingscanDTO.getBarcode()); + return Resp.scanFail("装车失败", "装车失败"); + } List reservationLoadscanEntities = new ArrayList<>(); for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { - try { - warehouseUpdownTypeClient.downTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId()); - }catch (Exception e){ - log.error("#################货物下架错误：{}",parcelListEntity.getOrderPackageCode()); - return Resp.scanFail("装车失败", "装车失败"); - } if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) { parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 90e790a10..f7f2e201b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -487,11 +487,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + if (Func.isNotEmpty(orderIds)){ List stockArticleEntities = distributionStockArticleService.listByIds(orderIds); List printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId()); distributionSignforVO.setPrintVOList(printEntities); if (Func.isNotEmpty(stockArticleEntities)) { + distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities)); } }