From 4bf57306aa507eeb8f2a344a33bd48b581294a5b Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Sat, 28 Feb 2026 10:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SGenerateRecordRepositories.cs | 7 ++++--- src/BarCode.Web.Repositories/SerialNumbersRepositories.cs | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs b/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs index f29e67a..f2b17f3 100644 --- a/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs +++ b/src/BarCode.Web.Repositories/SGenerateRecordRepositories.cs @@ -326,10 +326,11 @@ namespace BarCode.Web.Repositories var list = await query.Select(s => new SGenerateRecordInfoResponse() { Id = s.Id, - Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber), + //Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber), + Specifications =s.Specifications, MaterialNumber = s.MaterialNumber, - MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber), - BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber), + MaterialName =s.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber), + BarCode =s.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber), PurchaseBillNo = s.PurchaseBillNo, GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中", Number = s.Number, diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 2abd18b..bfa6e85 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 = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), + Specifications =s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), MaterialNumber = s.serial.MaterialNumber, - MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), - BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), + MaterialName =s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), + 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,