From 7012daaba24e6aa0bac6cc6ca916fd4f1c592394 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Wed, 15 Apr 2026 17:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=98=B2=E4=BC=AA?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecurityGenerateRecordRepositories.cs | 4 ++-- src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs b/src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs index 86b6dcc..6891cfb 100644 --- a/src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs +++ b/src/BarCode.Web.Repositories/SecurityGenerateRecordRepositories.cs @@ -265,9 +265,9 @@ namespace BarCode.Web.Repositories var list = await query.Select(s => new SecurityGenerateRecordInfoResponse() { Id = s.Id, - Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber), + Specifications = s.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber), MaterialNumber = s.MaterialNumber, - MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber), + MaterialName = s.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber), BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber), LotNumber = s.LotNumber, GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中", diff --git a/src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs b/src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs index d2c87d1..6fd670e 100644 --- a/src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SecurityNumbersRepositories.cs @@ -193,7 +193,7 @@ namespace BarCode.Web.Repositories Id = s.serial.Id, GenerateRecordId = s.serial.GenerateRecordId, SecurityNumber = s.serial.SecurityNumber, - Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), + Specifications = string.IsNullOrEmpty(s.serial.Specifications) ? s.sg.Specifications : s.serial.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), Number = s.sg == null ? 0 : s.sg.Number, Creator = _singleDataService.GetSingleData(SingleAction.Users, companyId, s.serial.CreatorId), CreateTime = s.serial.CreateTime.DateToStringSeconds(),