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

改箱-箱库存方法优化

Browse Source
This commit is contained in:
tongfei
2023-11-22 15:54:10 +08:00
parent 075e0cffbd
commit f9ebcd10a0
3 changed files with 167 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -285,6 +285,26 @@
目标箱子ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcSubStockId">
<summary>
原箱仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestStockCode">
<summary>
目标箱的仓库或重新上架选择仓位对应的仓库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestSubStockId">
<summary>
目标箱仓位或重新上架选择仓位
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.DestBoxOrgCode">
<summary>
目标箱组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.CreatorId">
<summary>
操作人
@@ -913,6 +933,11 @@
箱号ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.MoveBoxRecord.StockCode">
<summary>
仓库
@@ -1494,6 +1519,11 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.StockCode">
<summary>
仓库
@@ -1668,6 +1698,14 @@
<param name="companyId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Int32,System.Int32)">
<summary>
获取仓位详情：根据仓位ID和公司ID
</summary>
<param name="id"></param>
<param name="companyId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.String,System.Int32)">
<summary>
获取仓库
@@ -2119,6 +2157,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateChangeBox(System.Collections.Generic.List{WMS.Web.Domain.Entitys.ChangeBoxRecord},System.Boolean)">
<summary>
改箱-箱库存的变更
</summary>
<param name="dtoDatas"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateMoveBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryMoveGenerateDto},System.Boolean)">
<summary>
移箱-箱库存的变更
@@ -3184,6 +3230,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.BoxInventoryService.GenerateChangeBox(System.Collections.Generic.List{WMS.Web.Domain.Entitys.ChangeBoxRecord},System.Boolean)">
<summary>
改箱-箱库存的变更
</summary>
<param name="dtoDatas"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.BoxInventoryService.GenerateMoveBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryMoveGenerateDto},System.Boolean)">
<summary>
移箱-箱库存的变更

9
src/WMS.Web.Domain/IService/IBoxInventoryService.cs
View File

@@ -4,6 +4,7 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.IService
{
@@ -28,6 +29,14 @@ namespace WMS.Web.Domain.IService
/// <returns></returns>
Task<Result> GenerateChangeBox(List<BoxInventoryChangeGenerateDto> dtoDatas, bool isTransaction);
/// <summary>
/// 改箱-箱库存的变更
/// </summary>
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> GenerateChangeBox(List<ChangeBoxRecord> dtoDatas, bool isTransaction);
/// <summary>
/// 移箱-箱库存的变更
/// </summary>

84
src/WMS.Web.Domain/Services/BoxInventoryService.cs
View File

@@ -64,11 +64,11 @@ namespace WMS.Web.Domain.Services
foreach (var dto in dtoDatas)
{
#region 原箱库存-库存处理
//2.1找到要改变的源箱数据:备注（原箱号库存一定是存在的）
var sour = sourceBoxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (sour == null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//2.1找到要改变的源箱数据://备注（原箱号不一定存在于库存的情况和存在库存的情况）存在：直接变更库存值，不存在不做操作
var sour = sourceBoxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (sour != null)
{
var sour_update_entity = sour;
sour_update_entity.Details = sour.Details;
foreach (var dtoItem in dto.Details)
@@ -88,25 +88,14 @@ namespace WMS.Web.Domain.Services
}
update_entitys.Add(sour_update_entity);
}
#endregion
#region 目标箱库存-库存处理
//2.2找到要改变的目标箱数据：备注（目标箱库存可能不存在库存，就要新增）
//2.2找到要改变的目标箱数据：备注（目标箱号不一定存在于库存的情况和存在库存的情况）存在：直接变更库存值，不存在不做操作
var tagBox = targetBoxInventorys.Where(x => x.BoxId == dto.TargetBoxId).FirstOrDefault();
if (tagBox == null)
{
if (!string.IsNullOrEmpty(dto.StockCode) && dto.SubStockId.HasValue)
{
var newTagBox = new BoxInventory();
newTagBox.OrgCode = dto.TargetBoxOrgCode;
newTagBox.StockCode = dto.StockCode;
newTagBox.SubStockId = dto.SubStockId.Value;
newTagBox.BoxId = dto.TargetBoxId;
newTagBox.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
add_entitys.Add(newTagBox);
}
}
else
if (tagBox != null)
{
var tag_update_entity = tagBox;
//2.2.1这里为了重新上架，改变仓库和仓位的需求
@@ -114,6 +103,7 @@ namespace WMS.Web.Domain.Services
{
tag_update_entity.StockCode = dto.StockCode;
tag_update_entity.SubStockId = dto.SubStockId.Value;
tag_update_entity.OrgCode = dto.TargetBoxOrgCode;
}
tag_update_entity.Details = tagBox.Details;
//2.2.1遍历改变的明细
@@ -157,6 +147,62 @@ namespace WMS.Web.Domain.Services
return Result.ReSuccess();
}
/// <summary>
/// 改箱-箱库存的变更
/// </summary>
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> GenerateChangeBox(List<ChangeBoxRecord> dtoDatas, bool isTransaction)
{
//1.判断来源数据是否存在
if (dtoDatas == null || dtoDatas.Count == 0)
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
var update_entitys = new List<BoxInventory>();
var add_entitys = new List<BoxInventory>();
var InventoryDetailsGenerateDto = new List<InventoryDetailsGenerateDto>();
//2.原来箱库存集合
var boxIds = dtoDatas.Where(x => x.SrcBoxId != 0).GroupBy(x => x.SrcBoxId).Select(x => x.Key).ToList();
var sourceBoxInventorys = await _boxInventoryRepositories.GetList(boxIds);
//2.1目标箱库存集合
var targetBoxIds = dtoDatas.GroupBy(x => x.DestBoxId).Select(x => x.Key).ToList();
var targetBoxInventorys = await _boxInventoryRepositories.GetList(targetBoxIds);
//2.2组合要生成的dto
var generateDtos = dtoDatas.GroupBy(x => new { x.SrcBoxId, x.DestBoxId, x.DestStockCode, x.DestSubStockId, x.DestBoxOrgCode }).Select(x => new BoxInventoryChangeGenerateDto()
{
BoxId = x.Key.SrcBoxId,
TargetBoxId = x.Key.DestBoxId,
StockCode = x.Key.DestStockCode,
SubStockId = x.Key.DestSubStockId,
TargetBoxOrgCode = x.Key.DestBoxOrgCode
}).ToList();
//3.遍历：组装明细
generateDtos.ForEach(x =>
{
foreach (var item in dtoDatas)
{
//3.1原箱和目标箱是当前的
if (item.SrcBoxId == x.BoxId && item.DestBoxId == x.TargetBoxId)
{
//3.2组装明细
var det = new BoxInventoryDetailsChangeGenerateDto();
det.MaterialId = item.MaterialId;
det.Qty = item.Qty;
det.SerialNumbers = item.SerialNumbers;
x.Details.Add(det);
}
}
});
//4.开始处理
return await this.GenerateChangeBox(generateDtos, isTransaction);
}
/// <summary>
/// 移箱-箱库存的变更
/// </summary>