From 129ccace65261605ac7e91544e64c6629cb54e26 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 11 Apr 2024 19:49:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClerkCheckPushDataQueueHandler.java | 2 +- .../impl/DistributionAsyncServiceImpl.java | 28 +++++++++++-------- .../DistributionDeliveryListServiceImpl.java | 3 ++ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java index e9f22826b..4877705f4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java @@ -198,7 +198,7 @@ public class ClerkCheckPushDataQueueHandler { Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); } catch (Exception e) { - e.printStackTrace(); + log.error(">>>>> 推送老系统签收信息报错",e); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2d97c9579..6d25ee5ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1561,23 +1561,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { if (Func.isNotEmpty(distributionReservationStockarticleEntities)) { log.info(">>>brand 进入 长度 {} ", distributionReservationStockarticleEntities); - //存在订单 List orderIds = distributionReservationStockarticleEntities.stream().filter(f -> f.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); - log.info(">>>brand 进入 orderIds {} ", orderIds); + if (ObjectUtils.isNotNull(orderIds) && !orderIds.isEmpty()){ + log.info(">>>brand 进入 orderIds {} ", orderIds); - List distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); - log.info(">>>brand 进入 distributionStockArticleEntities {} ", distributionStockArticleEntities); + List distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); + log.info(">>>brand 进入 distributionStockArticleEntities {} ", distributionStockArticleEntities); - if (Func.isNotEmpty(distributionStockArticleEntities)) { - String[] split = Func.split(brands, ","); - log.info(">>>brand 进入 split {} ", (Object) split); + if (Func.isNotEmpty(distributionStockArticleEntities)) { + String[] split = Func.split(brands, ","); + log.info(">>>brand 进入 split {} ", (Object) split); - //包件信息列表 - brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId); + //包件信息列表 + brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId); + } + log.info(">>>brand 进入 {} ", brand); } - log.info(">>>brand 进入 {} ", brand); } @@ -1810,8 +1811,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { //统计已装车数量 WarehouseWaybillEntity byWaybillNo = waybillClient.findByWaybillNo(k); AddWaybillTrackDTO addWaybillTrackDTO = new AddWaybillTrackDTO(); - addWaybillTrackDTO.setWaybillId(byWaybillNo.getId()); - addWaybillTrackDTO.setWaybillNo(byWaybillNo.getWaybillNo()); + if(ObjectUtils.isNotNull(byWaybillNo)){ + addWaybillTrackDTO.setWaybillId(byWaybillNo.getId()); + addWaybillTrackDTO.setWaybillNo(byWaybillNo.getWaybillNo()); + } + if (1 == a) { int sum = v.stream().filter(p -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(p.getOrderPackageLoadingStatus())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); addWaybillTrackDTO.setTrackType("90"); 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 f09a5ab65..de79c42cc 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 @@ -6334,6 +6334,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl