From 16dcca58382ed0425699408a70171c2f1530d98d Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 13 Dec 2024 23:47:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=AF=97=E5=B0=BC=E6=9B=BC?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改诗尼曼工厂包件码重复问题
---
 .../com/logpm/factory/jobhandler/FactoryXxlJob.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 b889867ff..64a9a183b 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
@@ -444,6 +444,16 @@ public class FactoryXxlJob {
 						.eq(StaorderPackagesEntity::getIdentification, "2")
 						.eq(StaorderPackagesEntity::getOrderId, k)
 					);
+					// 订单 order_id +包件 packagenum 重复 则剔除数据
+					staorderPackagesList = staorderPackagesList.stream()
+						.collect(Collectors.collectingAndThen(
+							Collectors.toMap(
+								sp -> sp.getOrderId() + sp.getPackagenum(), // 键
+								sp -> sp, // 值
+								(existing, replacement) -> existing // 处理重复键的情况，这里选择保留第一个
+							),
+							map -> new ArrayList<>(map.values())
+						));
 					// 查询基地名称
 					StationlinenumEntity stationlinenumEntity = stationlinenumService.selectNameByNumber(v.getTcWlb006());
 					String siteName = Objects.isNull(stationlinenumEntity) ? null : stationlinenumEntity.getLogisticsLineName();