From 06ae8ad9a344746349371a2722ab96f9f78823b0 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 23 Mar 2024 23:33:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=A4=87=E8=B4=A7=E9=9D=9E=E7=A9=BA=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 77ee44927..76ccb2008 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -282,22 +282,29 @@ public class DistributionStockupAppController extends BladeController { if (!list.isEmpty()) { for (DistributionStockupOrderListVO vo : list) { - planNum = planNum + vo.getPlanNum(); - scanNum = scanNum + vo.getScanNum(); - trayNum = trayNum + vo.getAllocationNumber(); -// Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); -// Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId()); -// vo.setTrayLean(aBoolean); -// if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) { - if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact()) { - List trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId()); - if (ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull(trayEntityList.get(0))) { - vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + log.info(" 定制品备货 信息 DistributionStockupOrderListVO {}",vo); + if(ObjectUtils.isNotNull(vo)){ + if(ObjectUtils.isNotNull(vo.getPlanNum())){ + planNum = planNum + vo.getPlanNum(); + } + if(ObjectUtils.isNotNull(vo.getScanNum())){ + scanNum = scanNum + vo.getScanNum(); + } + if(ObjectUtils.isNotNull(vo.getAllocationNumber())){ + trayNum = trayNum + vo.getAllocationNumber(); + } + + if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact()) { + List trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId()); + if (ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull(trayEntityList.get(0))) { + vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + } + //有没有可用整托配货的数据 + vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService())); } - //有没有可用整托配货的数据 - vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService())); } + } if (IsOrNoConstant.yes.getValue().equals(stockupDTO.getIsZero())){ //查询客户零担计划数量 From de9d2c14c2270c5e01d12088f2650a6a3bd2c644 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 24 Mar 2024 00:02:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=93=81=E7=89=8C=E7=9A=84null=20=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionAsyncServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 1f67a8b19..f10c2859b 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 @@ -1516,6 +1516,13 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { try { + if(ObjectUtils.isNull(brand)){ + log.info( " 品牌 为null 不执行 后续的代码"); + return ; + } + + + log.info(">>>>>>>>>>>>>>> 文员复核推送 品牌 {} ", brand); assert brand != null; @@ -1557,6 +1564,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { //....工厂 } catch (Exception e) { + log.error("sendReviewFactory ",e); throw new RuntimeException(e); } }