From 68019d22b2dc9b77cdd8afea394b198349a48a89 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 6 Dec 2023 14:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs | 2 +-
 src/WMS.Web.Repositories/SerialNumbersRepositories.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs
index 31e3044f..5e18f81f 100644
--- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs
+++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersResponse.cs
@@ -28,7 +28,7 @@ namespace WMS.Web.Core.Dto.SerialNumbers
         /// <summary>
         /// 完成装箱时间
         /// </summary>
-        public DateTime? CompleteCartonTime { get; set; }
+        public string CompleteCartonTime { get; set; }
         /// <summary>
         /// 出库单对应销售订单号
         /// </summary>
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 2558570b..7a4cb11a 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -120,7 +120,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
-                CompleteCartonTime = s.CompleteCartonTime,
+                CompleteCartonTime = s.CompleteCartonTime.DateToStringSeconds(),
                 InStockTime = s.InStockTime.DateToStringSeconds(),
                 OutStockTime = s.OutStockTime.DateToStringSeconds(),
                 PurchaseBillNo = s.PurchaseBillNo,