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 @@
改箱
+
+
+ 入库相关-映射
+
+
集合映射
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
///
/// 修改-入库任务单-明细对象
///
- public class UpdateInStockTaskDetailsRequest
+ public class UpdateInStockTaskDetailsRequest : EntityBase
{
///
/// 明细ID
///
- public int Id { get; set; }
+ public override int Id { get; set; } = 0;
///
/// 单据头ID
///
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
///
[Serializable]
[Table("t_erp_instock_task_details")]
- public class InStockTaskDetails
+ public class InStockTaskDetails: EntityBase
{
///
/// ID
///
- public int Id { get; set; }
+ public override int Id { get; set; }
///
/// 单据头ID
///
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
+{
+ ///
+ /// 入库相关-映射
+ ///
+ public class InStockMapper: Profile
+ {
+ public InStockMapper()
+ {
+ CreateMap()
+ .ForMember(x => x.Details, opt => opt.Ignore())
+ .ReverseMap();
+ CreateMap().ReverseMap();
+
+ CreateMap().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