From 0843e4c4f97be5bdd044b9eef8c450281e22afc7 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 2 Apr 2024 17:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Repositories/InStockTaskRepositories.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index d5870654..23f26301 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -182,7 +182,7 @@ namespace WMS.Web.Repositories
                             BoxBillNo = x.box.BoxBillNo,
                             MaterialNumber = x.detail.MaterialNumber,
                             Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
-                            ReceiveTime = x.box.CreateTime.HasValue ? "" : x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+                            ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"",
                             Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
                             Qty = x.detail.ReceiveQty,
                             ReceiveQty = x.detail.ReceiveQty
@@ -219,7 +219,7 @@ namespace WMS.Web.Repositories
 
                         boxList.ForEach(x =>
                         {
-                            x.SerialNumbers = (string.Join(",", serialNumbList.Where(x => x.MaterialNumber == x.MaterialNumber).Select(x => x.SerialNumber).ToList())).TrimEnd(',');
+                            x.SerialNumbers = (string.Join(",", serialNumbList.Where(t =>t.BoxId==x.BoxId && t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList())).TrimEnd(',');
                         });