diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 1bc641e1..a6c52ebb 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index b840e9b4..d98ba6cc 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -492,8 +492,8 @@ namespace WMS.Web.Api.Controllers
/// 组织编码
/// 是否需要支持老ops条码查询
///
- /// 盘点 所有的序列号 0或者不传
- /// 非采购上架 改箱 (非激活的或者(激活被冻结)) 1
+ /// 盘点 改箱 所有的序列号 0或者不传
+ /// 非采购上架 (非激活的或者(激活被冻结)) 1
/// 出库回退上架 (激活被冻结) 2
/// 入库回退下架 (激活非冻结) 3
/// 出库 (激活非冻结) 3
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index f8e13b57..500e2858 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -685,8 +685,8 @@
组织编码
是否需要支持老ops条码查询
- 盘点 所有的序列号 0或者不传
- 非采购上架 改箱 (非激活的或者(激活被冻结)) 1
+ 盘点 改箱 所有的序列号 0或者不传
+ 非采购上架 (非激活的或者(激活被冻结)) 1
出库回退上架 (激活被冻结) 2
入库回退下架 (激活非冻结) 3
出库 (激活非冻结) 3
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);