diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 80cc01e1..e5d594fc 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -311,10 +311,13 @@ namespace WMS.Web.Repositories response.SerialNumber = entity.serial.SerialNumber; response.IsDelete = entity.serial.IsDelete ?? false; response.IsActivate = entity.serial.IsActivate ?? false; - response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName)? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber): entity.serial.MaterialName; + //response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName)? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber): entity.serial.MaterialName; + response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber); response.MaterialNumber = entity.serial.MaterialNumber; - response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications)?_erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber): entity.serial.Specifications; - response.BarCode= string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode; + //response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications)?_erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber): entity.serial.Specifications; + response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber); + //response.BarCode= string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode; + response.BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber); if (entity.boxInventory != null) response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;