diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index d6e4679..b7ed573 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -358,8 +358,8 @@ namespace BarCode.Web.Repositories int total = await query.CountAsync(); var list = await query.Select(s => new SerialNumberInfoResponse() { - Specifications = s.sg.Specifications,//s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), - Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), + Specifications = s.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), + Old_Specifications = s.serial.old_Specifications==null?"": 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), @@ -497,7 +497,7 @@ namespace BarCode.Web.Repositories var list = await query.Select(s => new SerialNumberInfoResponse2() { Specifications = s.sg.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), - Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), + Old_Specifications = s.serial.old_Specifications == null ? "" : 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),