From e332b01163c74191c9e0fcbbc2f9bb0b117679c0 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 12 Dec 2025 13:35:01 +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

---
 .../impl/EmisTmsSiteBatchDtlServiceImpl.java  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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 6e028d112..01083420f 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
@@ -234,22 +234,22 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
             boolean hasMatchingSupplier = existingBatches.stream()
                     .anyMatch(batch -> supplierCodeList.contains(batch.getSupplierCode()));
 
-            if (hasMatchingSupplier) {
-                // 找到匹配的批次，检查重量、体积、件数是否一致
-                EmisTmsSiteBatch matchingBatch = existingBatches.stream()
-                        .filter(batch -> supplierCodeList.contains(batch.getSupplierCode()))
-                        .findFirst()
-                        .orElse(null);
-                if (Objects.nonNull(matchingBatch)) {
-                    result.setBatchParcelQty(
-                            matchingBatch.getTotalParcelQty() != null ? matchingBatch.getTotalParcelQty() : 0);
-                    result.setBatchWeight(
-                            matchingBatch.getTotalWeight() != null ? matchingBatch.getTotalWeight() : BigDecimal.ZERO);
-                    result.setBatchVolume(
-                            matchingBatch.getTotalVolume() != null ? matchingBatch.getTotalVolume() : BigDecimal.ZERO);
-                    return result;
-                }
-            }
+//            if (hasMatchingSupplier) {
+//                // 找到匹配的批次，检查重量、体积、件数是否一致
+//                EmisTmsSiteBatch matchingBatch = existingBatches.stream()
+//                        .filter(batch -> supplierCodeList.contains(batch.getSupplierCode()))
+//                        .findFirst()
+//                        .orElse(null);
+//                if (Objects.nonNull(matchingBatch)) {
+//                    result.setBatchParcelQty(
+//                            matchingBatch.getTotalParcelQty() != null ? matchingBatch.getTotalParcelQty() : 0);
+//                    result.setBatchWeight(
+//                            matchingBatch.getTotalWeight() != null ? matchingBatch.getTotalWeight() : BigDecimal.ZERO);
+//                    result.setBatchVolume(
+//                            matchingBatch.getTotalVolume() != null ? matchingBatch.getTotalVolume() : BigDecimal.ZERO);
+//                    return result;
+//                }
+//            }
         }
 
         // 先过滤出包含多个供应商编码的rules