From 798046b612ae326f74fc68324a932bd5ccf61d66 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 12 Aug 2025 14:04:34 +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=E7=9B=B8=E5=90=8C=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E7=A7=BB=E9=99=A4=E5=90=8E=E5=8F=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA0bug=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisTmsSiteBatchDtlServiceImpl.java  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 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 c10be6ab0..7e7c8ce4f 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
@@ -141,9 +141,6 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
         if (StringUtils.isBlank(billCode)) {
             throw new EmisBizError(EmisBizErrorType.FAIL, "运单号不能为空");
         }
-        if (StringUtils.isBlank(batchNo)) {
-            throw new EmisBizError(EmisBizErrorType.FAIL, "批次号不能为空");
-        }
         if (StringUtils.isBlank(startSiteCode)) {
             throw new EmisBizError(EmisBizErrorType.FAIL, "起始网点编码不能为空");
         }
@@ -161,14 +158,16 @@ public class EmisTmsSiteBatchDtlServiceImpl implements IEmisTmsSiteBatchDtlServi
         EmisTmsSiteBatchDtl result = new EmisTmsSiteBatchDtl();
         result.setWaybillDetail(emisWaybill);
 
-        // 根据批次号、运单号查询emis_tms_site_batch_dtl，如果存在，直接返回数据
-        EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper
-                .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode);
-        if (existingBatchDtl != null) {
-            result.setBatchParcelQty(existingBatchDtl.getBatchParcelQty());
-            result.setBatchWeight(existingBatchDtl.getBatchWeight());
-            result.setBatchVolume(existingBatchDtl.getBatchVolume());
-            return result;
+        if (StringUtils.isNotBlank(batchNo)) {
+            // 根据批次号、运单号查询emis_tms_site_batch_dtl，如果存在，直接返回数据
+            EmisTmsSiteBatchDtl existingBatchDtl = emisTmsSiteBatchDtlMapper
+                    .selectEmisTmsSiteBatchDtlByBatchNoAndBillCode(batchNo, billCode);
+            if (existingBatchDtl != null) {
+                result.setBatchParcelQty(existingBatchDtl.getBatchParcelQty());
+                result.setBatchWeight(existingBatchDtl.getBatchWeight());
+                result.setBatchVolume(existingBatchDtl.getBatchVolume());
+                return result;
+            }
         }
 
         // 查询运输计划规则