From 6450473dafc65ec331390fa991d86a8019360af3 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 3 Jan 2024 10:55:55 +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/TakeStock/TakeStockQueryRequest.cs      |  8 ++++++--
 .../TakeStockRepositories.cs                    | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
index 973d2371..8bb63537 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryRequest.cs
@@ -26,12 +26,16 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// </summary>
         public int? SuccessSync { get; set; }
         /// <summary>
+        /// 物料编码
+        ///</summary> 
+        public string MaterialNumber { get; set; }
+        /// <summary>
         /// 盘点日期-开始
         /// </summary>
-        public DateTime? DateBeginDate { get; set; } = null;
+        public DateTime? CreateBeginDate { get; set; } = null;
         /// <summary>
         /// 盘点日期-结束
         /// </summary>
-        public DateTime? DateEndDate { get; set; } = null;
+        public DateTime? CreateEndDate { get; set; } = null;
     }
 }
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index bef6961d..c1bf79cd 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -196,10 +196,17 @@ namespace WMS.Web.Repositories
             if (companyId == 0)
                 companyId = _loginRepositories.CompanyId;
             //1.获取物料集合
+            List<int> mIds = new List<int>();
             var materials_result = await _erpService.BillQueryForMaterial();
             List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
             if (materials_result.IsSuccess)
                 materials = materials_result.Data.ToList();
+            //物料集合；模糊查询后的物料集合
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                if (materials != null)
+                    mIds = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).Select(s => s.MaterialId).ToList();
+            }
             //金蝶子仓库
             var subStock_result = await _erpService.BillQueryForSubStock();
             List<Erp_SubStockDto> subStocks = new List<Erp_SubStockDto>();
@@ -212,6 +219,8 @@ namespace WMS.Web.Repositories
                .OrderByDescending(o => o.detail.Id)
                .Where(adv => 1 == 1);
 
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                query = query.Where(w => mIds.Contains(w.detail.MaterialId));
             if (dto.ResultType != null)
                 query = query.Where(w => w.order.ResultType == (TakeStockType)dto.ResultType);
             if (!string.IsNullOrEmpty(dto.BillNo))
@@ -232,10 +241,10 @@ namespace WMS.Web.Repositories
                     || w.order.SuccessSync == SyncStatus.SubmitFail
                     || w.order.SuccessSync == SyncStatus.CheckFail);
             }
-            if (dto.DateBeginDate != null)
-                query = query.Where(w => w.order.Date >= dto.DateBeginDate);
-            if (dto.DateEndDate != null)
-                query = query.Where(w => w.order.Date <= dto.DateEndDate);
+            if (dto.CreateBeginDate != null)
+                query = query.Where(w => w.order.Date >= dto.CreateBeginDate);
+            if (dto.CreateEndDate != null)
+                query = query.Where(w => w.order.Date <= dto.CreateEndDate);
             //组装
             int total = await query.CountAsync();
             var list = await query.Select(s => new TakeStockQueryInfoResponse()