From 2f55923051e5e7ec7eefccf40293ffc2d779bfe5 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Thu, 5 Mar 2026 16:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A7=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/BarCode.Web.Core.xml | 17 ++++++++- .../wwwroot/BarCode.Web.Domain.xml | 17 ++++++++- .../Entitys/SerialNumbers.cs | 38 ++++++++++--------- .../Services/SerialNumberService.cs | 2 +- .../SerialNumbersRepositories.cs | 6 +-- 5 files changed, 57 insertions(+), 23 deletions(-) diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml index ac4ceee..98f4eb7 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml @@ -3820,16 +3820,31 @@ 物料编码 + + + 物料规格 + + 操作(序列号) - + specifications + + + serialNumber + + + + + old_Specification + + ID请求对象 diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml index a6498b6..7b96236 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml @@ -828,6 +828,21 @@ 物料编码 + + + 名称 + + + + + 规格型号 + + + + + 69码 + + 老物料编码(上一次物料编码) @@ -970,7 +985,7 @@ wms系统获取序列码后 序列码调整为已使用 - + 修改物料编码 diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs index 989213a..d7a4ad8 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; - ///// - ///// 名称 - ///// - //[Column("MaterialName")] - //public string MaterialName { get; set; } = ""; + /// + /// 名称 + /// + [Column("MaterialName")] + public string? MaterialName { get; set; } = string.Empty; - ///// - ///// 规格型号 - ///// - //[Column("Specifications")] - //public string Specifications { get; set; } = ""; + /// + /// 规格型号 + /// + [Column("Specifications")] + public string? Specifications { get; set; } = string.Empty; - ///// - /////69码 - ///// - //[Column("BarCode")] - //public string BarCode { get; set; } = ""; + /// + ///69码 + /// + [Column("BarCode")] + public string? BarCode { get; set; } = string.Empty; /// /// 老物料编码(上一次物料编码) @@ -336,15 +336,19 @@ namespace BarCode.Web.Domain.Entitys /// 修改物料编码 /// /// - public Result UpdateMaterial(string number,string Specifications) + public Result UpdateMaterial(string number,string MaterialName,string MaterialSpecifications,string MaterialBarCode, string old_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.old_Specifications = old_Specifications; + this.MaterialName= MaterialName; + this.Specifications= MaterialSpecifications; + this.BarCode= MaterialBarCode; this.MaterialNumber = number; + } return Result.ReSuccess(); diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index bf34a04..77e292b 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -854,7 +854,7 @@ namespace BarCode.Web.Domain.Services //修改物料 foreach (var s in serialNumbers) { - var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber)); + var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber)); if (!res.IsSuccess) return res; } generateRecord.UpdateMaterial(); diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 6dd3621..aa8a89f 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.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), + Specifications =s.serial.Specifications==null?s.sg.Specifications: s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), Old_Specifications = s.serial.old_Specifications==null?(_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber)) : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), MaterialNumber = s.serial.MaterialNumber, - MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), - BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), + MaterialName = s.serial.MaterialName == null ? s.sg.MaterialName: s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), + BarCode = s.serial.BarCode == null ? s.sg.BarCode: s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), SerialNumber = s.serial.SerialNumber, NumberCode = s.serial.NumberCode, Number = s.sg == null ? 0 : s.sg.Number,