From 57b4116031e6fd330b883136f61698253071352d Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 1 Nov 2023 15:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=B1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/BoxResponse.cs                    | 4 ++++
 src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs | 5 +++++
 src/WMS.Web.Domain/Entitys/Box.cs                      | 5 ++++-
 src/WMS.Web.Domain/Entitys/TakeStock.cs                | 2 +-
 src/WMS.Web.Repositories/BoxRepositories.cs            | 1 +
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/BoxResponse.cs b/src/WMS.Web.Core/Dto/BoxResponse.cs
index 81965de6..02d3e5a0 100644
--- a/src/WMS.Web.Core/Dto/BoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/BoxResponse.cs
@@ -14,6 +14,10 @@ namespace WMS.Web.Core.Dto
         /// </summary>
         public int Id { get; set; }
         /// <summary>
+        /// 供应商Id
+        /// </summary>
+        public int SupplierId { get; set; }
+        /// <summary>
         /// 箱号
         /// </summary>
         public string BoxBillNo { get; set; }
diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index f98fcc5b..e649338d 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -46,6 +46,11 @@ namespace WMS.Web.Core.Dto.TakeStock
         [Required(ErrorMessage = "盘点实际数量不能为空")]
         public decimal AfterQty { get; set; }
         /// <summary>
+        /// 盘点数量
+        /// </summary>
+        [Required(ErrorMessage = "盘点数量不能为空")]
+        public decimal FinalQty { get; set; }
+        /// <summary>
         /// 备注
         /// </summary>
         public string Remark { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs
index 5270dce2..b26d2c0e 100644
--- a/src/WMS.Web.Domain/Entitys/Box.cs
+++ b/src/WMS.Web.Domain/Entitys/Box.cs
@@ -31,7 +31,10 @@ namespace WMS.Web.Domain.Entitys
         /// 箱编号（老OPS生成的箱号）
         /// </summary>
         public string BoxBillNo { get; set; }
-
+        /// <summary>
+        /// 供应商Id
+        /// </summary>
+        public int SupplierId { get; set; }
         /// <summary>
         /// 创建时间（对应老OPS的创建时间）
         /// </summary>
diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs
index 4a368931..a1d8a11d 100644
--- a/src/WMS.Web.Domain/Entitys/TakeStock.cs
+++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs
@@ -76,7 +76,7 @@ namespace WMS.Web.Domain.Entitys
         [Column("AfterQty")]
         public decimal AfterQty { get; set; }
         /// <summary>
-        /// 盘点后数量
+        /// 盘点数量
         /// </summary>
         [Column("FinalQty")]
         public decimal FinalQty { get; set; }
diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs
index de1108fd..3bdeb35a 100644
--- a/src/WMS.Web.Repositories/BoxRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxRepositories.cs
@@ -57,6 +57,7 @@ namespace WMS.Web.Repositories
             BoxResponse result = new BoxResponse()
             {
                 Id = entity.Id,
+                SupplierId=entity.SupplierId,
                 BoxBillNo = entity.BoxBillNo
             };
             result.Details = await _context.BoxDetails