From fbac722acc13a6696ffe876006ca0b2ef7da5e5d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 10 Jul 2024 16:23:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=BB=9E=E7=95=99=E6=89=AB=E6=8F=8FBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 98b1250b5..732b2b6bb 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 @@ -6433,17 +6433,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).eq(DistributionLoadscanEntity::getReservationId, reservationId) .eq(DistributionLoadscanEntity::getPackageId, orderPackageId) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); - log.info("滞留取消任务条数", row); + log.info("滞留取消任务条数:{}", row); if (row == 1) { //存在计划 //进行了一条包件任务的取消，此时就应该对预约、配送任务进行数量的维护 distributionAsyncService.checkRetentionReservationAndDeliveryInfo(reservationId, deliveryId); - } else { + } + //包件未预约 处于异常驳回状态 //查询异常信息，对异常信息进行清理 - log.info("滞留查询审核列表信息", row); + log.info("滞留查询审核列表信息:{}", row); DistributionLoadscanAbnormalEntity abnormalEntity = distributionLoadscanAbnormalService.getOne(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageId, orderPackageId) @@ -6458,7 +6459,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>查询异常信息错误:{}",orderPackageId); } //查询出多个包件信息 - } + if (Func.isNotEmpty(loadscanEntity)) { //修改包件状态 达到回库的状态 DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId()); From 6f71f97ddc70c2ed92da1e8680ce7e86f2fe1689 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 10 Jul 2024 16:23:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/report/reader/DeliveryDetailReader.java | 2 +- .../src/main/java/com/logpm/report/util/ReportExcelUtil.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java index c71a83ca4..7774621c8 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java @@ -38,7 +38,7 @@ public class DeliveryDetailReader implements ExportReader { @Override public List findList(Page page, Wrapper query) { - return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getTotal())); + return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getSize())); } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java index 3c295715d..1cd0d4a38 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java @@ -116,8 +116,6 @@ public class ReportExcelUtil { int findNum = (int) Math.ceil((count / pageSize.doubleValue())); // 封装查询后需要导出的数据 Map> pageMap = new ConcurrentHashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE); - // 定义线程池，大表导出使用一个线程池 - ExecutorService executorService = ThreadPoolUtil.getThreadPool(); // 控制线程全部查询完后执行导出操作 CountDownLatch countDownLatch = new CountDownLatch(findNum); ExcelWriter excelWriter = null; @@ -128,7 +126,6 @@ public class ReportExcelUtil { e.printStackTrace(); } int num = 0; - List> futures = new ArrayList<>(); for (int i = 0; i < sheetNum; i++) { // sheet编号 int finalI = i + 1;