移箱列表

src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs

@@ -20,15 +20,15 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
         /// <summary>
         /// 仓库
         /// </summary>
-        public int StockId { get; set; }
+        public int? StockId { get; set; }
         /// <summary>
         /// 原仓位ID
         /// </summary>
-        public int SrcSubStockId { get; set; }
+        public int? SrcSubStockId { get; set; }
         /// <summary>
         /// 现仓位ID
         /// </summary>
-        public int DestSubStockId { get; set; }
+        public int? DestSubStockId { get; set; }
         /// <summary>
         /// 操作人
         /// </summary>

src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs

@@ -4,8 +4,54 @@ using System.Text;
 
 namespace WMS.Web.Core.Dto.ChangeBoxRecord
 {
+    /// <summary>
+    /// 改箱列表
+    /// </summary>
    public class ChangeBoxRecordQueryInfoResponse
     {
-       
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 物料规格型号
+        /// </summary>
+        public string Specifications { get; set; }
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        public string Stock { get; set; }
+        /// <summary>
+        /// 序列号  
+        /// </summary>
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 原箱子
+        /// </summary>
+        public string SrcBox { get; set; }
+        /// <summary>
+        /// 目标箱子
+        /// </summary>
+        public string DestBox { get; set; }
+        /// <summary>
+        /// 原仓位
+        /// </summary>
+        public string SrcSubStock { get; set; }
+        /// <summary>
+        /// 目标仓位
+        /// </summary>
+        public string DestSubStock { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string Creator { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime CreateTime { get; set; } = DateTime.Now;
     }
 }

src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs

@@ -25,6 +25,16 @@ namespace WMS.Web.Domain.Entitys
         [Column("MaterialId")]
         public int MaterialId { get; set; }
         /// <summary>
+        /// 仓库Id  
+        /// </summary>
+        [Column("StockId")]
+        public int StockId { get; set; }
+        /// <summary>
+        /// 序列号  
+        /// </summary>
+        [Column("SerialNumber")]
+        public string SerialNumber { get; set; }
+        /// <summary>
         /// 原箱子ID
         /// </summary>
         [Column("SrcBoxId")]

src/WMS.Web.Domain/Entitys/TakeStockDetails.cs

@@ -31,11 +31,6 @@ namespace WMS.Web.Domain.Entitys
         [Column("BoxId")]
         public int BoxId { get; set; }
         /// <summary>
-        /// 序号
-        /// </summary>
-        [Column("Seq")]
-        public int Seq { get; set; }
-        /// <summary>
         /// 物料ID
         /// </summary>
         [Column("MaterialId")]

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
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public Task<(List<ChangeBoxRecordQueryInfoResponse> list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto)
+        public async Task<(List<ChangeBoxRecordQueryInfoResponse> 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);
         }
     }
 }