From 76c01d83a62252d873069b8beab6aa15dcf33457 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 13 Aug 2024 18:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsnm=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/factory/jobhandler/FactoryXxlJob.java | 6 ++++-- .../logpm/factory/snm/service/impl/OrderServiceImpl.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 9d82d0e83..9b0997a66 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -163,12 +163,12 @@ public class FactoryXxlJob { .filter(staorderPackagesEntity -> { List list = staorderPackagesService.lambdaQuery() - .eq(StaorderPackagesEntity::getIsDeleted, 0) .eq(StaorderPackagesEntity::getTcPoa014, staorderPackagesEntity.getTcPoa014()).list(); // 验证查询处理的包件中是否包含当前循环的包件 boolean exists = list.stream() .anyMatch(t -> t.getPackagenum().equals(staorderPackagesEntity.getPackagenum())); - + log.info("staorderPackagesEntity.getPackagenum() {}", staorderPackagesEntity.getPackagenum()); + log.info("exists", exists); if (!exists) { // 更新订单ID for (StationOrderEntity v : finalDataList) { @@ -177,11 +177,13 @@ public class FactoryXxlJob { } } } + log.info("existingPackageNumbers {}", existingPackageNumbers); return !exists && !existingPackageNumbers.contains(staorderPackagesEntity.getPackagenum()); }) .collect(Collectors.toList()); + log.info("filteredStaorderPackagesEntityList {}", filteredStaorderPackagesEntityList.size()); // 插入数据库 if (!filteredStaorderPackagesEntityList.isEmpty()) { staorderPackagesService.saveBatch(filteredStaorderPackagesEntityList); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java index d3d356bbb..404bee3b2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java @@ -141,7 +141,9 @@ public class OrderServiceImpl implements IOrderService { responseStationOrderVo.getData().forEach(responseStationOrderInfoVo -> { StationOrderEntity stationOrderEntity = new StationOrderEntity(); - PACKAGE_LIST.addAll(responseStationOrderInfoVo.getPACKAGE_LIST()); + if(!ObjectUtils.isEmpty(responseStationOrderInfoVo.getPACKAGE_LIST())){ + PACKAGE_LIST.addAll(responseStationOrderInfoVo.getPACKAGE_LIST()); + } try { buildStationOrderEntityByRelative(responseStationOrderInfoVo, stationOrderEntity); } catch (NoSuchFieldException e) {