Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs

@@ -35,20 +35,15 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// </summary>
         public int Erp_SubStockId { get; set; }
         /// <summary>
-        /// 盘点前数量（wms系统数量）
+        /// 系统库存
         /// </summary>
-        [Required(ErrorMessage = "盘点前数量不能为空")]
+        [Required(ErrorMessage = "系统库存不能为空")]
         public decimal BeforeQty { get; set; }
         /// <summary>
-        /// 盘点实际数量（实际仓库数量）
-        /// </summary>
-        [Required(ErrorMessage = "盘点实际数量不能为空")]
-        public decimal AfterQty { get; set; }
-        /// <summary>
         /// 盘点数量
         /// </summary>
-        [Required(ErrorMessage = "盘点数量不能为空")]
-        public decimal FinalQty { get; set; }
+        [Required(ErrorMessage = "盘点数量数量不能为空")]
+        public decimal AfterQty { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs

@@ -55,19 +55,19 @@ namespace WMS.Web.Core.Dto.TakeStock
         [Column("子仓库")]
         public string Erp_SubStock { get; set; }
         /// <summary>
-        /// 盘点前数量（wms系统数量）
+        /// 系统库存
         /// </summary>
-        [Column("WMS系统数量")]
+        [Column("系统库存")]
         public decimal BeforeQty { get; set; }
         /// <summary>
-        /// 盘点实际数量（实际仓库数量）
+        /// 盘点数量
         /// </summary>
-        [Column("实际仓库数量")]
+        [Column("盘点数量")]
         public decimal AfterQty { get; set; }
         /// <summary>
-        /// 盘点后数量
+        /// 盈亏数量
         /// </summary>
-        [Column("此次盘点数量")]
+        [Column("盈亏数量")]
         public decimal FinalQty { get; set; }
         /// <summary>
         /// 盘点结果类型：1为盘盈，2位盘亏