From bbfb1c0f44481fac18cad913c05a8fa9d2f6bd1a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 13 Aug 2024 12:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E4=BF=AE=E5=A4=8Dsnm=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/factory/jobhandler/FactoryXxlJob.java | 9 +++++++--
 .../logpm/factory/snm/service/impl/OrderServiceImpl.java | 3 +++
 2 files changed, 10 insertions(+), 2 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 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<String, List> map = orderService.dataRelative(orderLogEntity);
 			List<StationOrderEntity> 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();