18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-17 13:33:31 +08:00
parent 619cea05f2 9395fa087a
commit 5c65ff7c5b
5 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
View File

@@ -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);
}
}

2
src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs
View File

@@ -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);
}
}

6
src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs
View File

@@ -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>();
}
}
}

3
src/WMS.Web.Domain/Mappers/MoveBoxRecordMapper.cs
View File

@@ -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>();
}
}
}

24
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -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;