From a4d4d82377cb7949b4ff17b56a99e55da3616528 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 11 Aug 2025 16:31:30 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E8=B4=A7=E7=89=A9=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BC=96=E8=BE=91-=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=90=8E=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E4=BF=AE=E5=A4=8D=20commit?=
 =?UTF-8?q?ter:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
index 13ab82371..61d36f978 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -608,6 +608,11 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
             // 对剩余数据调用checkSiteBatch
             if (CollectionUtil.isNotEmpty(remainingList)) {
                 for (EmisTmsSiteBatchDtl itemDtl : remainingList) {
+                    // 从历史数据中获取对应的id，用于更新操作
+                    EmisTmsSiteBatchDtl historyDtl = historyBatchDtlMap.get(itemDtl.getBillCode());
+                    if (historyDtl != null) {
+                        itemDtl.setId(historyDtl.getId());
+                    }
                     checkSiteBatch(emisTmsSiteBatch, itemDtl);
                     emisTmsSiteBatchDtlMapper.updateEmisTmsSiteBatchDtl(itemDtl);
                 }