From e2c8b08a264771a7b3fb7a94435c88cb29ff7e08 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 9 Nov 2023 17:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E7=AE=B1=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=93=E4=BD=8Did?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs        | 8 ++++++++
 src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs     | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs
index 97f31a73..1b93a0ec 100644
--- a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs
+++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs
@@ -9,6 +9,14 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
     /// </summary>
    public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto
     {
+        /// <summary>
+        /// 原仓位编码
+        /// </summary>
+        public int? SrcSubStockId { get; set; }
+        /// <summary>
+        /// 目标仓位编码
+        /// </summary>
+        public int? DestSubStockId { get; set; }
         /// <summary>
         /// 类型：1- 整箱移货上级，2-整箱移货下级
         /// </summary>
diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
index f8b2d37a..d6ea6216 100644
--- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
@@ -91,6 +91,10 @@ namespace WMS.Web.Repositories
                .OrderByDescending(o => o.moveBox.Id)
                .Where(adv => 1 == 1);
 
+            if(dto.SrcSubStockId!=null)
+                query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId);
+            if (dto.DestSubStockId != null)
+                query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId);
             if (ids.Count() > 0)
                 query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
             if (!string.IsNullOrEmpty(dto.Box))