From 8f795b995583addbfaf000a0dfc178ac6a15d7f1 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Wed, 6 Dec 2023 11:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E6=97=B6=E9=97=B4=E5=92=8C?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml         | 10 ++++++++++
 src/WMS.Web.Domain/Entitys/InstockTask.cs          | 14 +++++++++++++-
 .../BoxInventoryRepositories.cs                    |  8 +++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 02c8e2c4..e8c249c3 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -675,6 +675,16 @@
             创建时间（erp那边的创建时间）
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTask.RepealerId">
+            <summary>
+            作废人
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTask.RepealTime">
+            <summary>
+            作废时间
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockTask.Details">
             <summary>
             明细
diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs
index 5ba622d6..fb7f2ef9 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs
@@ -57,6 +57,16 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public DateTime CreateTime { get; set; }
 
+        /// <summary>
+        /// 作废人
+        /// </summary>
+        public int? RepealerId { get; set; }
+
+        /// <summary>
+        /// 作废时间
+        /// </summary>
+        public DateTime? RepealTime { get; set; }
+
         /// <summary>
         /// 明细
         /// </summary>
@@ -82,9 +92,11 @@ namespace WMS.Web.Domain.Entitys
         /// <summary>
         /// 作废
         /// </summary>
-        public void Repeal(int creatorId)
+        public void Repeal(int repealerId)
         {
             this.Status = InstockStatus.Repeal;
+            this.RepealerId = repealerId;
+            this.RepealTime= DateTime.Now;
         }
 
 
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 2f80cd3b..5865d2c7 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -61,7 +61,6 @@ namespace WMS.Web.Repositories
             var materials = materials_result.Data.ToList();
 
             //物料集合；模糊查询后的物料集合
-            if (!string.IsNullOrEmpty(dto.MaterialNumber))
             if (!string.IsNullOrEmpty(dto.MaterialNumber))
                 materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
 
@@ -81,6 +80,13 @@ namespace WMS.Web.Repositories
             if (dto.SubStockId.HasValue)
                 query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
 
+            //物料ID在模糊后的物料
+            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                var mids = materials.Select(x => x.MaterialId).ToList();
+                query = query.Where(w => mids.Contains(w.detail.MaterialId));
+            }
+
             int total = await query.CountAsync();
             var list = await query.Select(s => new BoxInventoryQueryResponse()
             {