From 4ec6b69714c68fbc799ba0090f6edba8cdd73100 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 6 Nov 2023 17:53:18 +0800
Subject: [PATCH] tt

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    |  7 +++++
 src/WMS.Web.Domain/Entitys/InstockTask.cs     |  6 ++---
 src/WMS.Web.Domain/Mappers/InStockMapper.cs   | 14 +++++-----
 src/WMS.Web.Domain/Services/InStockService.cs | 26 +++++++++----------
 .../InStockTaskRepositories.cs                | 11 +++++---
 5 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index a1780971..86573cba 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2038,6 +2038,13 @@
             <param name="context"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.QuartzJob.OutStockOrderQuartzJob.Execute(Quartz.IJobExecutionContext)">
+            <summary>
+            执行方法
+            </summary>
+            <param name="context"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.BackRecordService">
             <summary>
             出入库回退上下架：服务接口
diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs
index a17dfd11..f8584fb6 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs
@@ -54,14 +54,12 @@ namespace WMS.Web.Domain.Entitys
         /// <summary>
         /// 箱信息集合
         /// </summary>
-        [NotMapped]
-        public virtual List<InStockTaskBox> Boxs { get; set; }
+        public  List<InStockTaskBox> Boxs { get; set; }
 
         /// <summary>
         /// 明细
         /// </summary>
-        [NotMapped]
-        public virtual List<InStockTaskDetails> Details { get; set; }
+        public  List<InStockTaskDetails> Details { get; set; }
 
         /// <summary>
         /// 创建
diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
index 5729a2a1..4371b7ff 100644
--- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs
@@ -16,9 +16,9 @@ namespace WMS.Web.Domain.Mappers
     {
         public InStockMapper() 
         {
-            CreateMap<UpdateInStockTaskRequest, InStockTask>();
-            //.ForMember(x => x.Boxs, opt => opt.Ignore())
-            //.ForMember(x => x.Details, opt => opt.Ignore());
+            CreateMap<UpdateInStockTaskRequest, InStockTask>()
+            .ForMember(x => x.Boxs, opt => opt.Ignore())
+            .ForMember(x => x.Details, opt => opt.Ignore());
             CreateMap<UpdateInStockTaskDetailsRequest, InStockTaskDetails>();
                 //.ForMember(x => x.SupplierId, opt => opt.Ignore())
                 //.ForMember(x => x.OrgId, opt => opt.Ignore())
@@ -31,9 +31,11 @@ namespace WMS.Web.Domain.Mappers
                 //.ForMember(x => x.Remark, opt => opt.Ignore())
                 //.ForMember(x => x.CreateTime, opt => opt.Ignore());
             CreateMap<UpdateInStockTaskBoxRequest, InStockTaskBox>();
-            //CreateMap<InStockTask, InStockTask>().ReverseMap();
-            //CreateMap<InStockTaskDetails, InStockTaskDetails>().ReverseMap();
-            //CreateMap<InStockTaskBox, InStockTaskBox>().ReverseMap();
+            CreateMap<InStockTask, InStockTask>()
+                .ForMember(x => x.Boxs, opt => opt.Ignore())
+            .ForMember(x => x.Details, opt => opt.Ignore());
+            CreateMap<InStockTaskDetails, InStockTaskDetails>();
+            CreateMap<InStockTaskBox, InStockTaskBox>();
 
 
 
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index de8383b8..9202a8c3 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -64,16 +64,16 @@ namespace WMS.Web.Domain.Services
         /// <returns></returns>
         public async Task<Result> Receive(UpdateInStockTaskRequest dto, LoginInDto loginInfo)
         {
-            IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
-            bool isRollback = false;
-            bool isTransaction = false;
-            var result = await this.Update(dto, loginInfo.UserInfo.StaffId,true, isTransaction);
-            if (!result.IsSuccess) isRollback = true;
+            //IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
+            //bool isRollback = false;
+            //bool isTransaction = false;
+            var result = await this.Update(dto, loginInfo.UserInfo.StaffId,true, false);
+            //if (!result.IsSuccess) isRollback = true;
 
-            //提交事务
-            var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
-            if (!isSuccess)
-                return Result.ReFailure(ResultCodes.DateWriteError);
+            ////提交事务
+            //var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
+            //if (!isSuccess)
+            //    return Result.ReFailure(ResultCodes.DateWriteError);
 
             return Result.ReSuccess();
         }
@@ -180,10 +180,10 @@ namespace WMS.Web.Domain.Services
                 return Result.ReFailure(ResultCodes.DateWriteError);
 
             entity = _mapper.Map(dto, entity);
-            ////子集单独映射
-            //entity.Boxs = _mapper.ToMapList(dto.Boxs, entity.Boxs);
-            ////子集单独映射
-            //entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
+            //子集单独映射
+            entity.Boxs = _mapper.ToMapList(dto.Boxs, entity.Boxs);
+            //子集单独映射
+            entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
             if (isReceive)
                 entity.Receive(staffId);
             else
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 1bb18876..4a766b5e 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -131,8 +131,8 @@ namespace WMS.Web.Repositories
                  .Include(s => s.Details)
                  .FirstOrDefaultAsync(f => f.Id == id);
 
-            //return entity.Clone();
-            return entity;
+            return entity.Clone();
+            //return entity;
         }
 
         /// <summary>
@@ -340,14 +340,17 @@ namespace WMS.Web.Repositories
             try
             {
                 var model = await _context.InStockTask
-                .AsNoTracking()
                 .Include(s=>s.Boxs)
                 .Include(s => s.Details)
                 .FirstOrDefaultAsync(f => f.Id == entity.Id);
                 if (model == null)
                     return null;
                 _mapper.Map(entity, model);
-                var result= await _context.SaveChangesAsync();
+                //子集单独映射
+                _mapper.ToMapList(entity.Boxs, model.Boxs);
+                //子集单独映射
+                _mapper.ToMapList(entity.Details, model.Details);
+                var result = await _context.SaveChangesAsync();
                 if (_transaction != null)
                     _transaction.Commit();
                 return model;