From 384fc6565e37f0b34af6ea366adb488cf53f2176 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 20 Aug 2025 14:48:02 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS-=E8=BF=90=E8=BE=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F-=E9=92=88=E5=AF=B9=E5=88=86=E6=89=B9=E7=BB=84?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=88=A4=E6=96=AD=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../erp/emis/service/EmisBaseService.java       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index a679d058a..13405c5fe 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -4656,6 +4656,23 @@ public class EmisBaseService {
                              batch.getSupplierCode())) {
                          continue;
                      }
+
+                     // 检查明细列表中是否有waybillBatchStatus=2的记录，如果有则不合并
+                     boolean hasWaybillBatchStatus2 = false;
+                     if (batch.getBatchDtlList() != null && !batch.getBatchDtlList().isEmpty()) {
+                         for (EmisTmsSiteBatchDtl dtl : batch.getBatchDtlList()) {
+                             if ("2".equals(dtl.getWaybillBatchStatus())) {
+                                 hasWaybillBatchStatus2 = true;
+                                 break;
+                             }
+                         }
+                     }
+
+                     // 如果有waybillBatchStatus=2的记录，跳过合并
+                     if (hasWaybillBatchStatus2) {
+                         continue;
+                     }
+
                      String key = batch.getStartSiteCode() + "_" + batch.getNextSiteCode();
                      if (mergedBatches.containsKey(key)) {
                          EmisTmsSiteBatch existingBatch = mergedBatches.get(key);