From 975b5f250cd9be20572ed6e3482733bd71bc61f6 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Fri, 6 Mar 2026 17:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SerialNumbersRepositories.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 31780f3..1f72030 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -931,10 +931,13 @@ namespace BarCode.Web.Repositories BoxId = entity.serial.BoxId, IsCarton = (entity.serial.BoxId > 0 || entity.serial.IsUse == true) ? true : false, IsOldData = false,//根据序列号获取 默认是false - Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber), + //Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber), + Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? entity.sg.Specifications : entity.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), MaterialNumber = entity.serial.MaterialNumber, - MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber), - BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber), + //MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber), + MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? entity.sg.MaterialName : entity.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), + //BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber), + BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? entity.sg.BarCode : entity.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), SerialNumber = entity.serial.SerialNumber, IsUseNumber = entity.serial.IsUseNumber, NumberCode = entity.serial.NumberCode,