修改旧规格

This commit is contained in:
2026-03-05 16:43:13 +08:00
parent adf51657e9
commit 2f55923051
5 changed files with 57 additions and 23 deletions

View File

@@ -358,11 +358,11 @@ namespace BarCode.Web.Repositories
int total = await query.CountAsync();
var list = await query.Select(s => new SerialNumberInfoResponse()
{
Specifications = s.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Specifications =s.serial.Specifications==null?s.sg.Specifications: s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Old_Specifications = s.serial.old_Specifications==null?(_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber)) : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
MaterialName = s.serial.MaterialName == null ? s.sg.MaterialName: s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = s.serial.BarCode == null ? s.sg.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,