From 7273e17ac15f77b779bc25fe015f14d2f03b57f3 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Mon, 2 Mar 2026 11:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9C=A8=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/BarCode.Web.Domain.xml            | 15 ----------
 .../Entitys/SerialNumbers.cs                  | 30 +++++++++----------
 .../Services/SerialNumberService.cs           |  6 ++--
 .../SerialNumbersRepositories.cs              |  6 ++--
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
index 7cfe05b..08341cb 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
@@ -828,21 +828,6 @@
             物料编码
             </summary>
         </member>
-        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.MaterialName">
-            <summary>
-            名称
-            </summary>
-        </member>
-        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Specifications">
-            <summary>
-            规格型号
-            </summary>
-        </member>
-        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.BarCode">
-             <summary>
-            69码
-             </summary>
-        </member>
         <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Old_MaterialNumber">
             <summary>
             老物料编码(上一次物料编码)
diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
index ff999ff..ec48581 100644
--- a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
@@ -81,23 +81,23 @@ namespace BarCode.Web.Domain.Entitys
         public string MaterialNumber { get; set; } = string.Empty;
 
 
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [Column("MaterialName")]
-        public string MaterialName { get; set; } = "";
+        ///// <summary>
+        ///// 名称
+        ///// </summary>
+        //[Column("MaterialName")]
+        //public string MaterialName { get; set; } = "";
 
-        /// <summary>
-        /// 规格型号
-        /// </summary>
-        [Column("Specifications")]
-        public string Specifications { get; set; } = "";
+        ///// <summary>
+        ///// 规格型号
+        ///// </summary>
+        //[Column("Specifications")]
+        //public string Specifications { get; set; } = "";
 
-        /// <summary>
-        ///69码
-        /// </summary>
-        [Column("BarCode")]
-        public string BarCode { get; set; } = "";
+        ///// <summary>
+        /////69码
+        ///// </summary>
+        //[Column("BarCode")]
+        //public string BarCode { get; set; } = "";
 
         /// <summary>
         /// 老物料编码(上一次物料编码)
diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
index a434ce9..2937ed9 100644
--- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs
+++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
@@ -261,9 +261,9 @@ namespace BarCode.Web.Domain.Services
                                 SerialNumber = sg.IdConvertBar,
                                 MaterialNumber = sg.MaterialNumber,
 
-                                MaterialName=sg.MaterialName,
-                                Specifications = sg.Specifications,
-                                BarCode = sg.BarCode,
+                                //MaterialName=sg.MaterialName,
+                                //Specifications = sg.Specifications,
+                                //BarCode = sg.BarCode,
 
                                 Number = sg.BeginNumber + i,
                                 IsTwo = sg.IsTwo,
diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
index bfa6e85..91d9967 100644
--- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
@@ -358,11 +358,11 @@ namespace BarCode.Web.Repositories
             int total = await query.CountAsync();
             var list = await query.Select(s => new SerialNumberInfoResponse()
             {
-                Specifications =s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
+                Specifications = s.sg.Specifications,//s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
                 Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
                 MaterialNumber = s.serial.MaterialNumber,
-                MaterialName =s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
-                BarCode =s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
+                MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
+                BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
                 SerialNumber = s.serial.SerialNumber,
                 NumberCode = s.serial.NumberCode,
                 Number = s.sg == null ? 0 : s.sg.Number,