From b4bb09e05cbc3d3d3e771db92bb8c7dfb5e7a93c Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Wed, 4 Mar 2026 11:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml     | 7 ++++++-
 src/BarCode.Web.Domain/Entitys/SerialNumbers.cs        | 9 ++++++++-
 src/BarCode.Web.Domain/Services/SerialNumberService.cs | 6 +++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
index 08341cb..a6498b6 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
@@ -833,6 +833,11 @@
             老物料编码(上一次物料编码)
             </summary>
         </member>
+        <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.old_Specifications">
+            <summary>
+            转换前规格型号(上一次规格型号)
+            </summary>
+        </member>
         <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.BoxId">
             <summary>
             箱ID
@@ -965,7 +970,7 @@
             wms系统获取序列码后 序列码调整为已使用
             </summary>
         </member>
-        <member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String)">
+        <member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String,System.String)">
             <summary>
             修改物料编码
             </summary>
diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
index ec48581..989213a 100644
--- a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
@@ -104,6 +104,12 @@ namespace BarCode.Web.Domain.Entitys
         /// </summary>
         [Column("Old_MaterialNumber")]
         public string? Old_MaterialNumber { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 转换前规格型号(上一次规格型号)
+        /// </summary>
+        [Column("old_Specifications")]
+        public string? old_Specifications { get; set; } = string.Empty;
         /// <summary>
         /// 箱ID
         /// </summary>
@@ -330,13 +336,14 @@ namespace BarCode.Web.Domain.Entitys
         /// 修改物料编码
         /// </summary>
         /// <param name="number"></param>
-        public Result UpdateMaterial(string number)
+        public Result UpdateMaterial(string number,string Specifications)
         {
             if (this.IsUse)
                 return Result.ReFailure($"序列码 {this.SerialNumber} 已被使用,不允许规格转换", 600007);
             if (!this.MaterialNumber.Equals(number))
             {
                 this.Old_MaterialNumber = this.MaterialNumber;
+                this.old_Specifications = Specifications;
                 this.MaterialNumber = number;
             }
 
diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
index 2937ed9..30976e2 100644
--- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs
+++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
@@ -837,6 +837,10 @@ namespace BarCode.Web.Domain.Services
         /// <exception cref="NotImplementedException"></exception>
         public async Task<Result> UpdateMaterial(UpdateMaterialRequest dto)
         {
+            var materials_result = await _erpService.BillQueryForMaterial();
+            List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
+            if (materials_result.IsSuccess)
+                materials = materials_result.Data.ToList();
             //取出所有的生成记录
             var generateRecord = await _sGenerateRecordRepositories.GetEntity(dto.GenerateRecordId);
             if (generateRecord == null)
@@ -850,7 +854,7 @@ namespace BarCode.Web.Domain.Services
             //修改物料
             foreach (var s in serialNumbers)
             {
-                var res = s.UpdateMaterial(dto.MaterialNumber);
+                var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber));
                 if (!res.IsSuccess) return res;
             }
             generateRecord.UpdateMaterial();