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 @@ 老物料编码(上一次物料编码) + + + 转换前规格型号(上一次规格型号) + + 箱ID @@ -965,7 +970,7 @@ wms系统获取序列码后 序列码调整为已使用 - + 修改物料编码 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 /// [Column("Old_MaterialNumber")] public string? Old_MaterialNumber { get; set; } = string.Empty; + + /// + /// 转换前规格型号(上一次规格型号) + /// + [Column("old_Specifications")] + public string? old_Specifications { get; set; } = string.Empty; /// /// 箱ID /// @@ -330,13 +336,14 @@ namespace BarCode.Web.Domain.Entitys /// 修改物料编码 /// /// - 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 /// public async Task UpdateMaterial(UpdateMaterialRequest dto) { + var materials_result = await _erpService.BillQueryForMaterial(); + List materials = new List(); + 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();