Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

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>

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))