From d64f81bccb25c98261b84a4355f92c3b32470606 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:32:56 +0800
Subject: [PATCH] 日期显示问题修改

---
 Wms/Model/ModelDto/DataDto/MateDataStockDto.cs |    4 ++--
 Wms/WMS.BLL/DataServer/StockServer.cs          |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs b/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
index 84c105e..893d6f8 100644
--- a/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
+++ b/Wms/Model/ModelDto/DataDto/MateDataStockDto.cs
@@ -83,12 +83,12 @@
         /// <summary>
         /// 鐢熶骇鏃堕棿
         /// </summary>
-        public DateTime ProductionTime { get; set; }
+        public DateTime? ProductionTime { get; set; }
         
         /// <summary>
         /// 杩囨湡鏃堕棿
         /// </summary>
-        public DateTime ExpirationTime { get; set; }
+        public DateTime? ExpirationTime { get; set; }
         
         /// <summary>
         /// 鐘舵��
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 9c802dc..f784e43 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -102,10 +102,18 @@
                     {
                         item.ProductionTime = (DateTime)detail.ProductionTime;
                     }
+                    else
+                    {
+                        item.ProductionTime = null;
+                    }
                     if (!string.IsNullOrEmpty(detail.ExpirationTime.ToString()))
                     {
                         item.ExpirationTime = (DateTime)detail.ExpirationTime;
                     }
+                    else
+                    {
+                        item.ExpirationTime = null;
+                    }
                     item.InspectStatus = detail.InspectStatus;
                 }
                 

--
Gitblit v1.8.0