From 9395fa087a52d1c4f9471b26f206d149ece14028 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 17 Nov 2023 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MoveBoxRecordController.cs    |  4 ++--
 .../IService/IChangeMoveBoxService.cs         |  2 +-
 .../Mappers/ChangeBoxRecordMapper.cs          |  6 +++++
 .../Mappers/MoveBoxRecordMapper.cs            |  3 ++-
 .../Services/ChangeMoveBoxService.cs          | 24 ++++---------------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
index 19106fd0..de0a9aca 100644
--- a/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
@@ -93,7 +93,7 @@ namespace WMS.Web.Api.Controllers
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result.ReFailure(ResultCodes.Token_Invalid_Error);
-
+            
             return await _changeMoveBoxService.MoveBoxSave(dto,false, loginInfo);
         }
         /// <summary>
@@ -108,7 +108,7 @@ namespace WMS.Web.Api.Controllers
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result.ReFailure(ResultCodes.Token_Invalid_Error);
-
+            
             return await _changeMoveBoxService.MoveBoxSave(dto,true, loginInfo);
         }
     }
diff --git a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
index 868c0880..13fed661 100644
--- a/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService
         //改箱保存
         Task<Result> ChangeBoxSave(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo, bool isTransaction=true);
         //移箱保存
-        Task<Result> MoveBoxSave(List<SaveMoveBoxRecordRequest> dto,bool IsUp, LoginInDto loginInfo);
+        Task<Result> MoveBoxSave(List<SaveMoveBoxRecordRequest> dto, bool IsUp, LoginInDto loginInfo);
         
     }
 }
diff --git a/src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs b/src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs
index 95a4947a..9887286c 100644
--- a/src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using WMS.Web.Core.Dto.ChangeBoxRecord;
+using WMS.Web.Core.Dto.Inventory;
 using WMS.Web.Domain.Entitys;
 
 namespace WMS.Web.Domain.Mappers
@@ -15,6 +16,11 @@ namespace WMS.Web.Domain.Mappers
         public ChangeBoxRecordMapper()
         {
             CreateMap<SaveChangeBoxRecordRequest, ChangeBoxRecord>();
+
+            CreateMap<SaveChangeBoxRecordRequest, BoxInventoryChangeGenerateDto>()
+                  .ForMember(x => x.BoxId, ops => ops.MapFrom(x => x.SrcBoxId))
+                    .ForMember(x => x.TargetBoxId, ops => ops.MapFrom(x => x.DestBoxId));
+            CreateMap<SaveChangeBoxRecordDetailsRequest, BoxInventoryDetailsChangeGenerateDto>();
         }
     }
 }
diff --git a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
index 8b3f44db..3564bf82 100644
--- a/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using WMS.Web.Core.Dto.ChangeBoxRecord;
+using WMS.Web.Core.Dto.Inventory;
 using WMS.Web.Core.Dto.MoveBoxRecord;
 using WMS.Web.Domain.Entitys;
 
@@ -12,7 +13,7 @@ namespace WMS.Web.Domain.Mappers
     {
         public MoveBoxRecordMapper()
         {
-            //CreateMap<SaveMoveBoxRecordRequest, MoveBoxRecord>();
+            CreateMap<SaveMoveBoxRecordRequest, BoxInventoryMoveGenerateDto>();
         }
     }
 }
diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index bc44cbc4..c9e7ddf3 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -86,18 +86,7 @@ namespace WMS.Web.Domain.Services
                 list.Add(entity);
             }
             var inventoryList = new List<BoxInventoryChangeGenerateDto>();
-            var inventoryDetails = dto.Details.Select(s => new BoxInventoryDetailsChangeGenerateDto()
-            {
-                MaterialId = s.MaterialId,
-                Qty = s.Qty,
-                SerialNumbers = s.SerialNumbers
-            }).ToList();
-            BoxInventoryChangeGenerateDto inventory = new BoxInventoryChangeGenerateDto()
-            {
-                BoxId = dto.SrcBoxId,
-                TargetBoxId = dto.DestBoxId,
-                Details = inventoryDetails
-            };
+            inventoryList.Add(_mapper.Map<BoxInventoryChangeGenerateDto>(dto));
 
             //需要填写序列号
             //需要修改库存
@@ -131,7 +120,7 @@ namespace WMS.Web.Domain.Services
         /// <param name="dto"></param>
         /// <param name="loginInfo"></param>
         /// <returns></returns>
-        public async Task<Result> MoveBoxSave(List<SaveMoveBoxRecordRequest> dto, bool IsUp, LoginInDto loginInfo)
+        public async Task<Result> MoveBoxSave(List<SaveMoveBoxRecordRequest> dto,bool IsUp, LoginInDto loginInfo)
         {
             //1.下架时 需要验证箱是否在库存里
 
@@ -142,13 +131,8 @@ namespace WMS.Web.Domain.Services
                 entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId);
                 entityList.Add(entity);
             }
-            var inventoryList = dto.Select(s => new BoxInventoryMoveGenerateDto()
-            {
-                BoxId = s.BoxId,
-                SubStockId = s.SubStockId,
-                InventoryInOutType = IsUp == true ? 1 : 2,
-                StockCode = s.StockCode
-            }).ToList();
+            var inventoryList = _mapper.Map<List<BoxInventoryMoveGenerateDto>>(dto);
+            inventoryList.ForEach(f => f.InventoryInOutType = IsUp == true ? 1 : 2);
 
             IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
             bool isRollback = false;