From 75a6041873964213512ed765d3155c0cbe68c41c Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 24 Nov 2023 16:51:45 +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

---
 .../ChangeBoxRecordRepositories.cs                 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index 832b6821..a9d07f3d 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -145,10 +145,10 @@ namespace WMS.Web.Repositories
                 query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
             if (!string.IsNullOrEmpty(dto.DestBox))
                 query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
-            //if (dto.SrcSubStockId != null)
-            //    query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
-            //if (dto.DestSubStockId != null)
-            //    query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId);
+            if (dto.SrcSubStockId != null)
+                query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
+            if (dto.DestSubStockId != null)
+                query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId);
             if (dto.CreateBeginDate != null)
                 query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
             if (dto.CreateEndDate != null)
@@ -163,11 +163,11 @@ namespace WMS.Web.Repositories
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId),
                 //Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId),
-                SerialNumbers = JsonConvert.SerializeObject(s.changeBox.SerialNumbers),
+                SerialNumbers = string.Join(",", s.changeBox.SerialNumbers),
                 SrcBox = s.srcBox.BoxBillNo,
                 DestBox = s.destBox.BoxBillNo,
-                //SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId),
-                //DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId),
+                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId),
+                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.changeBox.CreatorId),
                 CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
                 #endregion