From 420d3659289a65938e66998cd5f04a3bb701512f Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 26 Dec 2023 11:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5-=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Entitys/InStock.cs           | 1 +
 src/WMS.Web.Domain/Entitys/InStockDetails.cs    | 1 +
 src/WMS.Web.Domain/Entitys/InStockErpDetails.cs | 2 ++
 src/WMS.Web.Domain/Mappers/InStockMapper.cs     | 5 +++++
 src/WMS.Web.Repositories/InStockRepositories.cs | 6 ++++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs
index 9b1bce1e..0d46b1e9 100644
--- a/src/WMS.Web.Domain/Entitys/InStock.cs
+++ b/src/WMS.Web.Domain/Entitys/InStock.cs
@@ -15,6 +15,7 @@ namespace WMS.Web.Domain.Entitys
     [Table("t_wms_instock")]
     public class InStock : EntityBase
     {
+        public InStock() { }
         /// <summary>
         /// ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Entitys/InStockDetails.cs b/src/WMS.Web.Domain/Entitys/InStockDetails.cs
index 27ea0948..7f7d5fb0 100644
--- a/src/WMS.Web.Domain/Entitys/InStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InStockDetails.cs
@@ -14,6 +14,7 @@ namespace WMS.Web.Domain.Entitys
     [Table("t_wms_instock_details")]
     public class InStockDetails : EntityBase
     {
+        public InStockDetails() { }
         /// <summary>
         /// ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs b/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs
index ed9b6dfe..2febca15 100644
--- a/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InStockErpDetails.cs
@@ -14,6 +14,8 @@ namespace WMS.Web.Domain.Entitys
     [Table("t_wms_instock_erp_details")]
     public class InStockErpDetails : EntityBase
     {
+
+        public InStockErpDetails() { }
         /// <summary>
         /// ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
index 47eb2c3d..6a55251d 100644
--- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
@@ -32,6 +32,11 @@ namespace WMS.Web.Domain.Mappers
             CreateMap<InStockTaskBox, InStockTaskBox>();
 
 
+            CreateMap<InStock, InStock>()
+                 .ForMember(x => x.Details, opt => opt.Ignore())
+                  .ForMember(x => x.ErpDetails, opt => opt.Ignore());
+            CreateMap<InStockDetails, InStockDetails>();
+            CreateMap<InStockErpDetails, InStockErpDetails>();
 
             CreateMap<SaveInStockDetailsRequest, InStockDetails>().ReverseMap();
             CreateMap<NoPurchaseShelfDetailsRequest, InStockDetails>().ReverseMap();
diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs
index 47dbe403..c5928c87 100644
--- a/src/WMS.Web.Repositories/InStockRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockRepositories.cs
@@ -175,14 +175,16 @@ namespace WMS.Web.Repositories
             try
             {
                 var model = await _context.Instock
-                    .AsNoTracking()
                 .Include(s => s.Details)
+                .Include(s=>s.ErpDetails)
                 .FirstOrDefaultAsync(f => f.Id == entity.Id);
                 if (model == null)
                     return null;
                 _mapper.Map(entity, model);
                 //子集单独映射
                 _mapper.ToMapList(entity.Details, model.Details);
+                //子集单独映射
+                _mapper.ToMapList(entity.ErpDetails, model.ErpDetails);
                 await _context.SaveChangesAsync();
                 if (_transaction != null)
                     _transaction.Commit();
@@ -246,7 +248,7 @@ namespace WMS.Web.Repositories
                 .Where(f => ids.Contains(f.Id))
                 .ToListAsync();
 
-            return res;
+            return res.Clone();
         }
 
         /// <summary>