diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index ea66dc7e..f5978902 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -155,7 +155,7 @@ 仓库 - + 序列号 @@ -245,6 +245,11 @@ 盘点结果类型 + + + 入库单类型 + + ERP:单据查询-dto @@ -395,6 +400,51 @@ 来源单号 + + + 入库类型 + + + + + 创建人 + + + + + 创建时间(入库时间) + + + + + 创建时间(入库时间) + + + + + 同步成功或者失败 null 就是未同步 + + + + + 供应商ID + + + + + 组织ID + + + + + 物料编码 + + + + + 仓库ID + + 入库单查询响应对象 @@ -907,7 +957,7 @@ - 物料规格型号 + 规格型号 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index b7d0800d..add28018 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -219,7 +219,7 @@ 仓库Id - + 序列号 @@ -2382,6 +2382,11 @@ 菜单集合 + + + 仓位集合 + + 单点-控制器枚举 diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs index 8964c923..a60deb3e 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryRequest.cs @@ -13,5 +13,43 @@ namespace WMS.Web.Core.Dto /// 来源单号 /// public string SourceBillNo { get; set; } + + /// + /// 入库类型 + /// + public int? Type { get; set; } + + /// + /// 创建人 + /// + public string Creator { get; set; } + /// + /// 创建时间(入库时间) + /// + public DateTime? CreateBeginDate { get; set; } = null; + /// + /// 创建时间(入库时间) + /// + public DateTime? CreateEndDate { get; set; } = null; + /// + /// 同步成功或者失败 null 就是未同步 + /// + public bool? SuccessSync { get; set; } + /// + /// 供应商ID + /// + public int? SupplierId { get; set; } + /// + /// 组织ID + /// + public int? OrgId { get; set; } + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 仓库ID + /// + public int? StockId { get; set; } } } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 2a60da38..6a21e8fb 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -53,6 +53,26 @@ namespace WMS.Web.Repositories if (!string.IsNullOrEmpty(dto.SourceBillNo)) query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%")); + //if (!string.IsNullOrEmpty(dto.MaterialNumber)) + // query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%")); + + if(dto.SupplierId.HasValue) + query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value); + + if (dto.OrgId.HasValue) + query = query.Where(w => w.detail.OrgId == dto.OrgId.Value); + + if (dto.StockId.HasValue) + query = query.Where(w => w.detail.StockId == dto.StockId.Value); + + if (dto.Type.HasValue) + query = query.Where(w => (int)w.order.Type == dto.Type); + + if (dto.CreateBeginDate != null) + query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate); + if (dto.CreateEndDate != null) + query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate); + var response = new ResultPagedList(); int total = await query.CountAsync(); response.TotalCount = total;