From 1946f6a5e9dcc601eb077f8fa2a923fbdf839179 Mon Sep 17 00:00:00 2001
From: hexiaodong <1@1.com>
Date: Tue, 31 Mar 2026 11:48:23 +0800
Subject: [PATCH] feat(douyin): 退款中状态、发货单重提重建销售出库单；wtSp/NCC 相关调整

---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue                             |  11 ++++++++---
 Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/index.vue                            |   6 +++---
 Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/OrdersController.cs          |  79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/WaybillController.cs         |  26 +++++++++++++++++---------
 Antis.Erp.Plat/douyin/DouyinLogistics.API/Models/Order.cs                          |   2 +-
 Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/DouyinService.cs                | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/OrderService.cs                 | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 Antis.Erp.Plat/douyin/DouyinLogistics.API/appsettings.Development.json             |   3 +++
 Antis.Erp.Plat/douyin/frontend/src/api/order.ts                                    |   6 +++++-
 Antis.Erp.Plat/douyin/frontend/src/utils/config.ts                                 |  11 +++++++++++
 Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue                     | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------
 Antis.Erp.Plat/douyin/frontend/src/views/OrderListView.vue                         |  23 +++++++++++++++--------
 Antis.Erp.Plat/netcore/src/Application/NCC.API/Properties/launchSettings.json      |   2 +-
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtSpCrInput.cs |   2 +-
 Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs             |  80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 15 files changed, 511 insertions(+), 208 deletions(-)

diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue
index 57cfd23..f5f2264 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/Form.vue
@@ -10,7 +10,7 @@
 					</el-col>
 					<el-col :span="24">
 						<el-form-item label="商品品类" prop="pl">
-							<el-select v-model="dataForm.pl" placeholder="请选择" clearable :style='{"width":"100%"}' >
+							<el-select v-model="dataForm.pl" placeholder="请选择（可多选）" clearable multiple collapse-tags :style='{"width":"100%"}' >
 								<el-option v-for="(item, index) in plOptions" :key="index" :label="item.F_Plmc" :value="item.F_Id" ></el-option>
 							</el-select>
 						</el-form-item>
@@ -161,7 +161,7 @@
 				dataForm: {
 					id:'',
 					spmc:undefined,
-					pl:undefined,
+					pl:[],
 					pp:undefined,
 					spbm:undefined,
 						dyspid:undefined,
@@ -313,6 +313,9 @@
 							this.dataForm = res.data;
 							if(!this.dataForm.spzt)this.dataForm.spzt=[];
 							if(!this.dataForm.xsmd)this.dataForm.xsmd=[];
+							// 商品品类：接口为逗号分隔的多个 F_Id
+							const plRaw = this.dataForm.pl;
+							this.dataForm.pl = plRaw ? String(plRaw).split(',').map(s => s.trim()).filter(Boolean) : [];
 							this.getStock(this.dataForm.spbm);
 						})
 					} else {
@@ -386,7 +389,9 @@
                             tcfs_bl: this.dataForm.tcfs_bl || null,
                             spxlhType: this.dataForm.spxlhType || null,
                             xsqd: this.dataForm.xsqd || null,
-                            pl: this.dataForm.pl || null,
+                            pl: Array.isArray(this.dataForm.pl) && this.dataForm.pl.length
+								? this.dataForm.pl.join(',')
+								: (this.dataForm.pl && typeof this.dataForm.pl === 'string' ? this.dataForm.pl : null),
                             pp: this.dataForm.pp || null,
                             spbm: this.dataForm.spbm || null,
                             dyspid: this.dataForm.dyspid || null,
diff --git a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/index.vue b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/index.vue
index 23df5a4..37d376d 100644
--- a/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/index.vue
+++ b/Antis.Erp.Plat/antis-ncc-admin/src/views/wtSp/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
@@ -101,8 +101,8 @@
 				</div>
                 <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
 					<el-table-column prop="spmc" label="商品名称" align="left" />
-					<el-table-column label="商品品类" prop="pl" align="left">
-							<template slot-scope="scope">{{ scope.row.pl | dynamicText(plOptions) }}</template>
+					<el-table-column label="商品品类" prop="pl" align="left" min-width="140" show-overflow-tooltip>
+							<template slot-scope="scope">{{ scope.row.pl }}</template>
 					</el-table-column>
 					<el-table-column label="商品品牌" prop="pp" align="left">
 							<template slot-scope="scope">{{ scope.row.pp | dynamicText(ppOptions) }}</template>
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/OrdersController.cs b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/OrdersController.cs
index e83915f..7458931 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/OrdersController.cs
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/OrdersController.cs
@@ -5,6 +5,7 @@ using SqlSugar;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Linq;
 
 namespace DouyinLogistics.API.Controllers;
@@ -40,6 +41,8 @@ public class OrdersController : ControllerBase
         [FromQuery] string? trackingNumber = null,
         [FromQuery] string? productName = null,
         [FromQuery] bool? hasWaybill = null,
+        /// <summary>为 true 时：待发货 + 已有运单号 + 尚未成功提交发货单（waybills 无 SalesOrderId）</summary>
+        [FromQuery] bool pendingShipmentForm = false,
         [FromQuery] DateTime? createTimeStart = null,
         [FromQuery] DateTime? createTimeEnd = null,
         [FromQuery] DateTime? payTimeStart = null,
@@ -52,7 +55,7 @@ public class OrdersController : ControllerBase
             
             var (orders, total) = await _orderService.GetOrdersWithPagingAsync(
                 pageIndex, pageSize, status, orderId, receiverName, receiverPhone, 
-                trackingNumber, productName, hasWaybill, createTimeStart, createTimeEnd, payTimeStart, payTimeEnd);
+                trackingNumber, productName, hasWaybill, pendingShipmentForm, createTimeStart, createTimeEnd, payTimeStart, payTimeEnd);
             return Ok(new { data = orders, total, pageIndex, pageSize });
         }
         catch (Exception ex)
@@ -476,6 +479,11 @@ public class OrdersController : ControllerBase
                 return BadRequest(new { message = "订单已存在运单号" });
             }
 
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许创建运单" });
+            }
+
             // 调试日志
             Console.WriteLine($"🔍 [控制器] 创建运单请求: orderId={id}, 使用订单中的手机号: {order.ReceiverPhone}");
             _logger.LogInformation($"创建运单请求: orderId={id}, 使用订单中的手机号: {order.ReceiverPhone}");
@@ -619,7 +627,7 @@ public class OrdersController : ControllerBase
         [FromQuery] string? spmc = null,      // 商品名称
         [FromQuery] string? spbm = null,       // 商品编码
         [FromQuery] string? dyspid = null,     // 抖音SKU编码
-        [FromQuery] string? pl = null,        // 商品品类（wt_pl.F_Id）
+        [FromQuery] string? pl = null,        // 商品品类（单个 wt_pl.F_Id；商品可多品类逗号存储，ERP 按包含匹配）
         [FromQuery] int pageIndex = 1, 
         [FromQuery] int pageSize = 20)
     {
@@ -789,7 +797,8 @@ public class OrdersController : ControllerBase
         catch (Exception ex)
         {
             _logger.LogError(ex, "查询ERP商品失败");
-            return StatusCode(500, new { message = "查询ERP商品失败", error = ex.Message });
+            var hint = GetErpConnectionHint(ex);
+            return StatusCode(500, new { message = "查询ERP商品失败", error = hint ?? ex.Message });
         }
     }
 
@@ -861,7 +870,8 @@ public class OrdersController : ControllerBase
                 var data = result["data"];
                 if (data == null || data.Type == Newtonsoft.Json.Linq.JTokenType.Null)
                 {
-                    return NotFound(new { message = "未找到商品信息" });
+                    // 使用 200 + data=null，避免前端 axios 将 HTTP 404 当作异常
+                    return Ok(new { code = 200, data = (object?)null, message = "未找到商品信息" });
                 }
                 
                 // 解析商品列表
@@ -877,7 +887,7 @@ public class OrdersController : ControllerBase
                 
                 if (list == null || (list is Newtonsoft.Json.Linq.JArray productArray && productArray.Count == 0))
                 {
-                    return NotFound(new { message = "未找到商品信息" });
+                    return Ok(new { code = 200, data = (object?)null, message = "未找到商品信息" });
                 }
                 
                 // 获取第一个商品（或匹配的商品）
@@ -892,6 +902,16 @@ public class OrdersController : ControllerBase
                             .FirstOrDefault(p => p["spbm"]?.ToString() == productCode);
                     }
                     
+                    // 仅传 skuId 时：优先 dyspid 完全匹配（keyword 可能命中多条或误命中名称）
+                    if (productObj == null && !string.IsNullOrEmpty(skuId))
+                    {
+                        productObj = productArray2
+                            .OfType<Newtonsoft.Json.Linq.JObject>()
+                            .FirstOrDefault(p =>
+                                string.Equals(p["dyspid"]?.ToString(), skuId, StringComparison.Ordinal)
+                                || string.Equals(p["Dyspid"]?.ToString(), skuId, StringComparison.Ordinal));
+                    }
+                    
                     // 如果没找到完全匹配的，使用第一个
                     if (productObj == null && productArray2.Count > 0)
                     {
@@ -901,6 +921,28 @@ public class OrdersController : ControllerBase
                 
                 if (productObj != null)
                 {
+                    string? infoImageUrl = null;
+                    var infoSpztRaw = productObj["spzt"]?.ToString();
+                    if (!string.IsNullOrEmpty(infoSpztRaw))
+                    {
+                        try
+                        {
+                            var spztArr = JsonConvert.DeserializeObject<JArray>(infoSpztRaw);
+                            if (spztArr != null && spztArr.Count > 0)
+                            {
+                                var firstImg = spztArr[0] as JObject;
+                                var relUrl = firstImg?["url"]?.ToString();
+                                if (!string.IsNullOrEmpty(relUrl))
+                                {
+                                    infoImageUrl = relUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase)
+                                        ? relUrl
+                                        : erpApiConfig.BaseUrl.TrimEnd('/') + relUrl;
+                                }
+                            }
+                        }
+                        catch { /* ignore */ }
+                    }
+
                     return Ok(new
                     {
                         code = 200,
@@ -909,17 +951,18 @@ public class OrdersController : ControllerBase
                             id = productObj["id"]?.ToString(),
                             spbm = productObj["spbm"]?.ToString(),
                             spmc = productObj["spmc"]?.ToString(),
-                            spxlhType = productObj["spxlhType"]?.ToString(), // 序列号类型
+                            spxlhType = productObj["spxlhType"]?.ToString() ?? productObj["SpxlhType"]?.ToString(),
                             lsj = productObj["lsj"]?.ToObject<decimal>() ?? 0,
                             dw = productObj["dw"]?.ToString(),
                             gg = productObj["gg"]?.ToString(),
-                            dyspid = productObj["dyspid"]?.ToString()
+                            dyspid = productObj["dyspid"]?.ToString(),
+                            imageUrl = infoImageUrl
                         }
                     });
                 }
             }
             
-            return NotFound(new { message = "未找到商品信息" });
+            return Ok(new { code = 200, data = (object?)null, message = "未找到商品信息" });
         }
         catch (Exception ex)
         {
@@ -1342,7 +1385,8 @@ public class OrdersController : ControllerBase
         catch (Exception ex)
         {
             _logger.LogError(ex, "查询仓库列表失败");
-            return StatusCode(500, new { message = "查询仓库列表失败", error = ex.Message });
+            var hint = GetErpConnectionHint(ex);
+            return StatusCode(500, new { message = "查询仓库列表失败", error = hint ?? ex.Message });
         }
     }
 
@@ -1402,6 +1446,11 @@ public class OrdersController : ControllerBase
                 return BadRequest(new { message = "订单尚未创建运单，请先创建运单" });
             }
 
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许发货" });
+            }
+
             var result = await _orderService.ShipToDouyinAsync(id);
             if (result.Success)
             {
@@ -1510,6 +1559,18 @@ public class OrdersController : ControllerBase
         }
     }
 
+    private static string? GetErpConnectionHint(Exception ex)
+    {
+        if (ex is HttpRequestException or SocketException or TaskCanceledException)
+            return "无法连接 ERP：请确认 NCC.API 已启动，且 appsettings 中 ErpApi.BaseUrl 与 NCC 实际监听地址一致。";
+        for (var e = ex.InnerException; e != null; e = e.InnerException)
+        {
+            if (e is HttpRequestException or SocketException)
+                return "无法连接 ERP：请确认 NCC.API 已启动，且 appsettings 中 ErpApi.BaseUrl 与 NCC 实际监听地址一致。";
+        }
+        return null;
+    }
+
     /// <summary>
     /// 清理所有订单并重新同步（天数由 appsettings.json 的 Douyin.SyncDays 配置，默认30天）
     /// </summary>
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/WaybillController.cs b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/WaybillController.cs
index df3bc55..d04cdec 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/WaybillController.cs
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Controllers/WaybillController.cs
@@ -32,9 +32,9 @@ public class WaybillController : ControllerBase
             {
                 return NotFound(new { message = "订单不存在" });
             }
-            if (order.Status == 2 || order.Status == 3)
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
             {
-                return BadRequest(new { message = "已取消或已退款的订单不允许进行任何操作" });
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许进行任何操作" });
             }
 
             var preview = await _orderService.GetWaybillPreviewAsync(orderId);
@@ -67,9 +67,9 @@ public class WaybillController : ControllerBase
             {
                 return NotFound(new { message = "订单不存在" });
             }
-            if (order.Status == 2 || order.Status == 3)
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
             {
-                return BadRequest(new { message = "已取消或已退款的订单不允许进行任何操作" });
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许进行任何操作" });
             }
 
             var result = await _orderService.PrintWaybillAsync(orderId);
@@ -110,9 +110,9 @@ public class WaybillController : ControllerBase
             {
                 return NotFound(new { message = "订单不存在" });
             }
-            if (order.Status == 2 || order.Status == 3)
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
             {
-                return BadRequest(new { message = "已取消或已退款的订单不允许进行任何操作" });
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许进行任何操作" });
             }
 
             var result = await _orderService.PrintWaybillAndShipAsync(orderId);
@@ -174,10 +174,10 @@ public class WaybillController : ControllerBase
                 return NotFound(new { message = "订单不存在" });
             }
 
-            // 检查订单状态，已取消/已退款的订单不允许创建发货单
-            if (order.Status == 2 || order.Status == 3)
+            // 检查订单状态，已取消/已退款/退款中的订单不允许创建发货单
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
             {
-                return BadRequest(new { message = "已取消或已退款的订单不允许进行任何操作" });
+                return BadRequest(new { message = "已取消、已退款或退款中的订单不允许进行任何操作" });
             }
 
             var db = HttpContext.RequestServices.GetRequiredService<ISqlSugarClient>();
@@ -261,6 +261,14 @@ public class WaybillController : ControllerBase
                 existingWaybill.Remark = request.Remark ?? existingWaybill.Remark;
                 existingWaybill.UpdateTime = DateTime.Now;
 
+                // 商品明细变更时清除已关联的销售出库单，让后续流程重新创建
+                if (!string.IsNullOrEmpty(existingWaybill.SalesOrderId))
+                {
+                    _logger.LogInformation("发货单商品明细已更新，清除旧销售出库单关联: WaybillId={WaybillId}, OldSalesOrderId={OldSalesOrderId}",
+                        existingWaybill.Id, existingWaybill.SalesOrderId);
+                    existingWaybill.SalesOrderId = null;
+                }
+
                 await db.Updateable(existingWaybill).ExecuteCommandAsync();
                 waybill = existingWaybill;
                 waybillId = existingWaybill.Id;
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Models/Order.cs b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Models/Order.cs
index 55e8dab..91de0d9 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Models/Order.cs
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Models/Order.cs
@@ -18,7 +18,7 @@ public class Order
     public string OrderId { get; set; } = string.Empty;
 
     /// <summary>
-    /// 订单状态：0-待发货，1-已发货，2-已取消，3-已退款
+    /// 订单状态：0-待发货，1-已发货，2-已取消，3-已退款，4-退款中
     /// </summary>
     public int Status { get; set; }
 
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/DouyinService.cs b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/DouyinService.cs
index bbb0011..7a5d27b 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/DouyinService.cs
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/DouyinService.cs
@@ -1,5 +1,6 @@
 using DouyinLogistics.API.Models;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -24,6 +25,107 @@ public class DouyinService
     }
 
     /// <summary>
+    /// 合并抖音主单/子单状态与文案，识别退款完结(21/22/39)与退款流程中。
+    /// 抖店在「退款中」时仍可能返回 order_status=2（待发货），仅靠 order_status 会误判。
+    /// 返回 20 表示退款处理中（内部约定，非抖音原始枚举），由 MapOrderStatus 映射为本地 4。
+    /// </summary>
+    private static int ResolveRefundAwareOrderStatus(JObject orderObj, int rawOrderStatus)
+    {
+        static bool IsRefundFinished(int s) => s is 21 or 22 or 39;
+
+        var orderStatus = rawOrderStatus;
+        var mainStatus = orderObj["main_status"]?.ToObject<int?>();
+        var orderStatusDesc = orderObj["order_status_desc"]?.ToString() ?? "";
+        var mainStatusDesc = orderObj["main_status_desc"]?.ToString() ?? "";
+        var skuList = orderObj["sku_order_list"] as JArray;
+
+        if (mainStatus.HasValue && IsRefundFinished(mainStatus.Value))
+            return mainStatus.Value;
+
+        if (skuList != null)
+        {
+            foreach (var sku in skuList)
+            {
+                if (sku is not JObject so) continue;
+                var skuSt = so["order_status"]?.ToObject<int?>();
+                if (skuSt.HasValue && IsRefundFinished(skuSt.Value))
+                    return skuSt.Value;
+                // 退款进行中时，主单/子单仍常为 order_status=2、文案「待发货」；真实状态在 after_sale_info（order.orderDetail 实测 refund_status=1）
+                var asi = so["after_sale_info"] as JObject;
+                if (asi != null)
+                {
+                    var refundSt = asi["refund_status"]?.ToObject<int?>();
+                    if (refundSt == 1)
+                        return 20;
+                }
+            }
+        }
+
+        static bool DescExcludesRefund(string a, string b)
+        {
+            var c = (a ?? "") + (b ?? "");
+            return c.Contains("不支持退款") || c.Contains("不可退款");
+        }
+
+        static bool DescRefundInProgress(string a, string b)
+        {
+            if (DescExcludesRefund(a, b)) return false;
+            var c = (a ?? "") + (b ?? "");
+            return c.Contains("退款中") || c.Contains("退款申请") || c.Contains("售后中")
+                   || c.Contains("售后处理") || c.Contains("仅退款") || c.Contains("退货退款");
+        }
+
+        static bool DescRefundDone(string a, string b)
+        {
+            if (DescExcludesRefund(a, b)) return false;
+            var c = (a ?? "") + (b ?? "");
+            return c.Contains("退款完结") || c.Contains("已退款") || c.Contains("退款成功");
+        }
+
+        // order_status 仍为待发货(2)或已发货(3)时，用主单/子单文案识别退款
+        if (orderStatus is 2 or 3)
+        {
+            if (DescRefundDone(orderStatusDesc, mainStatusDesc))
+                return 21;
+            if (DescRefundInProgress(orderStatusDesc, mainStatusDesc))
+                return 20;
+            if (skuList != null)
+            {
+                foreach (var sku in skuList)
+                {
+                    if (sku is not JObject so) continue;
+                    var sd = so["order_status_desc"]?.ToString() ?? "";
+                    var smd = so["main_status_desc"]?.ToString() ?? "";
+                    if (DescRefundDone(sd, smd)) return 21;
+                    if (DescRefundInProgress(sd, smd)) return 20;
+                }
+            }
+        }
+
+        // 原逻辑：已关闭(4)时从 main/sku/文案推断退款完结
+        if (orderStatus == 4)
+        {
+            if (mainStatus.HasValue && IsRefundFinished(mainStatus.Value))
+                return mainStatus.Value;
+            if (!DescExcludesRefund(orderStatusDesc, mainStatusDesc)
+                && (orderStatusDesc.Contains("退款") || mainStatusDesc.Contains("退款")))
+                return 21;
+            if (skuList != null)
+            {
+                foreach (var sku in skuList)
+                {
+                    if (sku is not JObject so) continue;
+                    var skuSt = so["order_status"]?.ToObject<int?>();
+                    if (skuSt.HasValue && IsRefundFinished(skuSt.Value))
+                        return skuSt.Value;
+                }
+            }
+        }
+
+        return orderStatus;
+    }
+
+    /// <summary>
     /// 设置 Access Token（从授权回调获取）
     /// </summary>
     public void SetAccessToken(string accessToken)
@@ -215,44 +317,15 @@ public class DouyinService
                             {
                             var orderId = orderObj["order_id"]?.ToString() ?? "";
                             
-                            // 从 ShopOrderListItem 提取订单信息，优先识别已退款状态(21/22/39)
-                            // 抖店可能将 order_status 返回为 4(已取消)，但 main_status 或 sku 中为 21/22/39
-                            var orderStatus = orderObj["order_status"]?.ToObject<int>() ?? 0;
-                            var mainStatus = orderObj["main_status"]?.ToObject<int?>();
-                            var orderStatusDesc = orderObj["order_status_desc"]?.ToString() ?? "";
-                            var mainStatusDesc = orderObj["main_status_desc"]?.ToString() ?? "";
-                            
-                            // 若 order_status 为 4(已取消)，检查 main_status 和 sku_order_list 是否为退款完结
-                            if (orderStatus == 4)
-                            {
-                                var origStatus = orderStatus;
-                                if (mainStatus.HasValue && (mainStatus.Value == 21 || mainStatus.Value == 22 || mainStatus.Value == 39))
-                                    orderStatus = mainStatus.Value;
-                                else if (orderStatusDesc.Contains("退款") || mainStatusDesc.Contains("退款"))
-                                    orderStatus = 21; // 描述含退款则视为发货前退款完结
-                                else
-                                {
-                                    var skuList = orderObj["sku_order_list"] as Newtonsoft.Json.Linq.JArray;
-                                    if (skuList != null)
-                                        foreach (var sku in skuList)
-                                            if (sku is Newtonsoft.Json.Linq.JObject so)
-                                            {
-                                                var skuStatus = so["order_status"]?.ToObject<int?>();
-                                                if (skuStatus.HasValue && (skuStatus.Value == 21 || skuStatus.Value == 22 || skuStatus.Value == 39))
-                                                {
-                                                    orderStatus = skuStatus.Value;
-                                                    break;
-                                                }
-                                            }
-                                }
-                                if (orderStatus != origStatus)
-                                    _logger.LogInformation("订单 {OrderId} 状态修正: order_status={Orig}, main_status={Main}, 修正后={Final}", orderId, origStatus, mainStatus, orderStatus);
-                            }
+                            var rawOrderStatus = orderObj["order_status"]?.ToObject<int>() ?? 0;
+                            var orderStatus = ResolveRefundAwareOrderStatus(orderObj, rawOrderStatus);
+                            if (orderStatus != rawOrderStatus)
+                                _logger.LogInformation("订单 {OrderId} 状态修正: 原始 order_status={Raw}, 修正后={Final}", orderId, rawOrderStatus, orderStatus);
                             
                             var order = new DouyinOrder
                             {
                                 OrderId = orderId,
-                                OrderStatus = orderStatus, // 保存抖音的原始状态（含修正后的退款状态）
+                                OrderStatus = orderStatus, // 含 21/22/39 完结码与内部 20=退款处理中
                                 OpenId = orderObj["open_id"]?.ToString() ?? orderObj["doudian_open_id"]?.ToString()
                             };
                             
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/OrderService.cs b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/OrderService.cs
index 7efd445..bd921cc 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/OrderService.cs
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/Services/OrderService.cs
@@ -58,8 +58,8 @@ public class OrderService
 
     /// <summary>
     /// 将抖音订单状态映射到本地订单状态
-    /// 抖音：2=待发货，3=已发货，21=发货前退款完结，22=发货后退款完结，39=收货后退款完结，4等=已取消
-    /// 本地：0=待发货，1=已发货，2=已取消，3=已退款
+    /// 抖音：2=待发货，3=已发货，21/22/39=退款完结，4=已关闭；20=同步层识别的「退款处理中」（见 DouyinService）
+    /// 本地：0=待发货，1=已发货，2=已取消，3=已退款，4=退款中
     /// </summary>
     private int MapOrderStatus(int douyinStatus)
     {
@@ -67,6 +67,7 @@ public class OrderService
         {
             2 => 0,   // 待发货（备货中）
             3 => 1,   // 已发货
+            20 => 4,  // 退款处理中（抖音文案/main_status 识别，非官方数字码）
             21 => 3,  // 发货前退款完结
             22 => 3,  // 发货后退款完结
             39 => 3,  // 收货后退款完结
@@ -357,6 +358,13 @@ public class OrderService
     {
         try
         {
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                _logger.LogWarning("订单状态不允许创建运单: DbId={DbId}, OrderId={OrderId}, Status={Status}",
+                    order.Id, order.OrderId, order.Status);
+                return false;
+            }
+
             _logger.LogInformation("开始为订单创建运单: OrderId={OrderId}, ReceiverName={ReceiverName}", 
                 order.OrderId, order.ReceiverName);
             
@@ -449,6 +457,7 @@ public class OrderService
         string? trackingNumber = null,
         string? productName = null,
         bool? hasWaybill = null,
+        bool pendingShipmentForm = false,
         DateTime? createTimeStart = null,
         DateTime? createTimeEnd = null,
         DateTime? payTimeStart = null,
@@ -486,24 +495,7 @@ public class OrderService
             query = query.Where(o => o.ProductName != null && o.ProductName.Contains(productName));
         }
 
-        // 筛选是否有发货单
-        if (hasWaybill.HasValue)
-        {
-            if (hasWaybill.Value)
-            {
-                // 有发货单：存在waybills表中有该订单的记录
-                query = query.Where(o => SqlFunc.Subqueryable<Waybill>()
-                    .Where(w => w.OrderId == o.Id)
-                    .Any());
-            }
-            else
-            {
-                // 无发货单：waybills表中没有该订单的记录
-                query = query.Where(o => !SqlFunc.Subqueryable<Waybill>()
-                    .Where(w => w.OrderId == o.Id)
-                    .Any());
-            }
-        }
+        // hasWaybill 在「同人同址合并」之后处理：否则只有子单有 waybills/运单号时，SQL 会整组拆散，列表里筛不出已建运单的合并单
 
         if (createTimeStart.HasValue)
         {
@@ -525,12 +517,14 @@ public class OrderService
             query = query.Where(o => o.PayTime != null && o.PayTime <= payTimeEnd.Value.AddDays(1).AddSeconds(-1));
         }
 
-        // 所有状态都参与合并（按买家+地址分组），已退款/已取消从合并组中剔除
+        // 所有状态都参与合并（按买家+地址分组），已退款/退款中/已取消从合并组中剔除
         var allOrders = await query
             .OrderBy($"IFNULL(PayTime, '1970-01-01 00:00:00') ASC, CreateTime ASC")
             .Take(1000)
             .ToListAsync();
         var merged = MergeOrdersByBuyerAndAddress(allOrders);
+        if (pendingShipmentForm || hasWaybill.HasValue)
+            merged = await FilterMergedOrdersPostProcessAsync(merged, hasWaybill, pendingShipmentForm);
         var total = merged.Count;
         var paged = merged
             .Skip((pageIndex - 1) * pageSize)
@@ -543,7 +537,7 @@ public class OrderService
     /// 合并订单规则：
     /// 1. 待发货(0)：同买家同地址 → 合并（用于一起发货）
     /// 2. 已发货(1)：同运单号 → 合并（之前合并发货的继续合并展示，分开发货的分开展示）
-    /// 3. 已退款(3)中的订单从待发货合并组中剔除，单独显示
+    /// 3. 已退款(3)、退款中(4)从待发货合并组中剔除，单独显示
     /// 4. 已取消(2)：始终单独显示，不合并
     /// </summary>
     private List<Order> MergeOrdersByBuyerAndAddress(List<Order> orders)
@@ -557,12 +551,14 @@ public class OrderService
         var shippedOrders = orders.Where(o => o.Status == 1).ToList();   // 已发货
         var cancelledOrders = orders.Where(o => o.Status == 2).ToList(); // 已取消
         var refundedOrders = orders.Where(o => o.Status == 3).ToList();  // 已退款
+        var refundingOrders = orders.Where(o => o.Status == 4).ToList(); // 退款中
 
         // 规则4：已取消始终单独显示
         result.AddRange(cancelledOrders);
 
-        // 规则3：已退款始终单独显示
+        // 规则3：已退款、退款中始终单独显示
         result.AddRange(refundedOrders);
+        result.AddRange(refundingOrders);
 
         // 规则1：待发货按同买家同地址合并
         var pendingGroups = pendingOrders
@@ -645,10 +641,79 @@ public class OrderService
         first.MergedOrderStatuses = list.Select(o => o.Status).ToList();
         first.PayAmount = list.Sum(o => o.PayAmount ?? 0);
         first.OrderAmount = list.Sum(o => o.OrderAmount ?? 0);
+        var withTracking = list.FirstOrDefault(o => !string.IsNullOrWhiteSpace(o.TrackingNumber));
+        if (withTracking != null)
+        {
+            first.TrackingNumber = withTracking.TrackingNumber;
+            if (!string.IsNullOrWhiteSpace(withTracking.LogisticsCompany))
+                first.LogisticsCompany = withTracking.LogisticsCompany;
+        }
         return first;
     }
 
     /// <summary>
+    /// 合并结果后筛选：hasWaybill 表示是否有运单/运单号；pendingShipmentForm 表示「有运单但未在系统中提交发货单」
+    /// （提交成功后会写入 waybills.SalesOrderId，即已生成 ERP 销售出库单）
+    /// </summary>
+    private async Task<List<Order>> FilterMergedOrdersPostProcessAsync(
+        List<Order> merged,
+        bool? hasWaybill,
+        bool pendingShipmentForm)
+    {
+        if (merged == null || merged.Count == 0)
+            return merged ?? new List<Order>();
+
+        var allIds = merged
+            .SelectMany(m => m.MergedOrderIds != null && m.MergedOrderIds.Count > 0
+                ? m.MergedOrderIds
+                : new List<int> { m.Id })
+            .Distinct()
+            .ToList();
+
+        var wbRows = await _db.Queryable<Waybill>()
+            .Where(w => allIds.Contains(w.OrderId))
+            .Select(w => new { w.OrderId, w.SalesOrderId })
+            .ToListAsync();
+        var hasWaybillRow = wbRows.Select(w => w.OrderId).ToHashSet();
+        var submittedOrderIds = wbRows
+            .Where(w => !string.IsNullOrWhiteSpace(w.SalesOrderId))
+            .Select(w => w.OrderId)
+            .ToHashSet();
+
+        var trackRows = await _db.Queryable<Order>()
+            .Where(o => allIds.Contains(o.Id))
+            .Select(o => new { o.Id, o.TrackingNumber })
+            .ToListAsync();
+        var hasTracking = trackRows
+            .Where(t => !string.IsNullOrWhiteSpace(t.TrackingNumber))
+            .Select(t => t.Id)
+            .ToHashSet();
+
+        bool GroupHasWaybill(IEnumerable<int> ids) =>
+            ids.Any(id => hasWaybillRow.Contains(id) || hasTracking.Contains(id));
+
+        bool GroupHasSubmittedShipmentForm(IEnumerable<int> ids) =>
+            ids.Any(id => submittedOrderIds.Contains(id));
+
+        return merged.Where(m =>
+        {
+            var ids = m.MergedOrderIds != null && m.MergedOrderIds.Count > 0
+                ? m.MergedOrderIds
+                : new List<int> { m.Id };
+            if (pendingShipmentForm)
+            {
+                return GroupHasWaybill(ids) && !GroupHasSubmittedShipmentForm(ids);
+            }
+            if (hasWaybill.HasValue)
+            {
+                var has = GroupHasWaybill(ids);
+                return hasWaybill.Value ? has : !has;
+            }
+            return true;
+        }).ToList();
+    }
+
+    /// <summary>
     /// 诊断订单合并情况（用于排查为何未合并）
     /// </summary>
     public async Task<List<object>> GetMergeDiagnosisAsync(params string[] orderIds)
@@ -778,6 +843,13 @@ public class OrderService
                 return result;
             }
 
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                result.ErrorMessage = "已取消、已退款或退款中的订单不允许打印";
+                result.Success = false;
+                return result;
+            }
+
             // 标记为已打印（实际打印由前端完成）
             result.Printed = true;
             result.Shipped = false; // 不执行发货操作
@@ -835,6 +907,12 @@ public class OrderService
                 return result;
             }
 
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                result.ErrorMessage = "已取消、已退款或退款中的订单不允许发货";
+                return result;
+            }
+
             // 如果订单状态还是待发货，则发货到抖音
             if (order.Status == 0) // 待发货
             {
@@ -915,6 +993,12 @@ public class OrderService
                 return result;
             }
 
+            if (order.Status == 2 || order.Status == 3 || order.Status == 4)
+            {
+                result.ErrorMessage = "已取消、已退款或退款中的订单不允许打印并发货";
+                return result;
+            }
+
             // 标记为已打印（这里只是标记，实际打印由前端完成）
             result.Printed = true;
             result.TrackingNumber = order.TrackingNumber;
diff --git a/Antis.Erp.Plat/douyin/DouyinLogistics.API/appsettings.Development.json b/Antis.Erp.Plat/douyin/DouyinLogistics.API/appsettings.Development.json
index ff66ba6..87cfbb6 100644
--- a/Antis.Erp.Plat/douyin/DouyinLogistics.API/appsettings.Development.json
+++ b/Antis.Erp.Plat/douyin/DouyinLogistics.API/appsettings.Development.json
@@ -4,5 +4,8 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "ErpApi": {
+    "BaseUrl": "http://localhost:2011"
   }
 }
diff --git a/Antis.Erp.Plat/douyin/frontend/src/api/order.ts b/Antis.Erp.Plat/douyin/frontend/src/api/order.ts
index f5da817..f3ec6e0 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/api/order.ts
+++ b/Antis.Erp.Plat/douyin/frontend/src/api/order.ts
@@ -15,6 +15,7 @@ const api = axios.create({
 export interface Order {
   id: number
   orderId: string
+  /** 0 待发货 1 已发货 2 已取消 3 已退款 4 退款中 */
   status: number
   /** 合并的订单ID列表（同人同地址合并时） */
   mergedOrderIds?: number[]
@@ -65,6 +66,8 @@ export const getOrders = (
     trackingNumber?: string
     productName?: string
     hasWaybill?: boolean
+    /** 有运单但未提交发货单（未生成 ERP 出库单，后端用 waybills.SalesOrderId 判断） */
+    pendingShipmentForm?: boolean
     createTimeStart?: string
     createTimeEnd?: string
     payTimeStart?: string
@@ -80,6 +83,7 @@ export const getOrders = (
     if (filters.trackingNumber) params.trackingNumber = filters.trackingNumber
     if (filters.productName) params.productName = filters.productName
     if (filters.hasWaybill !== undefined) params.hasWaybill = filters.hasWaybill
+    if (filters.pendingShipmentForm !== undefined) params.pendingShipmentForm = filters.pendingShipmentForm
     if (filters.createTimeStart) params.createTimeStart = filters.createTimeStart
     if (filters.createTimeEnd) params.createTimeEnd = filters.createTimeEnd
     if (filters.payTimeStart) params.payTimeStart = filters.payTimeStart
@@ -152,7 +156,7 @@ export const getMergedOrderDetail = (ids: number[]) => {
   return api.get('/orders/detail/merged', { params: { ids: ids.join(',') } })
 }
 
-// 查询ERP商品列表
+// 查询ERP商品列表（pl：单个品类 F_Id；ERP 商品可挂多品类逗号存储，后端按「包含该 ID」匹配）
 export const searchProducts = (keyword?: string, pageIndex = 1, pageSize = 20, pl?: string) => {
   const params: any = { pageIndex, pageSize }
   if (keyword) params.keyword = keyword
diff --git a/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts b/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
index f7be2cc..bf77671 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
+++ b/Antis.Erp.Plat/douyin/frontend/src/utils/config.ts
@@ -48,3 +48,14 @@ export const getBackendBaseUrl = (): string => {
   return window.location.origin
 }
 
+/** ERP(NCC) 站点根地址，用于拼接商品主图等相对路径（须与 DouyinLogistics.API 的 ErpApi.BaseUrl 一致） */
+export const getErpBaseUrl = (): string => {
+  if (import.meta.env.VITE_ERP_BASE_URL) {
+    return String(import.meta.env.VITE_ERP_BASE_URL).replace(/\/$/, '')
+  }
+  if (import.meta.env.DEV) {
+    return 'http://localhost:2011'
+  }
+  return 'http://localhost:2011'
+}
+
diff --git a/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue b/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
index 90947eb..c7e1b58 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
+++ b/Antis.Erp.Plat/douyin/frontend/src/views/CreateWaybillView.vue
@@ -9,7 +9,7 @@
               type="primary" 
               @click="handleSubmit" 
               :loading="submitting" 
-              :disabled="(waybillStatus !== undefined && waybillStatus >= 1) || form.status === 2 || form.status === 3"
+              :disabled="(waybillStatus !== undefined && waybillStatus >= 1) || form.status === 2 || form.status === 3 || form.status === 4"
               size="small"
             >
               提交发货单
@@ -36,17 +36,30 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="订单状态">
-                    <el-tag :type="form.status === 0 ? 'warning' : form.status === 1 ? 'success' : form.status === 3 ? 'info' : 'info'" size="small">
-                      {{ form.status === 0 ? '待发货' : form.status === 1 ? '已发货' : form.status === 3 ? '已退款' : '已取消' }}
+                    <el-tag
+                      :type="form.status === 0 ? 'warning' : form.status === 1 ? 'success' : form.status === 3 ? 'info' : form.status === 4 ? 'warning' : 'info'"
+                      size="small"
+                    >
+                      {{
+                        form.status === 0
+                          ? '待发货'
+                          : form.status === 1
+                            ? '已发货'
+                            : form.status === 3
+                              ? '已退款'
+                              : form.status === 4
+                                ? '退款中'
+                                : '已取消'
+                      }}
                     </el-tag>
                     <el-alert
-                      v-if="form.status === 2 || form.status === 3"
+                      v-if="form.status === 2 || form.status === 3 || form.status === 4"
                       type="error"
                       :closable="false"
                       show-icon
                       style="margin-top: 8px;"
                     >
-                      已取消或已退款的订单不允许进行任何操作
+                      已取消、已退款或退款中的订单不允许进行任何操作
                     </el-alert>
                     <el-alert
                       v-else-if="waybillStatus !== undefined && waybillStatus >= 1"
@@ -289,7 +302,7 @@
                           {{ getSerialNumberTypeText(row) }}
                         </el-tag>
                         <el-icon 
-                          v-if="row.spbm" 
+                          v-if="row.spbm || getSkuCode(row)" 
                           style="cursor: pointer; color: #409eff;" 
                           @click="refreshSerialNumberType(row)"
                           :title="'刷新序列号类型信息'"
@@ -442,6 +455,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Refresh } from '@element-plus/icons-vue'
 import { getOrderDetail, getMergedOrderDetail, searchProducts as searchProductsAPI, manualCreateWaybill, getProductInfo as getProductInfoAPI, createSalesOrder, getWarehouses, getProductCategories, updateSellerRemark, checkStock, getDefaults } from '@/api/order'
+import { getErpBaseUrl } from '@/utils/config'
 import SerialNumberSelect from '@/components/SerialNumberSelect.vue'
 import axios from 'axios'
 
@@ -458,6 +472,17 @@ const serialNumberSelectRef = ref()
 // 商品信息缓存（用于存储序列号类型）
 const productCache = new Map<string, any>()
 
+/** 商品主图：补全 ERP 相对路径，避免 el-image 请求失败 */
+const resolveProductPicUrl = (pic: string | undefined | null): string => {
+  const s = (pic || '').trim()
+  if (!s) return ''
+  if (/^https?:\/\//i.test(s)) return s
+  if (s.startsWith('//')) return `https:${s}`
+  const base = getErpBaseUrl().replace(/\/$/, '')
+  if (s.startsWith('/')) return `${base}${s}`
+  return s
+}
+
 // 注意：所有商品信息查询都通过Douyin API代理，避免CORS问题
 // 不再直接访问主ERP系统
 
@@ -602,9 +627,10 @@ const loadOrderDetail = async () => {
         }
         
         // 尝试多种可能的字段名
+        const rawPic = item.product_pic || item.ProductPic || item.pic || item.image || ''
         const mappedItem = {
           product_name: item.product_name || item.ProductName || item.spmc || item.Spmc || item.name || '',
-          product_pic: item.product_pic || item.ProductPic || item.pic || item.image || '',
+          product_pic: resolveProductPicUrl(rawPic),
           item_num: item.item_num || item.ItemNum || item.itemNum || item.quantity || item.num || 1,
           goods_price: goodsPrice,
           spec: item.spec || item.Spec || item.gg || item.Gg || item.specification || '',
@@ -626,33 +652,7 @@ const loadOrderDetail = async () => {
       })
       console.log('最终商品清单:', form.value.productItems)
       
-      // 确保所有商品的序列号类型都已加载，并且spbm字段已正确设置
-      await Promise.all(
-        form.value.productItems.map(async (item: any) => {
-          // 如果没有spbm但有sku_id，先通过sku_id查找spbm
-          if (!item.spbm && getSkuCode(item)) {
-            const skuId = getSkuCode(item)
-            console.log('商品缺少spbm，通过sku_id查找:', { skuId, item })
-            try {
-              const response = await searchProductsAPI(skuId, 1, 1)
-              if (response.data && response.data.data && response.data.data.length > 0) {
-                const product = response.data.data[0]
-                if (product.spbm) {
-                  item.spbm = product.spbm
-                  console.log('通过sku_id找到spbm:', { skuId, spbm: product.spbm })
-                }
-              }
-            } catch (error) {
-              console.error('通过sku_id查找spbm失败:', error)
-            }
-          }
-          
-          // 加载序列号类型
-          if (item.spbm || getSkuCode(item)) {
-            await loadSerialNumberType(item)
-          }
-        })
-      )
+      await Promise.all(form.value.productItems.map((item: any) => loadSerialNumberType(item)))
     } else {
       console.log('没有商品清单数据')
       form.value.productItems = []
@@ -733,7 +733,7 @@ const addProduct = async (product: any) => {
       const images = typeof product.spzt === 'string' ? JSON.parse(product.spzt) : product.spzt
       if (Array.isArray(images) && images.length > 0 && images[0].url) {
         const url = images[0].url
-        productPic = url.startsWith('http') ? url : `http://localhost:2011${url}`
+        productPic = url.startsWith('http') ? url : `${getErpBaseUrl()}${url.startsWith('/') ? '' : '/'}${url}`
       }
     } catch (e) {
       console.warn('解析商品主图失败:', e)
@@ -743,7 +743,7 @@ const addProduct = async (product: any) => {
   // 添加商品到清单
   const newProduct = {
     product_name: product.spmc || '',
-    product_pic: productPic,
+    product_pic: resolveProductPicUrl(productPic || product.imageUrl || ''),
     spbm: product.spbm || '',
     sku_id: product.dyspid || '',
     item_num: 1,
@@ -804,32 +804,31 @@ const removeProduct = (index: number) => {
   form.value.productItems.splice(index, 1)
 }
 
-// 获取商品信息（用于获取序列号类型）
-// 通过Douyin API代理请求，避免CORS问题
-const getProductInfo = async (productCode: string) => {
-  const key = String(productCode)
-  // 如果缓存中已有该商品信息，直接返回
-  if (productCache.has(key)) {
-    return productCache.get(key)
+// 获取商品信息（用于获取序列号类型）；可按商品编码或抖音 SKU 查询
+const getProductInfo = async (productCode?: string, skuId?: string) => {
+  const code = productCode ? String(productCode).trim() : ''
+  const sku = skuId ? String(skuId).trim() : ''
+  const cacheKey = code ? code : sku ? `sku:${sku}` : ''
+  if (!cacheKey) return null
+  if (productCache.has(cacheKey)) {
+    return productCache.get(cacheKey)
   }
 
   try {
-    // 通过Douyin API代理请求，避免CORS问题
-    console.log('查询商品信息 - 商品编码:', key)
-    const response = await getProductInfoAPI(key)
-    
-    console.log('查询商品信息 - 响应:', response.data)
-    
+    console.log('查询商品信息 - spbm:', code || '(无)', 'skuId:', sku || '(无)')
+    const response = await getProductInfoAPI(code || undefined, sku || undefined)
+
     if (response.data && response.data.code === 200 && response.data.data) {
       const product = response.data.data
-      product.spxlhType = String(product.spxlhType || '')
-      productCache.set(key, product)
-      console.log('获取商品信息成功:', { productCode: key, spxlhType: product.spxlhType, productName: product.spmc })
+      product.spxlhType = product.spxlhType != null && product.spxlhType !== '' ? String(product.spxlhType) : ''
+      productCache.set(cacheKey, product)
+      if (product.spbm) {
+        productCache.set(String(product.spbm), product)
+      }
+      console.log('获取商品信息成功:', { cacheKey, spxlhType: product.spxlhType, productName: product.spmc })
       return product
-    } else {
-      console.warn('未找到商品信息:', key, response.data)
     }
-    
+    console.warn('未找到商品信息:', cacheKey, response.data)
     return null
   } catch (error) {
     console.error('获取商品信息失败:', error)
@@ -837,54 +836,52 @@ const getProductInfo = async (productCode: string) => {
   }
 }
 
-// 加载序列号类型
+// 加载序列号类型（始终在 finally 里标记 spxlhLoaded，避免一直显示「加载中」）
 const loadSerialNumberType = async (item: any) => {
-  // 如果没有spbm，尝试通过sku_id查找
-  if (!item.spbm) {
+  item.spxlhLoaded = false
+  try {
     const skuId = getSkuCode(item)
-    if (skuId) {
+
+    if (!item.spbm && skuId) {
+      const bySku = await getProductInfo(undefined, skuId)
+      if (bySku) {
+        if (bySku.spbm) item.spbm = String(bySku.spbm)
+        if (bySku.spxlhType !== undefined && bySku.spxlhType !== null && String(bySku.spxlhType) !== '') {
+          item.spxlhType = String(bySku.spxlhType)
+        }
+        if (bySku.imageUrl) {
+          item.product_pic = resolveProductPicUrl(bySku.imageUrl)
+        }
+      }
+    }
+
+    if (!item.spbm && skuId) {
       try {
-        // 通过sku_id查找对应的ERP商品（使用Douyin API代理）
         const response = await searchProductsAPI(skuId, 1, 1)
-        
-        if (response.data && response.data.data && response.data.data.length > 0) {
+        if (response.data?.data?.length > 0) {
           const product = response.data.data[0]
-          if (product.spbm) {
-            // 更新item的spbm字段
-            item.spbm = product.spbm
-            console.log('通过sku_id找到商品编码:', { skuId, spbm: product.spbm, product })
-            // 继续加载序列号类型
-          } else {
-            console.warn('通过sku_id查找商品，但未找到spbm:', { skuId, product })
-            return
+          if (product.spbm) item.spbm = product.spbm
+          if (product.imageUrl) {
+            item.product_pic = resolveProductPicUrl(product.imageUrl)
           }
-        } else {
-          console.warn('通过sku_id未找到商品:', skuId)
-          return
         }
       } catch (error) {
-        console.error('通过sku_id查找商品编码失败:', error)
-        return
+        console.error('通过 sku 搜索商品失败:', error)
       }
-    } else {
-      console.warn('商品没有spbm也没有sku_id:', item)
-      return
     }
-  }
-  
-  if (!item.spbm) {
-    console.warn('商品没有spbm，无法加载序列号类型:', item)
-    return
-  }
-  
-  item.spxlhLoaded = false
-  try {
-    const product = await getProductInfo(item.spbm)
-    if (product && product.spxlhType) {
-      item.spxlhType = String(product.spxlhType)
-      console.log('序列号类型加载成功:', { spbm: item.spbm, spxlhType: item.spxlhType })
-    } else {
-      console.warn('未获取到序列号类型:', { spbm: item.spbm, product })
+
+    if (item.spbm) {
+      const product = await getProductInfo(item.spbm)
+      if (product) {
+        if (product.spxlhType !== undefined && product.spxlhType !== null && String(product.spxlhType) !== '') {
+          item.spxlhType = String(product.spxlhType)
+        }
+        if (product.imageUrl) {
+          item.product_pic = resolveProductPicUrl(product.imageUrl)
+        }
+      }
+    } else if (!skuId) {
+      console.warn('商品没有 spbm 也没有 sku，跳过序列号类型:', item)
     }
   } catch (error) {
     console.error('加载序列号类型失败:', error)
@@ -943,11 +940,10 @@ const refreshSerialNumberType = async (row: any) => {
       }
     }
     
-    // 清除缓存
-    const key = String(row.spbm)
-    productCache.delete(key)
-    
-    // 重新加载
+    if (row.spbm) productCache.delete(String(row.spbm))
+    const sku = getSkuCode(row)
+    if (sku) productCache.delete(`sku:${sku}`)
+
     await loadSerialNumberType(row)
     ElMessage.success('序列号类型已刷新')
   } catch (error) {
@@ -1260,6 +1256,11 @@ const handleSubmit = async () => {
     ElMessage.error(`该发货单已${statusText}，不允许重复提交`)
     return
   }
+
+  if (form.value.status === 2 || form.value.status === 3 || form.value.status === 4) {
+    ElMessage.error('已取消、已退款或退款中的订单不允许提交发货单')
+    return
+  }
   
   // 验证必填字段
   if (!form.value.cjck) {
diff --git a/Antis.Erp.Plat/douyin/frontend/src/views/OrderListView.vue b/Antis.Erp.Plat/douyin/frontend/src/views/OrderListView.vue
index b8fbc22..5ef7a92 100644
--- a/Antis.Erp.Plat/douyin/frontend/src/views/OrderListView.vue
+++ b/Antis.Erp.Plat/douyin/frontend/src/views/OrderListView.vue
@@ -18,10 +18,11 @@
           <el-select v-model="filterForm.status" placeholder="全部" clearable style="width: 150px">
             <el-option label="全部" :value="undefined" />
             <el-option label="待发货" :value="0" />
-            <el-option label="已打印 未发货" value="printed_not_shipped" />
+            <el-option label="有运单·未提交发货单" value="printed_not_shipped" />
             <el-option label="已发货" :value="1" />
             <el-option label="已取消" :value="2" />
             <el-option label="已退款" :value="3" />
+            <el-option label="退款中" :value="4" />
           </el-select>
         </el-form-item>
         <el-form-item label="订单编号">
@@ -282,7 +283,7 @@
                 type="primary"
                 size="small"
                 @click="handleCreateWaybill(row)"
-                :disabled="row.status === 2"
+                :disabled="row.status === 2 || row.status === 3 || row.status === 4"
               >
                 创建运单
               </el-button>
@@ -339,7 +340,7 @@ const batchLoading = ref(false)
 const orders = ref<Order[]>([])
 const selectedOrders = ref<Order[]>([])
 const filterForm = ref({
-  status: 0 as number | string | undefined, // 默认显示待发货订单，支持特殊字符串 'printed_not_shipped'
+  status: 0 as number | string | undefined, // 默认待发货；'printed_not_shipped' → 有运单且未提交发货单（未写 SalesOrderId）
   orderId: '',
   receiverName: '',
   receiverPhone: '',
@@ -363,7 +364,7 @@ const fetchOrders = async () => {
     
     if (filterForm.value.status === 'printed_not_shipped') {
       filters.status = 0
-      filters.hasWaybill = true
+      filters.pendingShipmentForm = true
     } else if (filterForm.value.status !== undefined) {
       filters.status = filterForm.value.status
     }
@@ -623,10 +624,10 @@ const handleBatchCreateWaybill = async () => {
 
   // 过滤掉已取消、已退款的订单
   const validOrders = selectedOrders.value.filter((order: Order) => order.status === 0 || order.status === 1)
-  const invalidOrders = selectedOrders.value.filter((order: Order) => order.status === 2 || order.status === 3)
+  const invalidOrders = selectedOrders.value.filter((order: Order) => order.status === 2 || order.status === 3 || order.status === 4)
   
   if (invalidOrders.length > 0) {
-    ElMessage.warning(`已过滤 ${invalidOrders.length} 个已取消/已退款的订单，不允许创建运单`)
+    ElMessage.warning(`已过滤 ${invalidOrders.length} 个已取消/已退款/退款中的订单，不允许创建运单`)
   }
   
   if (validOrders.length === 0) {
@@ -719,6 +720,10 @@ const handleBatchCreateWaybill = async () => {
 
 // 创建运单（合并单跳转到合并编辑页；单笔订单走原有流程）
 const handleCreateWaybill = async (order: Order) => {
+  if (order.status === 2 || order.status === 3 || order.status === 4) {
+    ElMessage.warning('已取消、已退款或退款中的订单不允许创建运单')
+    return
+  }
   if (order.mergedOrderIds && order.mergedOrderIds.length > 1) {
     handleManualCreateWaybill(order)
     return
@@ -898,7 +903,8 @@ const getStatusText = (status: number) => {
     0: '待发货',
     1: '已发货',
     2: '已取消',
-    3: '已退款'
+    3: '已退款',
+    4: '退款中'
   }
   return statusMap[status] || '未知'
 }
@@ -909,7 +915,8 @@ const getStatusType = (status: number) => {
     0: 'info',
     1: 'success',
     2: 'danger',
-    3: 'warning'
+    3: 'warning',
+    4: 'warning'
   }
   return typeMap[status] || 'info'
 }
diff --git a/Antis.Erp.Plat/netcore/src/Application/NCC.API/Properties/launchSettings.json b/Antis.Erp.Plat/netcore/src/Application/NCC.API/Properties/launchSettings.json
index 1d2d61b..55c00b0 100755
--- a/Antis.Erp.Plat/netcore/src/Application/NCC.API/Properties/launchSettings.json
+++ b/Antis.Erp.Plat/netcore/src/Application/NCC.API/Properties/launchSettings.json
@@ -1,4 +1,4 @@
-{
+{
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtSpCrInput.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtSpCrInput.cs
index 01734c9..73f9207 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtSpCrInput.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtSpCrInput.cs
@@ -15,7 +15,7 @@ namespace NCC.Extend.Entitys.Dto.WtSp
         public string spmc { get; set; }
         
         /// <summary>
-        /// 商品品类
+        /// 商品品类（多个 wt_pl.F_Id 用英文逗号分隔，如 id1,id2）
         /// </summary>
         public string pl { get; set; }
         
diff --git a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
index 6fe6237..696e7ba 100644
--- a/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
+++ b/Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtSpService.cs
@@ -51,6 +51,16 @@ namespace NCC.Extend.WtSp
         }
 
         /// <summary>
+        /// 按品类筛选：F_Pl 为单个 ID 或逗号分隔多 ID 时，均用 MySQL FIND_IN_SET 匹配（避免 LINQ Contains/StartsWith 在部分环境下对多值字段翻译异常）。
+        /// </summary>
+        private static ISugarQueryable<WtSpEntity> WherePlCategoryIfAny(ISugarQueryable<WtSpEntity> query, string pl)
+        {
+            var id = pl?.Trim();
+            if (string.IsNullOrEmpty(id)) return query;
+            return query.Where("FIND_IN_SET(@spPlCategory,`F_Pl`)>0", new { spPlCategory = id });
+        }
+
+        /// <summary>
         /// 获取商品档案
         /// </summary>
         /// <param name="id">参数</param>
@@ -84,9 +94,8 @@ namespace NCC.Extend.WtSp
             List<object> queryKc = input.kc != null ? input.kc.Split(',').ToObeject<List<object>>() : null;
             var startKc = input.kc != null && !string.IsNullOrEmpty(queryKc.First().ToString()) ? queryKc.First() : decimal.MinValue;
             var endKc = input.kc != null && !string.IsNullOrEmpty(queryKc.Last().ToString()) ? queryKc.Last() : decimal.MaxValue;
-            var data = await _db.Queryable<WtSpEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.spmc), p => p.Spmc.Contains(input.spmc))
-                .WhereIF(!string.IsNullOrEmpty(input.pl), p => p.Pl.Equals(input.pl))
+            var data = await WherePlCategoryIfAny(_db.Queryable<WtSpEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.spmc), p => p.Spmc.Contains(input.spmc)), input.pl)
                 .WhereIF(!string.IsNullOrEmpty(input.pp), p => p.Pp.Equals(input.pp))
                 .WhereIF(!string.IsNullOrEmpty(input.spbm), p => p.Spbm.Contains(input.spbm))
                 .WhereIF(!string.IsNullOrEmpty(input.spxlhType), p => p.SpxlhType.Equals(input.spxlhType))
@@ -102,9 +111,7 @@ namespace NCC.Extend.WtSp
                 {
                     id = it.Id,
                     spmc=it.Spmc,
-                    //pl=it.Pl,
-                    pl=SqlFunc.Subqueryable<WtPlEntity>().Where(u=>u.Id==it.Pl).Select(u=>u.Plmc),
-                   // pp=it.Pp,
+                    pl=it.Pl,
                     pp=SqlFunc.Subqueryable<WtPpEntity>().Where(u=>u.Id==it.Pp).Select(u=>u.Ppmc),
                     spbm=it.Spbm,
                     spxlhType=it.SpxlhType,
@@ -159,6 +166,7 @@ namespace NCC.Extend.WtSp
                         {
                             item.mdkc = stockDict.ContainsKey(item.id) ? stockDict[item.id].ToString() : "0";
                         }
+                        await ResolvePlDisplayAsync(resultList);
                         await ResolveHyxzDisplayAsync(resultList);
                     }
                 }
@@ -187,18 +195,13 @@ namespace NCC.Extend.WtSp
             var sidx = input.sidx == null ? "id" : input.sidx;
           
           
-            var data = await _db.Queryable<WtSpEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Spmc.Contains(input.keyword)||p.Spbm.Contains(input.keyword)||p.Dyspid.Contains(input.keyword))
-                .WhereIF(!string.IsNullOrEmpty(input.pl), p => p.Pl.Equals(input.pl))
-                
-                
+            var data = await WherePlCategoryIfAny(_db.Queryable<WtSpEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.Spmc.Contains(input.keyword)||p.Spbm.Contains(input.keyword)||p.Dyspid.Contains(input.keyword)), input.pl)
                 .Select(it=> new WtSpListOutput
                 {
                     id = it.Id,
                     spmc=it.Spmc,
-                    //pl=it.Pl,
-                    pl=SqlFunc.Subqueryable<WtPlEntity>().Where(u=>u.Id==it.Pl).Select(u=>u.Plmc),
-                   // pp=it.Pp,
+                    pl=it.Pl,
                     pp=SqlFunc.Subqueryable<WtPpEntity>().Where(u=>u.Id==it.Pp).Select(u=>u.Ppmc),
                     spbm=it.Spbm,
                     spxlhType=it.SpxlhType,
@@ -255,6 +258,7 @@ namespace NCC.Extend.WtSp
                         {
                             item.mdkc = stockDict.ContainsKey(item.id) ? stockDict[item.id].ToString() : "0";
                         }
+                        await ResolvePlDisplayAsync(resultList);
                         await ResolveHyxzDisplayAsync(resultList);
                     }
                 }
@@ -267,6 +271,44 @@ namespace NCC.Extend.WtSp
             return pageResult;
         }
 
+        /// <summary>
+        /// 规范化商品品类：去空格、去重、去空段。
+        /// </summary>
+        private static string NormalizePlCsv(string pl)
+        {
+            if (string.IsNullOrWhiteSpace(pl)) return pl;
+            var parts = pl.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+                .Where(s => !string.IsNullOrEmpty(s))
+                .Distinct(StringComparer.Ordinal)
+                .ToList();
+            return parts.Count == 0 ? null : string.Join(",", parts);
+        }
+
+        /// <summary>
+        /// 商品品类 F_Pl 支持逗号分隔多个品类 ID；列表接口将 pl 字段解析为「品类名、品类名」展示。
+        /// </summary>
+        private async Task ResolvePlDisplayAsync(List<WtSpListOutput> list)
+        {
+            var allIds = list
+                .Where(p => !string.IsNullOrWhiteSpace(p.pl))
+                .SelectMany(p => p.pl.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+                .Distinct()
+                .ToList();
+            if (allIds.Count == 0) return;
+            var plRows = await _db.Queryable<WtPlEntity>()
+                .Where(u => allIds.Contains(u.Id))
+                .Select(u => new { u.Id, u.Plmc })
+                .ToListAsync();
+            var dict = plRows.ToDictionary(x => x.Id, x => x.Plmc ?? "");
+            foreach (var item in list)
+            {
+                if (string.IsNullOrWhiteSpace(item.pl)) continue;
+                var ids = item.pl.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).ToList();
+                var names = ids.Select(id => dict.TryGetValue(id, out var n) && !string.IsNullOrEmpty(n) ? n : id).ToList();
+                item.pl = names.Count > 0 ? string.Join("、", names) : item.pl;
+            }
+        }
+
         private async Task ResolveHyxzDisplayAsync(List<WtSpListOutput> list)
         {
             var ids = list.Where(p => !string.IsNullOrWhiteSpace(p.hyxz))
@@ -341,6 +383,7 @@ namespace NCC.Extend.WtSp
                 
                 var entity = input.Adapt<WtSpEntity>();
                 entity.Id = YitIdHelper.NextId().ToString();
+                entity.Pl = NormalizePlCsv(entity.Pl);
                 
                // Console.WriteLine($"映射后的实体: {System.Text.Json.JsonSerializer.Serialize(entity)}");
                 
@@ -373,9 +416,8 @@ namespace NCC.Extend.WtSp
             List<object> queryKc = input.kc != null ? input.kc.Split(',').ToObeject<List<object>>() : null;
             var startKc = input.kc != null && !string.IsNullOrEmpty(queryKc.First().ToString()) ? queryKc.First() : decimal.MinValue;
             var endKc = input.kc != null && !string.IsNullOrEmpty(queryKc.Last().ToString()) ? queryKc.Last() : decimal.MaxValue;
-            var data = await _db.Queryable<WtSpEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.spmc), p => p.Spmc.Contains(input.spmc))
-                .WhereIF(!string.IsNullOrEmpty(input.pl), p => p.Pl.Equals(input.pl))
+            var data = await WherePlCategoryIfAny(_db.Queryable<WtSpEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.spmc), p => p.Spmc.Contains(input.spmc)), input.pl)
                 .WhereIF(!string.IsNullOrEmpty(input.pp), p => p.Pp.Equals(input.pp))
                 .WhereIF(!string.IsNullOrEmpty(input.spbm), p => p.Spbm.Contains(input.spbm))
                 .WhereIF(!string.IsNullOrEmpty(input.spxlhType), p => p.SpxlhType.Equals(input.spxlhType))
@@ -444,6 +486,9 @@ namespace NCC.Extend.WtSp
                         item.mdkc = "0";
                     }
                 }
+
+                await ResolvePlDisplayAsync(typedData);
+                await ResolveHyxzDisplayAsync(typedData);
             }
 
             return typedData;
@@ -571,6 +616,7 @@ namespace NCC.Extend.WtSp
              //   Console.WriteLine($"接收到的输入数据: {System.Text.Json.JsonSerializer.Serialize(input)}");
                 
                 var entity = input.Adapt<WtSpEntity>();
+                entity.Pl = NormalizePlCsv(entity.Pl);
                 
              //   Console.WriteLine($"映射后的实体: {System.Text.Json.JsonSerializer.Serialize(entity)}");
                 
--
libgit2 0.21.4