作废时间和人

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>
             明细

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;
         }
 
 

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