From 0aba076c5002f075784172e18b513ee63621b240 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 8 Dec 2023 14:53: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

---
 .../Services/BoxInventoryService.cs           | 20 +++++++++++--------
 .../InventoryInOutDetailsRepositories.cs      |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
index 780fd273..5afafda2 100644
--- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs
@@ -552,23 +552,27 @@ namespace WMS.Web.Domain.Services
                     x.StockCode = current_box_invetory.StockCode;
                     x.SubStockId = current_box_invetory.SubStockId;
                 }
-                //3.1先通过中间层的明细的箱明细找到中间层明细的IDS
-                var current_materialDetails_ids = dtoData.Details.SelectMany(t => t.BoxsDetails).Where(t => t.BoxId == x.BoxId).GroupBy(t => t.DetailId).Select(t => t.Key).ToList();
-                //3.2再通过找到的IDS获取中间层的明细
-                var current_materialDetails = dtoData.Details.Where(t => current_materialDetails_ids.Contains(t.Id)).ToList();
-                //3.3遍历-组装箱库存要的dto明细
-                if (current_materialDetails != null && current_materialDetails.Count != 0)
+                ////3.1先通过中间层的明细的箱明细找到中间层明细的IDS
+                //var current_materialDetails_ids = dtoData.Details.SelectMany(t => t.BoxsDetails).Where(t => t.BoxId == x.BoxId).GroupBy(t => t.DetailId).Select(t => t.Key).ToList();
+                ////3.2再通过找到的IDS获取中间层的明细
+                //var current_materialDetails = dtoData.Details.Where(t => current_materialDetails_ids.Contains(t.Id)).ToList();
+                ////3.3遍历-组装箱库存要的dto明细
+                //if (current_materialDetails != null && current_materialDetails.Count != 0)
+                foreach (var detItem in dtoData.Details.SelectMany(x => x.BoxsDetails).ToList())
                 {
-                    foreach (var detItem in current_materialDetails)
+                    if (x.BoxId == detItem.BoxId)
                     {
+                        var current_det= dtoData.Details.Where(x => x.Id == detItem.DetailId).FirstOrDefault();
+
                         //2.2组装明细
                         var det = new BoxInventoryGenerateDetailsDto();
-                        det.MaterialId = detItem.MaterialId;
+                        det.MaterialId = current_det==null?0: current_det.MaterialId;
                         det.Qty = detItem.Qty;
                         det.SerialNumbers = detItem.SerialNumbers;
                         x.Details.Add(det);
                     }
                 }
+
             });
 
             //提交处理
diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
index 97962851..b9290995 100644
--- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
@@ -90,9 +90,9 @@ namespace WMS.Web.Repositories
                 query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);
 
             if (dto.CreateBeginDate != null)
-                query = query.Where(w => w.CreateTime >= dto.CreateBeginDate.Value);
+                query = query.Where(w => w.CreateTime.Date >= dto.CreateBeginDate.Value);
             if (dto.CreateEndDate != null)
-                query = query.Where(w => w.CreateTime <= dto.CreateEndDate.Value);
+                query = query.Where(w => w.CreateTime.Date <= dto.CreateEndDate.Value);
 
             
             int total = await query.CountAsync();