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 28cc15b2c..c7d5cfeb4 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 @@ -147,7 +147,7 @@ public class FactoryXxlJob { //XxlJobLogger.log("日志对象 {}", orderLogEntity); Map map = orderService.dataRelative(orderLogEntity); List dataList = map.get(StationOrderEntity.class.getName()); - if (dataList.size() == 0) { + if (dataList.isEmpty()) { //XxlJobLogger.log("本次解析操作没有数据"); //更新数据库请求日志状态 orderLogEntity.setStatus(0); @@ -175,6 +175,11 @@ public class FactoryXxlJob { } } }); + + /*************** SNM 存在 相同的车次 多次推送 重复的包件的操作**************/ + // 需要移除 当前合同号下的已经存在的包件 + + dataList.forEach(v -> { for (int i = 0; i < staorderPackagesEntityList.size(); i++) { if (staorderPackagesEntityList.get(i).getTcPoa014().equals(v.getTcWlb008())) { @@ -184,7 +189,7 @@ public class FactoryXxlJob { }); // 插入数据库 - if (staorderPackagesEntityList != null && staorderPackagesEntityList.size() != 0) { + if (staorderPackagesEntityList != null && !staorderPackagesEntityList.isEmpty()) { //XxlJobLogger.log("保存对象StaorderPackagesEntity {}", staorderPackagesEntityList); staorderPackagesService.saveBatch(staorderPackagesEntityList); } 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 99b8e1a8b..fef7abcdc 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 @@ -157,6 +157,9 @@ public class OrderServiceImpl implements IOrderService { StaorderPackagesEntity staorderPackagesEntity = new StaorderPackagesEntity(); try { buildStationOrderPackageByRelative(orderPackageInfoT,staorderPackagesEntity); + + + staorderPackagesEntityList.add(staorderPackagesEntity); } catch (NoSuchFieldException e) { e.printStackTrace();