diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs index 20391543..7d757271 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs @@ -20,15 +20,15 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord /// /// 仓库 /// - public int StockId { get; set; } + public int? StockId { get; set; } /// /// 原仓位ID /// - public int SrcSubStockId { get; set; } + public int? SrcSubStockId { get; set; } /// /// 现仓位ID /// - public int DestSubStockId { get; set; } + public int? DestSubStockId { get; set; } /// /// 操作人 /// diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs index b828cbc3..e468e6ec 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs @@ -4,8 +4,54 @@ using System.Text; namespace WMS.Web.Core.Dto.ChangeBoxRecord { + /// + /// 改箱列表 + /// public class ChangeBoxRecordQueryInfoResponse { - + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 物料规格型号 + /// + public string Specifications { get; set; } + /// + /// 仓库 + /// + public string Stock { get; set; } + /// + /// 序列号 + /// + public string SerialNumber { get; set; } + /// + /// 原箱子 + /// + public string SrcBox { get; set; } + /// + /// 目标箱子 + /// + public string DestBox { get; set; } + /// + /// 原仓位 + /// + public string SrcSubStock { get; set; } + /// + /// 目标仓位 + /// + public string DestSubStock { get; set; } + /// + /// 操作人 + /// + public string Creator { get; set; } + /// + /// 操作时间 + /// + public DateTime CreateTime { get; set; } = DateTime.Now; } } diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 4d97efa6..70656bf4 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -25,6 +25,16 @@ namespace WMS.Web.Domain.Entitys [Column("MaterialId")] public int MaterialId { get; set; } /// + /// 仓库Id + /// + [Column("StockId")] + public int StockId { get; set; } + /// + /// 序列号 + /// + [Column("SerialNumber")] + public string SerialNumber { get; set; } + /// /// 原箱子ID /// [Column("SrcBoxId")] diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index d28a1ee6..93921bcf 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -31,11 +31,6 @@ namespace WMS.Web.Domain.Entitys [Column("BoxId")] public int BoxId { get; set; } /// - /// 序号 - /// - [Column("Seq")] - public int Seq { get; set; } - /// /// 物料ID /// [Column("MaterialId")] diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 321ca5c5..90b1c05b 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -1,7 +1,9 @@ using AutoMapper; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using System; using System.Collections.Generic; +using System.Linq; using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto; @@ -64,9 +66,36 @@ namespace WMS.Web.Repositories /// /// /// - public Task<(List list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto) + public async Task<(List list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto) { - throw new NotImplementedException(); + var query = _context.ChangeBoxRecord + .OrderByDescending(o => o.Id) + .Where(adv => 1 == 1); + + if (dto.CreateBeginDate != null) + query = query.Where(w => w.CreateTime >= dto.CreateBeginDate); + if (dto.CreateEndDate != null) + query = query.Where(w => w.CreateTime <= dto.CreateEndDate); + //组装 + int total = await query.CountAsync(); + var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse() + { + #region dto组装 + MaterialName = "", + MaterialNumber = "", + Specifications = "", + Stock = "", + SerialNumber = "", + SrcBox = "", + DestBox = "", + SrcSubStock = "", + DestSubStock = "", + Creator = "", + CreateTime =s.CreateTime + #endregion + + }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); + return (list, total); } } }