From 6c43101804c7d4388322515e154e39d9872c303f Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Fri, 13 Mar 2026 10:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml            |  5 +++++
 src/WMS.Web.Core/Dto/MaterialResponse.cs            |  6 ++++++
 src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs     |  4 ++++
 .../SerialNumbersRepositories.cs                    | 13 +++++++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 795dafa2..b60ee1e1 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5115,6 +5115,11 @@
             物料规格型号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.MaterialResponse.BarCode">
+            <summary>
+            条码
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.MaterialResponse.IsOldOps">
             <summary>
             是否是老Ops条码
diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs
index 186c2bcb..4d862eb6 100644
--- a/src/WMS.Web.Core/Dto/MaterialResponse.cs
+++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs
@@ -49,6 +49,12 @@ namespace WMS.Web.Core.Dto
         /// 物料规格型号
         /// </summary>
         public string Specifications { get; set; }
+
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string BarCode { get; set; }
+
         /// <summary>
         /// 是否是老Ops条码
         /// </summary>
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
index f472cb9f..6176945c 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
@@ -91,5 +91,9 @@ namespace WMS.Web.Domain.Entitys
         ///</summary> 
         [Column("IsActivate")]
         public bool? IsActivate { get; set; } = false;
+
+    
+    
+    
     }
 }
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 59ac4898..80cc01e1 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -311,9 +311,11 @@ namespace WMS.Web.Repositories
             response.SerialNumber = entity.serial.SerialNumber;
             response.IsDelete = entity.serial.IsDelete ?? false;
             response.IsActivate = entity.serial.IsActivate ?? false;
-            response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
+            response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName)? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber): entity.serial.MaterialName;
             response.MaterialNumber = entity.serial.MaterialNumber;
-            response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
+            response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications)?_erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber): entity.serial.Specifications;
+            response.BarCode= string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
+
             if (entity.boxInventory != null)
                 response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
             response.IsTwo = entity.serial.IsTwo;
@@ -389,6 +391,13 @@ namespace WMS.Web.Repositories
             response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
             response.MaterialNumber = entity.serial.MaterialNumber;
             response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
+
+            //response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber) : entity.serial.MaterialName;
+            //response.MaterialNumber = entity.serial.MaterialNumber;
+            //response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber) : entity.serial.Specifications;
+            //response.BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
+
+
             //if (entity.boxInventory != null)
             //    response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;