diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs
index 35794cf7..e0b1262c 100644
--- a/src/WMS.Web.Core/Dto/MaterialResponse.cs
+++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs
@@ -56,10 +56,10 @@ namespace WMS.Web.Core.Dto
///
/// 是否冻结
///
- public bool? IsDelete { get; set; } = false;
+ public bool IsDelete { get; set; } = false;
///
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///
- public bool? IsActivate { get; set; } = false;
+ public bool IsActivate { get; set; } = false;
}
}
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 97ee310f..31c0bbb7 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -272,8 +272,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
- response.IsDelete = entity.serial.IsDelete;
- response.IsActivate = entity.serial.IsActivate;
+ response.IsDelete = entity.serial.IsDelete ?? false;
+ response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
@@ -320,8 +320,8 @@ namespace WMS.Web.Repositories
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.StockCode = entity?.boxInventory?.StockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
- response.IsDelete = entity.serial.IsDelete;
- response.IsActivate = entity.serial.IsActivate;
+ response.IsDelete = entity.serial.IsDelete ?? false;
+ response.IsActivate = entity.serial.IsActivate ?? false;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);