接口优化

2023-12-20 11:59:18 +08:00
parent 26f9e47f4f
commit d1c9cae1cd
13 changed files with 257 additions and 226 deletions
--- 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
        /// </summary>
        [Column("单据号")]
        public string BillNo { get; set; }
-
-        /// <summary>
-        /// 所属箱号编码
-        /// </summary>
-        [Column("箱号")]
-        public string BoxBillNo { get; set; }
        /// <summary>
        /// 类型：1为入库回退下架，2为出库回退上架
        /// </summary>
        [Column("单据类型")]
        public string Type { get; set; }
        /// <summary>
-        /// 操作人
+        /// 所属箱号编码
        /// </summary>
-        [Column("操作人")]
-        public string Creator { get; set; }
+        [Column("箱号")]
+        public string BoxBillNo { get; set; }
        /// <summary>
-        /// 操作时间
+        /// 仓位
        /// </summary>
-        [Column("操作时间")]
-        public DateTime CreateTime { get; set; }
-
+        [Column("仓位")]
+        public string SubStock { get; set; }        
+        
        /// <summary>
        /// 物料名称
        /// </summary>
        [Column("物料名称")]
        public string MaterialName { get; set; }
        /// <summary>
-        /// 物料编码
-        /// </summary>
-        [Column("物料编码")]
-        public string MaterialNumber { get; set; }
-        /// <summary>
        /// 物料规格型号
        /// </summary>
        [Column("规格型号")]
        public string Specifications { get; set; }
        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [Column("物料编码")]
+        public string MaterialNumber { get; set; }
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        [Column("序列号")]
+        public string SerialNumbers { get; set; }
+        /// <summary>
        /// 数量
        /// </summary>
        [Column("操作数量")]
        public decimal Qty { get; set; }
-
+        
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        [Column("操作时间")]
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        [Column("操作人")]
+        public string Creator { get; set; }
        /// <summary>
        /// 组织
        /// </summary>
        [Ignore]
        public string Org { get; set; }
-
-        /// <summary>
-        /// 仓位
-        /// </summary>
-        [Column("仓位")]
-        public string SubStock { get; set; }
-
        /// <summary>
        /// 仓库
        /// </summary>
        [Ignore]
        public string Stock { get; set; }

-        /// <summary>
-        /// 序列号集
-        /// </summary>
-        [Column("序列号")]
-        public string SerialNumbers { get; set; }
+        
    }
 }
--- 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
        /// </summary>
        [Column("入库单号")]
        public string BillNo { get; set; }
+        /// <summary>
+        /// 来源单号
+        /// </summary>
+        [Column("来源单号")]
+        public string SourceBillNo { get; set; }

        /// <summary>
        /// 入库类型
@@ -34,11 +39,7 @@ namespace WMS.Web.Core.Dto
        [Column("入库类型")]
        public string Type { get; set; }

-        /// <summary>
-        /// 来源单号
-        /// </summary>
-        [Column("来源单号")]
-        public string SourceBillNo { get; set; }
+        
        /// <summary>
        /// 供应商
        /// </summary>
@@ -50,20 +51,21 @@ namespace WMS.Web.Core.Dto
        [Column("组织")]
        public string Org { get; set; }
        /// <summary>
-        /// 物料名称
+        /// 物料规格型号
        /// </summary>
-        [Column("物料名称")]
-        public string MaterialName { get; set; }
+        [Column("规格型号")]
+        public string Specifications { get; set; }
        /// <summary>
        /// 物料编码
        /// </summary>
        [Column("物料编码")]
        public string MaterialNumber { get; set; }
+       
        /// <summary>
-        /// 物料规格型号
+        /// 物料名称
        /// </summary>
-        [Column("规格型号")]
-        public string Specifications { get; set; }
+        [Column("物料名称")]
+        public string MaterialName { get; set; }
        /// <summary>
        /// 仓库
        /// </summary>
--- 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
        /// </summary>
        [Column("入库任务单号")]
        public string BillNo { get; set; }
-
-        /// <summary>
-        /// 来源单号
-        /// </summary>
-        [Column("来源单号")]
-        public string SourceBillNo { get; set; }
-
        /// <summary>
        /// 入库状态
        /// </summary>
        [Column("入库状态")]
        public string Status { get; set; }
+        /// <summary>
+        /// 来源单号
+        /// </summary>
+        [Column("来源单号")]
+        public string SourceBillNo { get; set; }
+        
        /// <summary>
        /// 入库类型
        /// </summary>
@@ -57,20 +56,22 @@ namespace WMS.Web.Core.Dto
        public string Org { get; set; }

        /// <summary>
-        /// 物料名称
+        /// 物料规格型号
        /// </summary>
-        [Column("物料名称")]
-        public string MaterialName { get; set; }
+        [Column("规格型号")]
+        public string Specifications { get; set; }
+
        /// <summary>
        /// 物料编码
        /// </summary>
        [Column("物料编码")]
        public string MaterialNumber { get; set; }
+        
        /// <summary>
-        /// 物料规格型号
+        /// 物料名称
        /// </summary>
-        [Column("规格型号")]
-        public string Specifications { get; set; }
+        [Column("物料名称")]
+        public string MaterialName { get; set; }

        /// <summary>
        /// 出厂价
--- 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
        /// 仓位
        /// </summary>
        [Column("仓位")]
-        public string SubStock { get; set; }
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        [Column("物料名称")]
-        public string MaterialName { get; set; }
+        public string SubStock { get; set; }        
        /// <summary>
        /// 物料编码
        /// </summary>
        [Column("物料编码")]
        public string MaterialNumber { get; set; }
        /// <summary>
+        /// 序列号集
+        /// </summary>
+        [Column("序列号")]
+        public string SerialNumbers { get; set; }
+        /// <summary>
        /// 物料规格型号
        /// </summary>
        [Column("规格型号")]
        public string Specifications { get; set; }
        /// <summary>
-        /// 序列号集
+        /// 物料名称
        /// </summary>
-        [Column("序列号")]
-        public string SerialNumbers { get; set; }
-
-        /// <summary>
-        /// 组织
-        /// </summary>
-        [Column("组织")]
-        public string Org { get; set; }
+        [Column("物料名称")]
+        public string MaterialName { get; set; }
        /// <summary>
        /// 物料库存数量
        /// </summary>
        [Column("数量")]
        public decimal Qty { get; set; }
+        /// <summary>
+        /// 组织
+        /// </summary>
+        [Column("组织")]
+        public string Org { get; set; }
+        
    }
 }
--- 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
        /// </summary>
        [Ignore]
        public int Id { get; set; }
-
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        [Column("物料名称")]
-        public string MaterialName { get; set; }
+        
        /// <summary>
        /// 物料编码
        /// </summary>
        [Column("物料编码")]
        public string MaterialNumber { get; set; }
+
        /// <summary>
        /// 物料规格型号
        /// </summary>
@@ -33,16 +29,23 @@ namespace WMS.Web.Core.Dto.Inventory
        public string Specifications { get; set; }

        /// <summary>
-        /// 组织
+        /// 物料名称
        /// </summary>
-        [Column("组织")]
-        public string Org { get; set; }
+        [Column("物料名称")]
+        public string MaterialName { get; set; }

        /// <summary>
        /// 仓库
        /// </summary>
        [Column("仓库")]
        public string Stock { get; set; }
+
+        /// <summary>
+        /// 组织
+        /// </summary>
+        [Column("组织")]
+        public string Org { get; set; }
+        
        /// <summary>
        /// 仓位
        /// </summary>
--- 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
        /// </summary>
        [Ignore]
        public int Id { get; set; }
-
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        [Column("物料名称")]
-        public string MaterialName { get; set; }
+        
        /// <summary>
        /// 物料编码
        /// </summary>
        [Column("物料编码")]
        public string MaterialNumber { get; set; }
+
        /// <summary>
        /// 物料规格型号
        /// </summary>
        [Column("规格型号")]
        public string Specifications { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [Column("物料名称")]
+        public string MaterialName { get; set; }

        /// <summary>
-        /// 类型：1为入库，2为出库
+        /// 单据编号
        /// </summary>
-        [Column("出入库类型")]
-        public string Type { get; set; }
+        [Column("单号")]
+        public string OrderBillNo { get; set; }
+
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        [Column("单据类型")]
+        public string OrderType { get; set; }        

        /// <summary>
        /// 组织
@@ -45,22 +52,17 @@ namespace WMS.Web.Core.Dto.Inventory
        public string Org { get; set; }

        /// <summary>
-        /// 仓库
+        /// 创建日期
        /// </summary>
-        [Column("仓库")]
-        public string Stock { get; set; }
+        [Column("日期")]
+        public string CreateTime { get; set; }

        /// <summary>
-        /// 单据类型
+        /// 类型：1为入库，2为出库
        /// </summary>
-        [Column("单据类型")]
-        public string OrderType { get; set; }
+        [Column("出入库类型")]
+        public string Type { get; set; }

-        /// <summary>
-        /// 单据编号
-        /// </summary>
-        [Column("单号")]
-        public string OrderBillNo { get; set; }
        /// <summary>
        /// 数量
        /// </summary>
@@ -73,9 +75,9 @@ namespace WMS.Web.Core.Dto.Inventory
        public decimal SurplusQty { get; set; }

        /// <summary>
-        /// 创建日期
+        /// 仓库
        /// </summary>
-        [Column("日期")]
-        public string CreateTime { get; set; }
+        [Column("仓库")]
+        public string Stock { get; set; }
    }
 }