From 8990dabaaf16db681e1474e52aabf708e55f9641 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Thu, 12 Mar 2026 15:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=87=E5=9E=8B=E5=8F=B7=E7=9A=84=E6=9D=A1=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WmsBoxController.cs           | 34 ++++++++++++-------
 .../wwwroot/BarCode.Web.Core.xml              | 15 ++++++++
 .../SerialNumbers/SerialNumbersWmsResponse.cs | 13 +++++++
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
index e0030aa..ded2af6 100644
--- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
+++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs
@@ -1,20 +1,21 @@
 using AutoMapper;
+using BarCode.Web.Core.Dto.Box;
+using BarCode.Web.Core.Dto.SerialNumbers;
+using BarCode.Web.Core.Internal.Results;
+using BarCode.Web.Domain.Entitys;
 using BarCode.Web.Domain.Infrastructure;
-using BarCode.Web.Domain.IService.Public;
 using BarCode.Web.Domain.IService;
+using BarCode.Web.Domain.IService.Public;
+using BarCode.Web.Domain.Services.Public;
+using BarCode.Web.Domain.Values;
+using BarCode.Web.Domain.Values.Single;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using BarCode.Web.Core.Dto.Box;
-using BarCode.Web.Core.Internal.Results;
-using BarCode.Web.Domain.Values;
-using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 using NPOI.SS.Formula.Functions;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using BarCode.Web.Core.Dto.SerialNumbers;
-using BarCode.Web.Domain.Services.Public;
-using BarCode.Web.Domain.Values.Single;
 using System.ComponentModel.Design;
+using System.Text.RegularExpressions;
 
 namespace BarCode.Web.Api.Controllers
 {
@@ -127,7 +128,10 @@ namespace BarCode.Web.Api.Controllers
                             TwoSerialNumber = entity.TwoNumberCode,
                             TwoNumberCode = entity.TwoNumberCode,
                             IsNotCount = entity.IsNotCount,
-                            NumberCode=entity.NumberCode
+                            NumberCode=entity.NumberCode,
+                            MaterialName= entity.MaterialName,
+                            Specifications=entity.Specifications,
+                            BarCode=entity.BarCode
 
                         };
                         var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]);
@@ -151,7 +155,10 @@ namespace BarCode.Web.Api.Controllers
                             TwoSerialNumber = entity.TwoSerialNumber,
                             TwoNumberCode = entity.TwoNumberCode,
                             IsNotCount = entity.IsNotCount,
-                            NumberCode = entity.NumberCode
+                            NumberCode = entity.NumberCode,
+                            MaterialName = entity.MaterialName,
+                            Specifications = entity.Specifications,
+                            BarCode = entity.BarCode
                         };
                         var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]);
                         entity2.WmsGet(s[i]);
@@ -173,7 +180,10 @@ namespace BarCode.Web.Api.Controllers
                     TwoSerialNumber = entity.TwoSerialNumber,
                     TwoNumberCode = entity.TwoNumberCode,
                     IsNotCount = entity.IsNotCount,
-                    NumberCode = entity.NumberCode
+                    NumberCode = entity.NumberCode,
+                    MaterialName = entity.MaterialName,
+                    Specifications = entity.Specifications,
+                    BarCode = entity.BarCode
                 };
                 entity.WmsGet(dto.SerialNumber);
                 list.Add(entity);
diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
index 98f4eb7..2c9b3d9 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
@@ -3645,6 +3645,21 @@
             是否不参与记数
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.MaterialName">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.Specifications">
+            <summary>
+            规格
+            </summary>
+        </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.BarCode">
+            <summary>
+            条码
+            </summary>
+        </member>
         <member name="T:BarCode.Web.Core.Dto.SerialNumbers.SGenerateRecordInfoResponse">
             <summary>
             序列号生成记录列表返回参数
diff --git a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
index 26718bc..857a8b8 100644
--- a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
+++ b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
@@ -54,7 +54,20 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
         public string? NumberCode { get; set; } = string.Empty;
 
 
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? MaterialName { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string? Specifications { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string? BarCode { get; set; } = string.Empty;
 
     }
 }