diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 1f72030..37055d3 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -362,7 +362,7 @@ namespace BarCode.Web.Repositories 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 = string.IsNullOrEmpty(s.serial.MaterialName)? s.sg.MaterialName: s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), - BarCode = string.IsNullOrEmpty(s.serial.BarCode) ? s.sg.BarCode: s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(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,