From 8cf8dab210b31be56d0a17ee4c3da4688efb25ca Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 23 Nov 2023 14:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs         | 3 ---
 src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs       | 5 +++++
 src/WMS.Web.Domain/Entitys/TakeStock.cs                      | 5 +++++
 src/WMS.Web.Domain/Services/OutStockService.cs               | 5 +++++
 .../Configuration/RepositoryDbContext.cs                     | 4 ++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index 59d1765f..88dfdd02 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -28,12 +28,10 @@ namespace WMS.Web.Core.Dto.OutStock
         /// <summary>
         /// 物料Id
         ///</summary> 
-        [Required(ErrorMessage = "物料不能为空")]
         public int MaterialId { get; set; }
         /// <summary>
         /// 出库数量
         ///</summary> 
-        [Required(ErrorMessage = "出库数量不能为空")]
         public decimal Qty { get; set; }
         /// <summary>
         /// 箱Id
@@ -43,7 +41,6 @@ namespace WMS.Web.Core.Dto.OutStock
         /// <summary>
         /// 箱对应仓位不能为空
         /// </summary>
-        [Required(ErrorMessage = "仓位不能为空")]
         public int SubStockId { get; set; }
         /// <summary>
         /// 序列号集
diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index 13fabec4..461b8e53 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -40,6 +40,11 @@ namespace WMS.Web.Core.Dto.TakeStock
         [Required(ErrorMessage = "盘点数量数量不能为空")]
         public decimal AfterQty { get; set; }
         /// <summary>
+        /// 序列号  
+        /// </summary>
+        [Required(ErrorMessage = "序列号不能为空")]
+        public List<string> SerialNumbers { get; set; } = new List<string>();
+        /// <summary>
         /// 备注
         /// </summary>
         public string Remark { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs
index aea46b4d..e12d322b 100644
--- a/src/WMS.Web.Domain/Entitys/TakeStock.cs
+++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs
@@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys
         [Column("Remark")]
         public string Remark { get; set; }
         /// <summary>
+        /// 序列号  
+        /// </summary>
+        [Column("SerialNumbers")]
+        public List<string> SerialNumbers { get; set; } = new List<string>();
+        /// <summary>
         /// 创建
         /// </summary>
         /// <param name="creatorId"></param>
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index ec1857b5..fee917d4 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -72,6 +72,11 @@ namespace WMS.Web.Domain.Services
             if (ex.Count() > 0)
                 return Result.ReFailure(ResultCodes.OutStockMaterialError);
             //1.需要验证物料对应箱和序列号是否存在库存
+            //如果是按箱出库从库存拿取数据
+            if(dto.Method==1)
+            {
+
+            }
 
             var mIds = dto.Details.GroupBy(g => g.MaterialId).Select(s => s.Key).ToList();
             OutStock entity = new OutStock();
diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
index 56e205f0..3522c59a 100644
--- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
+++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs
@@ -167,6 +167,10 @@ namespace WMS.Web.Repositories.Configuration
                 // .WithOne()
                 // .HasForeignKey(p => p.Fid)
                 // .OnDelete(DeleteBehavior.Cascade);
+
+                ent.Property(f => f.SerialNumbers).HasConversion(
+         v => JsonConvert.SerializeObject(v),
+         v => JsonConvert.DeserializeObject<List<string>>(v));
             });
             builder.Entity<TakeStockDetails>(ent =>
             {