From 65b3034a68aeabb189fdd1fe5c7aa6608cb14924 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 7 Dec 2023 14:36:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Mappers/TakeStockMapper.cs     | 1 +
 src/WMS.Web.Repositories/TakeStockRepositories.cs | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
index 56eca7da..8ae834cc 100644
--- a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
@@ -13,6 +13,7 @@ namespace WMS.Web.Domain.Mappers
         public TakeStockMapper()
         {
             CreateMap<TakeStock, TakeStock>();
+            CreateMap<TakeStockDetails, TakeStockDetails>();
 
             CreateMap<SaveTakeStockRequest, TakeStockDetails>()
              .ForMember(x => x.FinalQty, ops => ops.MapFrom(x => Math.Abs(x.AfterQty - x.BeforeQty)))
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index 3d37cc85..37cbb703 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -12,6 +12,7 @@ using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Mappers;
 using WMS.Web.Domain.Values;
 using WMS.Web.Domain.Values.Single;
 using WMS.Web.Repositories.Configuration;
@@ -126,11 +127,12 @@ namespace WMS.Web.Repositories
 
             try
             {
-                var res = await _context.TakeStock
+                var res = await _context.TakeStock.Include(x=>x.Details)
                          .FirstOrDefaultAsync(f => f.Id == entity.Id);
                 if (res == null) return null;
 
                 _mapper.Map(entity, res);
+                _mapper.ToMapList(entity.Details, res.Details);
                 await _context.SaveChangesAsync();
 
                 if (_transaction != null)
@@ -148,7 +150,7 @@ namespace WMS.Web.Repositories
 
         public async Task<List<TakeStock>> GetEntityList(List<int> ids)
         {
-            var res = await _context.TakeStock
+            var res = await _context.TakeStock.Include(x=>x.Details)
                .Where(f => ids.Contains(f.Id))
                .ToListAsync();
 

From 92aca2f5e41e6591320299dae7d6d0ba7d7cdf53 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 7 Dec 2023 15:03:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Mappers/OutStockMapper.cs  | 12 ++++++++----
 src/WMS.Web.Domain/Mappers/TakeStockMapper.cs |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
index 2d1caafa..238a7384 100644
--- a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
@@ -13,12 +13,16 @@ namespace WMS.Web.Domain.Mappers
     {
         public OutStockMapper()
         {
-            CreateMap<OutStockTask, OutStockTask>();
-            CreateMap<OutStockTaskDetails, OutStockTaskDetails>();
+            CreateMap<OutStockTask, OutStockTask>()
+                 .ForMember(x => x.Details, opt => opt.Ignore());
+            CreateMap<OutStockTaskDetails, OutStockTaskDetails>()
+                 .ForMember(x => x.ErpDetails, opt => opt.Ignore());
             CreateMap<OutStockTaskErpDetails, OutStockTaskErpDetails>();
 
-            CreateMap<OutStock, OutStock>();
-            CreateMap<OutStockDetails, OutStockDetails>();
+            CreateMap<OutStock, OutStock>()
+                 .ForMember(x => x.Details, opt => opt.Ignore());
+            CreateMap<OutStockDetails, OutStockDetails>()
+             .ForMember(x => x.ErpDetails, opt => opt.Ignore());
             CreateMap<OutStockErpDetails, OutStockErpDetails>();
 
 
diff --git a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
index 8ae834cc..2d91c3e6 100644
--- a/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/TakeStockMapper.cs
@@ -12,7 +12,8 @@ namespace WMS.Web.Domain.Mappers
     {
         public TakeStockMapper()
         {
-            CreateMap<TakeStock, TakeStock>();
+            CreateMap<TakeStock, TakeStock>()
+                .ForMember(x => x.Details, opt => opt.Ignore());
             CreateMap<TakeStockDetails, TakeStockDetails>();
 
             CreateMap<SaveTakeStockRequest, TakeStockDetails>()