diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 0b6b8eaf..2678d165 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -210,49 +210,14 @@ 单据编号 - - - 所属箱号编码 - - 类型：1为入库回退下架，2为出库回退上架 - + - 操作人 - - - - - 操作时间 - - - - - 物料名称 - - - - - 物料编码 - - - - - 物料规格型号 - - - - - 数量 - - - - - 组织 + 所属箱号编码 @@ -260,9 +225,19 @@ 仓位 - + - 仓库 + 物料名称 + + + + + 物料规格型号 + + + + + 物料编码 @@ -270,6 +245,31 @@ 序列号集 + + + 数量 + + + + + 操作时间 + + + + + 操作人 + + + + + 组织 + + + + + 仓库 + + 根据箱号获取物料信息 @@ -2001,16 +2001,16 @@ 单据编号 - - - 来源单号 - - 入库状态 + + + 来源单号 + + 入库类型 @@ -2026,9 +2026,9 @@ 组织ID - + - 物料名称 + 物料规格型号 @@ -2036,9 +2036,9 @@ 物料编码 - + - 物料规格型号 + 物料名称 @@ -2371,16 +2371,16 @@ 单据编号 - - - 入库类型 - - 来源单号 + + + 入库类型 + + 供应商 @@ -2391,9 +2391,9 @@ 组织 - + - 物料名称 + 物料规格型号 @@ -2401,9 +2401,9 @@ 物料编码 - + - 物料规格型号 + 物料名称 @@ -2907,29 +2907,24 @@ 仓位 - - - 物料名称 - - 物料编码 - - - 物料规格型号 - - 序列号集 - + - 组织 + 物料规格型号 + + + + + 物料名称 @@ -2937,6 +2932,11 @@ 物料库存数量 + + + 组织 + + @@ -3097,11 +3097,6 @@ ID - - - 物料名称 - - 物料编码 @@ -3112,9 +3107,9 @@ 物料规格型号 - + - 组织 + 物料名称 @@ -3122,6 +3117,11 @@ 仓库 + + + 组织 + + 仓位 @@ -3227,11 +3227,6 @@ ID - - - 物料名称 - - 物料编码 @@ -3242,19 +3237,14 @@ 物料规格型号 - + - 类型：1为入库，2为出库 + 物料名称 - + - 组织 - - - - - 仓库 + 单据编号 @@ -3262,9 +3252,19 @@ 单据类型 - + - 单据编号 + 组织 + + + + + 创建日期 + + + + + 类型：1为入库，2为出库 @@ -3277,9 +3277,9 @@ 结存 - + - 创建日期 + 仓库 diff --git a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs index 5805a98b..4d8b722c 100644 --- a/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs @@ -27,71 +27,69 @@ namespace WMS.Web.Core.Dto /// [Column("单据号")] public string BillNo { get; set; } - - /// - /// 所属箱号编码 - /// - [Column("箱号")] - public string BoxBillNo { get; set; } /// /// 类型：1为入库回退下架，2为出库回退上架 /// [Column("单据类型")] public string Type { get; set; } /// - /// 操作人 + /// 所属箱号编码 /// - [Column("操作人")] - public string Creator { get; set; } + [Column("箱号")] + public string BoxBillNo { get; set; } /// - /// 操作时间 + /// 仓位 /// - [Column("操作时间")] - public DateTime CreateTime { get; set; } - + [Column("仓位")] + public string SubStock { get; set; } + /// /// 物料名称 /// [Column("物料名称")] public string MaterialName { get; set; } /// - /// 物料编码 - /// - [Column("物料编码")] - public string MaterialNumber { get; set; } - /// /// 物料规格型号 /// [Column("规格型号")] public string Specifications { get; set; } /// + /// 物料编码 + /// + [Column("物料编码")] + public string MaterialNumber { get; set; } + /// + /// 序列号集 + /// + [Column("序列号")] + public string SerialNumbers { get; set; } + /// /// 数量 /// [Column("操作数量")] public decimal Qty { get; set; } - + + /// + /// 操作时间 + /// + [Column("操作时间")] + public DateTime CreateTime { get; set; } + /// + /// 操作人 + /// + [Column("操作人")] + public string Creator { get; set; } /// /// 组织 /// [Ignore] public string Org { get; set; } - - /// - /// 仓位 - /// - [Column("仓位")] - public string SubStock { get; set; } - /// /// 仓库 /// [Ignore] public string Stock { get; set; } - /// - /// 序列号集 - /// - [Column("序列号")] - public string SerialNumbers { get; set; } + } } diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs index 73cca5e7..345df5c4 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs @@ -27,6 +27,11 @@ namespace WMS.Web.Core.Dto /// [Column("入库单号")] public string BillNo { get; set; } + /// + /// 来源单号 + /// + [Column("来源单号")] + public string SourceBillNo { get; set; } /// /// 入库类型 @@ -34,11 +39,7 @@ namespace WMS.Web.Core.Dto [Column("入库类型")] public string Type { get; set; } - /// - /// 来源单号 - /// - [Column("来源单号")] - public string SourceBillNo { get; set; } + /// /// 供应商 /// @@ -50,20 +51,21 @@ namespace WMS.Web.Core.Dto [Column("组织")] public string Org { get; set; } /// - /// 物料名称 + /// 物料规格型号 /// - [Column("物料名称")] - public string MaterialName { get; set; } + [Column("规格型号")] + public string Specifications { get; set; } /// /// 物料编码 /// [Column("物料编码")] public string MaterialNumber { get; set; } + /// - /// 物料规格型号 + /// 物料名称 /// - [Column("规格型号")] - public string Specifications { get; set; } + [Column("物料名称")] + public string MaterialName { get; set; } /// /// 仓库 /// diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs index 3ee99304..68cf5be5 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs @@ -27,18 +27,17 @@ namespace WMS.Web.Core.Dto /// [Column("入库任务单号")] public string BillNo { get; set; } - - /// - /// 来源单号 - /// - [Column("来源单号")] - public string SourceBillNo { get; set; } - /// /// 入库状态 /// [Column("入库状态")] public string Status { get; set; } + /// + /// 来源单号 + /// + [Column("来源单号")] + public string SourceBillNo { get; set; } + /// /// 入库类型 /// @@ -57,20 +56,22 @@ namespace WMS.Web.Core.Dto public string Org { get; set; } /// - /// 物料名称 + /// 物料规格型号 /// - [Column("物料名称")] - public string MaterialName { get; set; } + [Column("规格型号")] + public string Specifications { get; set; } + /// /// 物料编码 /// [Column("物料编码")] public string MaterialNumber { get; set; } + /// - /// 物料规格型号 + /// 物料名称 /// - [Column("规格型号")] - public string Specifications { get; set; } + [Column("物料名称")] + public string MaterialName { get; set; } /// /// 出厂价 diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs index d7f98165..0ac7e580 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs @@ -36,37 +36,37 @@ namespace WMS.Web.Core.Dto.Inventory /// 仓位 /// [Column("仓位")] - public string SubStock { get; set; } - /// - /// 物料名称 - /// - [Column("物料名称")] - public string MaterialName { get; set; } + public string SubStock { get; set; } /// /// 物料编码 /// [Column("物料编码")] public string MaterialNumber { get; set; } /// + /// 序列号集 + /// + [Column("序列号")] + public string SerialNumbers { get; set; } + /// /// 物料规格型号 /// [Column("规格型号")] public string Specifications { get; set; } /// - /// 序列号集 + /// 物料名称 /// - [Column("序列号")] - public string SerialNumbers { get; set; } - - /// - /// 组织 - /// - [Column("组织")] - public string Org { get; set; } + [Column("物料名称")] + public string MaterialName { get; set; } /// /// 物料库存数量 /// [Column("数量")] public decimal Qty { get; set; } + /// + /// 组织 + /// + [Column("组织")] + public string Org { get; set; } + } } diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs index 930fe17b..66d9b983 100644 --- a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs @@ -15,17 +15,13 @@ namespace WMS.Web.Core.Dto.Inventory /// [Ignore] public int Id { get; set; } - - /// - /// 物料名称 - /// - [Column("物料名称")] - public string MaterialName { get; set; } + /// /// 物料编码 /// [Column("物料编码")] public string MaterialNumber { get; set; } + /// /// 物料规格型号 /// @@ -33,16 +29,23 @@ namespace WMS.Web.Core.Dto.Inventory public string Specifications { get; set; } /// - /// 组织 + /// 物料名称 /// - [Column("组织")] - public string Org { get; set; } + [Column("物料名称")] + public string MaterialName { get; set; } /// /// 仓库 /// [Column("仓库")] public string Stock { get; set; } + + /// + /// 组织 + /// + [Column("组织")] + public string Org { get; set; } + /// /// 仓位 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs index 643319ba..fd72528c 100644 --- a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs @@ -15,28 +15,35 @@ namespace WMS.Web.Core.Dto.Inventory /// [Ignore] public int Id { get; set; } - - /// - /// 物料名称 - /// - [Column("物料名称")] - public string MaterialName { get; set; } + /// /// 物料编码 /// [Column("物料编码")] public string MaterialNumber { get; set; } + /// /// 物料规格型号 /// [Column("规格型号")] public string Specifications { get; set; } + /// + /// 物料名称 + /// + [Column("物料名称")] + public string MaterialName { get; set; } /// - /// 类型：1为入库，2为出库 + /// 单据编号 /// - [Column("出入库类型")] - public string Type { get; set; } + [Column("单号")] + public string OrderBillNo { get; set; } + + /// + /// 单据类型 + /// + [Column("单据类型")] + public string OrderType { get; set; } /// /// 组织 @@ -45,22 +52,17 @@ namespace WMS.Web.Core.Dto.Inventory public string Org { get; set; } /// - /// 仓库 + /// 创建日期 /// - [Column("仓库")] - public string Stock { get; set; } + [Column("日期")] + public string CreateTime { get; set; } /// - /// 单据类型 + /// 类型：1为入库，2为出库 /// - [Column("单据类型")] - public string OrderType { get; set; } + [Column("出入库类型")] + public string Type { get; set; } - /// - /// 单据编号 - /// - [Column("单号")] - public string OrderBillNo { get; set; } /// /// 数量 /// @@ -73,9 +75,9 @@ namespace WMS.Web.Core.Dto.Inventory public decimal SurplusQty { get; set; } /// - /// 创建日期 + /// 仓库 /// - [Column("日期")] - public string CreateTime { get; set; } + [Column("仓库")] + public string Stock { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index e1d55652..ba241597 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -40,7 +40,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetMaterialName(List erpMaterials,int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return ""; var mat= erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); @@ -62,7 +62,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetMaterialNumber(List erpMaterials, int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return ""; var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); if (mat == null) @@ -83,7 +83,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetMaterialSpecifications(List erpMaterials, int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return ""; var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); if (mat == null) @@ -104,7 +104,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetMaterialUnitName(List erpMaterials, int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return ""; var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); if (mat == null) @@ -124,7 +124,7 @@ namespace WMS.Web.Domain.Services.Public /// public int GetMaterialUnitId(List erpMaterials, int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return 0; var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); if (mat == null) @@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetMaterialUnitNumber(List erpMaterials, int materialId) { - if (erpMaterials == null && erpMaterials.Count == 0) + if (erpMaterials == null || erpMaterials.Count == 0) return ""; var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault(); if (mat == null) @@ -165,7 +165,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetOrgName(List erpOrgs, int orgId) { - if (erpOrgs == null && erpOrgs.Count == 0) + if (erpOrgs == null || erpOrgs.Count == 0) return ""; var org = erpOrgs.Where(x => x.Id == orgId).FirstOrDefault(); return org == null ? "" : org.Name; @@ -179,7 +179,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetOrgName(List erpOrgs, string orgCode) { - if (erpOrgs == null && erpOrgs.Count == 0) + if (erpOrgs == null || erpOrgs.Count == 0) return ""; var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault(); return org == null ? "" : org.Name; @@ -193,7 +193,7 @@ namespace WMS.Web.Domain.Services.Public /// public int GetOrgId(List erpOrgs, string orgCode) { - if (erpOrgs == null && erpOrgs.Count == 0) + if (erpOrgs == null || erpOrgs.Count == 0) return 0; var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault(); return org == null ? 0 : org.Id; @@ -207,7 +207,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetSupplierName(List erpSuppliers, int supplierId) { - if (erpSuppliers == null && erpSuppliers.Count == 0) + if (erpSuppliers == null || erpSuppliers.Count == 0) return ""; var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault(); return supplier == null ? "" : supplier.Name; @@ -220,7 +220,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetCustomerName(List erpCustomers, int customerId) { - if (erpCustomers == null && erpCustomers.Count == 0) + if (erpCustomers == null || erpCustomers.Count == 0) return ""; var supplier = erpCustomers.Where(x => x.Id == customerId).FirstOrDefault(); return supplier == null ? "" : supplier.Name; @@ -234,7 +234,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetStockName(List erpStocks, int stockId) { - if (erpStocks == null && erpStocks.Count == 0) + if (erpStocks == null || erpStocks.Count == 0) return ""; var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault(); return stock == null ? "" : stock.Name; @@ -248,7 +248,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetStockName(List erpStocks, string code) { - if (erpStocks == null && erpStocks.Count == 0) + if (erpStocks == null || erpStocks.Count == 0) return ""; var stock = erpStocks.Where(x => x.Code == code).FirstOrDefault(); return stock == null ? "" : stock.Name; @@ -262,7 +262,7 @@ namespace WMS.Web.Domain.Services.Public /// public string GetStockCode(List erpStocks, int stockId) { - if (erpStocks == null && erpStocks.Count == 0) + if (erpStocks == null || erpStocks.Count == 0) return ""; var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault(); return stock == null ? "" : stock.Code; diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index f96832d2..df4c8e58 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -94,10 +94,15 @@ namespace WMS.Web.Repositories query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value); //物料ID在模糊后的物料 - if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber)) + if (!string.IsNullOrEmpty(dto.MaterialNumber)) { - var mids = materials.Select(x => x.MaterialId).ToList(); - query = query.Where(w => mids.Contains(w.detail.MaterialId)); + if (materials != null && materials.Count != 0) + { + var mids = materials.Select(x => x.MaterialId).ToList(); + query = query.Where(w => mids.Contains(w.detail.MaterialId)); + } + else + query = query.Where(w => w.detail.MaterialId == 0); } @@ -116,6 +121,7 @@ namespace WMS.Web.Repositories Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), Qty = s.detail.Qty, }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); + return (list,total); } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 8ad4bd43..5cabe1af 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -252,10 +252,15 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%")); //物料ID在模糊后的物料 - if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber)) + if (!string.IsNullOrEmpty(dto.MaterialNumber)) { - var mids = materials.Select(x => x.MaterialId).ToList(); - query = query.Where(w => mids.Contains(w.detail.MaterialId)); + if (materials != null && materials.Count != 0) + { + var mids = materials.Select(x => x.MaterialId).ToList(); + query = query.Where(w => mids.Contains(w.detail.MaterialId)); + } + else + query = query.Where(w => w.detail.MaterialId == 0); } if (dto.SupplierId.HasValue) diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 1bfc722a..586b9a6d 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -470,10 +470,15 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%")); //物料ID在模糊后的物料 - if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber)) + if (!string.IsNullOrEmpty(dto.MaterialNumber)) { - var mids = materials.Select(x => x.MaterialId).ToList(); - query = query.Where(w => mids.Contains(w.detail.MaterialId)); + if (materials != null && materials.Count != 0) + { + var mids = materials.Select(x => x.MaterialId).ToList(); + query = query.Where(w => mids.Contains(w.detail.MaterialId)); + } + else + query = query.Where(w => w.detail.MaterialId == 0); } if (ids_Receiver.Count() > 0) diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs index 459231d7..2372bbb5 100644 --- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs @@ -76,10 +76,14 @@ namespace WMS.Web.Repositories .Where(adv => 1 == 1); //物料ID在模糊后的物料 - if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber)) + if (!string.IsNullOrEmpty(dto.MaterialNumber)) { - var mids = materials.Select(x => x.MaterialId).ToList(); - query = query.Where(w => mids.Contains(w.MaterialId)); + if (materials != null && materials.Count != 0) + { + var mids = materials.Select(x => x.MaterialId).ToList(); + query = query.Where(w => mids.Contains(w.MaterialId)); + }else + query = query.Where(w => w.MaterialId==0); } if (!string.IsNullOrEmpty(dto.StockCode)) @@ -107,7 +111,7 @@ namespace WMS.Web.Repositories Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); - return (list,total); + return (list,total); } /// diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs index 0c02ca00..91fee443 100644 --- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs @@ -77,10 +77,15 @@ namespace WMS.Web.Repositories .Where(adv => 1 == 1); //物料ID在模糊后的物料 - if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber)) + if (!string.IsNullOrEmpty(dto.MaterialNumber)) { - var mids = materials.Select(x => x.MaterialId).ToList(); - query = query.Where(w => mids.Contains(w.MaterialId)); + if (materials != null && materials.Count != 0) + { + var mids = materials.Select(x => x.MaterialId).ToList(); + query = query.Where(w => mids.Contains(w.MaterialId)); + } + else + query = query.Where(w => w.MaterialId == 0); } if (!string.IsNullOrEmpty(dto.StockCode))