From 1459bff44fdebf9d909a1ce1623ea182171909fe Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 19 六月 2025 10:38:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 5699ad4..bc13225 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2235,8 +2235,8 @@
if (boxNoList.Count > 0)
{
data.BoxNoList = boxNoList;
- data.Date1 = item.ProductionTime.ToString();
- data.Date2 = item.ExpirationTime.ToString();
+ data.Date1 = item.ProductionTime == null ? "" : Convert.ToDateTime(item.ProductionTime).ToString("yyyy-MM-dd");
+ data.Date2 = item.ExpirationTime == null ? "" : Convert.ToDateTime(item.ExpirationTime).ToString("yyyy-MM-dd");
break;
}
--
Gitblit v1.8.0