From abb381aa0eee26b455c9ea436d290e906913ab13 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 30 Oct 2023 16:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    |  5 ++++
 .../UpdateInStockTaskDetailsRequest.cs        |  4 +--
 .../Entitys/InstockTaskDetails.cs             |  5 ++--
 src/WMS.Web.Domain/Mappers/InStockMapper.cs   | 28 +++++++++++++++++++
 src/WMS.Web.Domain/Services/InStockService.cs |  3 ++
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 src/WMS.Web.Domain/Mappers/InStockMapper.cs

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index de00d3e5..3e28250d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1398,6 +1398,11 @@
             改箱
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Mappers.InStockMapper">
+            <summary>
+            入库相关-映射
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Mappers.MapperList">
             <summary>
             集合映射
diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs
index 977ad491..3d74f892 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs
@@ -7,12 +7,12 @@ namespace WMS.Web.Core.Dto.InStockTask
     /// <summary>
     /// 修改-入库任务单-明细对象
     /// </summary>
-    public class UpdateInStockTaskDetailsRequest
+    public class UpdateInStockTaskDetailsRequest : EntityBase
     {
         /// <summary>
         /// 明细ID
         /// </summary>
-        public int Id { get; set; }
+        public override int Id { get; set; } = 0;
         /// <summary>
         /// 单据头ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
index 8648247c..940ca545 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
+using WMS.Web.Core;
 
 namespace WMS.Web.Domain.Entitys
 {
@@ -10,12 +11,12 @@ namespace WMS.Web.Domain.Entitys
     /// </summary>
     [Serializable]
     [Table("t_erp_instock_task_details")]
-    public class InStockTaskDetails
+    public class InStockTaskDetails: EntityBase
     {
         /// <summary>
         /// ID
         /// </summary>
-        public int Id { get; set; }
+        public override int Id { get; set; }
         /// <summary>
         /// 单据头ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
new file mode 100644
index 00000000..f631665a
--- /dev/null
+++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
@@ -0,0 +1,28 @@
+using AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using WMS.Web.Core.Dto.InStock;
+using WMS.Web.Core.Dto.InStockTask;
+using WMS.Web.Domain.Entitys;
+
+namespace WMS.Web.Domain.Mappers
+{
+    /// <summary>
+    /// 入库相关-映射
+    /// </summary>
+    public class InStockMapper: Profile
+    {
+        public InStockMapper() 
+        {
+            CreateMap<UpdateInStockTaskRequest, InStockTask>()
+             .ForMember(x => x.Details, opt => opt.Ignore())
+             .ReverseMap();
+            CreateMap<UpdateInStockTaskDetailsRequest, InStockTaskDetails>().ReverseMap();
+
+            CreateMap<SaveInStockDetailsRequest, InStockDetails>().ReverseMap();
+
+
+        }
+    }
+}
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index fa332314..b3c31b6b 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -14,6 +14,7 @@ using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.IService;
 using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Mappers;
 using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Services
@@ -148,6 +149,8 @@ namespace WMS.Web.Domain.Services
                 return Result.ReFailure(ResultCodes.DateWriteError);
 
             entity = _mapper.Map(dto, entity);
+            //子集单独映射
+            entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
             if (isReceive)
                 entity.Receive(staffId);
             else