From c445db1d3e3b83856e38f41a64d9cb44c5505980 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 12 Dec 2025 13:57:59 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E5=88=86=E6=89=B9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/annotation/WaybillLightCount.java       | 1 +
 .../com/xdadan/erp/emis/domain/EmisWaybillOther.java     | 1 +
 .../xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java   | 1 +
 .../service/impl/EmisTmsSiteBatchDtlServiceImpl.java     | 9 +++++++++
 4 files changed, 12 insertions(+)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
index 51ce9fd0b..6dc3c9a1a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
@@ -12,3 +12,4 @@ import java.lang.annotation.*;
 public @interface WaybillLightCount {
 }
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
index 291b72b36..3e43fa21f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
@@ -49,3 +49,4 @@ public class EmisWaybillOther extends BaseEntity {
     private String salesSupport;
 }
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
index d8be31ddf..bc7b3d75d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
@@ -78,3 +78,4 @@ public interface EmisWaybillOtherMapper extends BaseMapper<EmisWaybillOther> {
     public int deleteEmisWaybillOtherByBillCode(@Param("billCode") String billCode);
 }
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
index 01083420f..fc39cb59d 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchDtlServiceImpl.java
@@ -293,6 +293,15 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
             }
         }
 
+        // 根据batchNo去重
+        Map<String, EmisTmsSiteBatch> uniqueBatchMap = new LinkedHashMap<>();
+        for (EmisTmsSiteBatch batch : existingBatches) {
+            if (StringUtils.isNotBlank(batch.getBatchNo())) {
+                uniqueBatchMap.putIfAbsent(batch.getBatchNo(), batch);
+            }
+        }
+        existingBatches = new ArrayList<>(uniqueBatchMap.values());
+
         // 计算去重后的批次总重量、总件数、总体积
         BigDecimal totalWeight = existingBatches.stream()
                 .map(EmisTmsSiteBatch::getTotalWeight)