diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml index 278a8c7..ac4ceee 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml @@ -3825,6 +3825,11 @@ 操作(序列号) + + + specifications + + ID请求对象 diff --git a/src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs b/src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs index a9aff42..9a0ef6f 100644 --- a/src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs +++ b/src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs @@ -1,4 +1,5 @@ -using System; +using BarCode.Web.Core.Dto.Box; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -22,11 +23,29 @@ namespace BarCode.Web.Core.Dto.SerialNumbers /// [Required(ErrorMessage = "物料编码不能为空")] public string MaterialNumber { get; set; } = string.Empty; - public string specifications { get; set; } = string.Empty; + /// + /// 物料规格 + /// + public List specifications { get; set; } = new List(); /// /// 操作(序列号) /// public List SerialNumbers { get; set; } = new List(); } + /// + /// specifications + /// + public class Specifications + { + /// + /// serialNumber + /// + public string serialNumber { get; set; } = string.Empty; + /// + /// old_Specification + /// + public string old_Specification { get; set; } = string.Empty; + } + } diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index 12018dd..bf34a04 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,dto.specifications);// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber)); + var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber)); if (!res.IsSuccess) return res; } generateRecord.UpdateMaterial();