作废时间和人

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