From a30958843bc005231cc1bbe68d56ee569bb1c936 Mon Sep 17 00:00:00 2001
From: zzh <1368735060@qq.com>
Date: Thu, 15 Oct 2026 09:14:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E6=AC=A1=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95=E6=97=A0=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6=E7=94=A8=E5=AE=A2=E6=88=B7=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=8D=A0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

轨迹侧 TrackNo 必填，后续有真实跟踪号再 Upsert 更新。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../SmallBagTrackUpsertRequestBuilder.cs         | 14 +++++++++++---
 .../SmallBagTrackUpsertRequestBuilderTests.cs    | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Oms.Application/Integrations/SmallBagTrack/SmallBagTrackUpsertRequestBuilder.cs b/src/Oms.Application/Integrations/SmallBagTrack/SmallBagTrackUpsertRequestBuilder.cs
index 19eef09..53a5d17 100644
--- a/src/Oms.Application/Integrations/SmallBagTrack/SmallBagTrackUpsertRequestBuilder.cs
+++ b/src/Oms.Application/Integrations/SmallBagTrack/SmallBagTrackUpsertRequestBuilder.cs
@@ -68,10 +68,18 @@ internal sealed class SmallBagTrackUpsertRequestBuilder(
     }
 
     /// <summary>
-    /// 仅取运单跟踪号；无值则空串，不回落运单号/客户单号等。
+    /// 轨迹侧 TrackNo 必填。有真实跟踪号用跟踪号；尚未下发时先用客户单号占位，后续有 TrackNo 再 Upsert 更新。
     /// </summary>
-    internal static string ResolveTrackNo(Order order) =>
-        order.TrackNo?.Trim() ?? string.Empty;
+    internal static string ResolveTrackNo(Order order)
+    {
+        var trackNo = order.TrackNo?.Trim() ?? string.Empty;
+        if (!string.IsNullOrWhiteSpace(trackNo))
+        {
+            return trackNo;
+        }
+
+        return order.ClientNo?.Trim() ?? string.Empty;
+    }
 
     internal static string? PickSupplierCodeFromProviders(
         IEnumerable<SalesProductAllocationProviderSnapshotDto> providers,
diff --git a/src/Oms.Tests/SmallBagTrackUpsertRequestBuilderTests.cs b/src/Oms.Tests/SmallBagTrackUpsertRequestBuilderTests.cs
index df70e79..47147c0 100644
--- a/src/Oms.Tests/SmallBagTrackUpsertRequestBuilderTests.cs
+++ b/src/Oms.Tests/SmallBagTrackUpsertRequestBuilderTests.cs
@@ -20,14 +20,28 @@ public class SmallBagTrackUpsertRequestBuilderTests
     }
 
     [Fact]
-    public void ResolveTrackNo_EmptyWhenTrackNoMissing()
+    public void ResolveTrackNo_FallsBackToClientNoWhenTrackNoMissing()
     {
         var order = new Order
         {
             ServiceNo = "IDE2607221859123456",
+            ClientNo = "CNO-001",
             TrackNo = null
         };
 
+        Assert.Equal("CNO-001", SmallBagTrackUpsertRequestBuilder.ResolveTrackNo(order));
+    }
+
+    [Fact]
+    public void ResolveTrackNo_EmptyWhenTrackNoAndClientNoMissing()
+    {
+        var order = new Order
+        {
+            ServiceNo = "IDE2607221859123456",
+            TrackNo = null,
+            ClientNo = null
+        };
+
         Assert.Equal(string.Empty, SmallBagTrackUpsertRequestBuilder.ResolveTrackNo(order));
     }