From 0a9d34ba9cd1c45022f11eb8361169d28ac89baf Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Tue, 7 Nov 2023 10:12:26 +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

---
 .../Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs      | 4 ++--
 src/WMS.Web.Repositories/OutStockTaskRepositories.cs       | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
index b867c805..ddf32a57 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
@@ -92,10 +92,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
         /// <summary>
         /// 出库开始时间
         ///</summary> 
-        public DateTime? OutStockBeginTime { get; set; }
+        public string OutStockBeginTime { get; set; }
         /// <summary>
         /// 出库结束时间
         ///</summary> 
-        public DateTime? OutStockEndTime { get; set; }
+        public string OutStockEndTime { get; set; }
     }
 }
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 1651f5e2..81062606 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -247,14 +247,17 @@ namespace WMS.Web.Repositories
                 Status = s.order.Status.GetRemark(),
                 Type = s.order.Type.GetRemark(),
                 CreateTime = s.order.OperateTime.DateToStringSeconds(),
+                OutStockBeginTime= s.detail.OutStockBeginTime.DateToStringSeconds(),
+                OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
                 Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
                 SourceBillNo = s.order.SourceBillNo,
                 SaleBillNo = s.detail.SaleBillNo,
                 DeliveryOrg = "",
-                ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.order.ReceiptCustomerId),
+                ReceiptCustomer = "",
                 MaterialName = "",
                 MaterialNumber = "",
-                Specifications = ""
+                Specifications = "",
+                Unit="",
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();