From 748d8c7f62a606f5af746de7b2b9c239616bae81 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 28 Oct 2023 10:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=9B=88=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/TakeStock/SaveTakeStockRequest.cs     | 40 +++++++++++++++++++
 src/WMS.Web.Domain/Mappers/TakeStockMapper.cs |  5 ++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index 7e5f1c48..f98fcc5b 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace WMS.Web.Core.Dto.TakeStock
@@ -9,5 +10,44 @@ namespace WMS.Web.Core.Dto.TakeStock
     /// </summary>
    public class SaveTakeStockRequest
     {
+        /// <summary>
+        /// 箱Id
+        /// </summary>
+        [Required(ErrorMessage = "箱不能为空")]
+        public int BoxId { get; set; }
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        [Required(ErrorMessage = "物料不能为空")]
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 单位ID
+        /// </summary>
+        [Required(ErrorMessage = "单位不能为空")]
+        public int UnitId { get; set; }
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+        [Required(ErrorMessage = "仓库不能为空")]
+        public int StockId { get; set; }
+        /// <summary>
+        /// 仓位ID
+        /// </summary>
+        [Required(ErrorMessage = "仓位不能为空")]
+        public int SubStockId { get; set; }
+        /// <summary>
+        /// 盘点前数量（wms系统数量）
+        /// </summary>
+        [Required(ErrorMessage = "盘点前数量不能为空")]
+        public decimal BeforeQty { get; set; }
+        /// <summary>
+        /// 盘点实际数量（实际仓库数量）
+        /// </summary>
+        [Required(ErrorMessage = "盘点实际数量不能为空")]
+        public decimal AfterQty { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
index cb309f4f..ee14bb50 100644
--- a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using WMS.Web.Core.Dto.TakeStock;
 using WMS.Web.Domain.Entitys;
+using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Mappers
 {
@@ -11,7 +12,9 @@ namespace WMS.Web.Domain.Mappers
     {
         public TakeStockMapper()
         {
-            CreateMap<SaveTakeStockRequest, TakeStockDetails>();
+            CreateMap<SaveTakeStockRequest, TakeStockDetails>()
+                 .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => (x.BeforeQty - x.AfterQty)))
+                 .ForMember(x => x.ResultType, ops => ops.MapFrom(x => (x.BeforeQty - x.AfterQty)>0? TakeStockType.Profit: TakeStockType.Loss));
         }
     }
 }