From 05aa8ce1f65aa4b6c6e555d31e16a3261e41d809 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 11 Apr 2024 14:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/MaterialResponse.cs              | 4 ++--
 src/WMS.Web.Repositories/SerialNumbersRepositories.cs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

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
         /// <summary>
         /// 是否冻结
         ///</summary> 
-        public bool? IsDelete { get; set; } = false;
+        public bool IsDelete { get; set; } = false;
         /// <summary>
         /// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
         ///</summary>
-        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);