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>

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

@@ -64,56 +64,46 @@ namespace WMS.Web.Domain.Services
foreach (var dto in dtoDatas)
{
#region 原箱库存-库存处理
//2.1找到要改变的源箱数据:备注（原箱号库存一定是存在的）
//2.1找到要改变的源箱数据://备注（原箱号不一定存在于库存的情况和存在库存的情况）存在：直接变更库存值，不存在不做操作
var sour = sourceBoxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (sour == null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
var sour_update_entity = sour;
sour_update_entity.Details = sour.Details;
foreach (var dtoItem in dto.Details)
if (sour != null)
{
//找到原来的箱库存对应要改变的物料:这个一定是存在的，不存在就有问题
var sour_ChangeDetail = sour_update_entity.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
if(sour_ChangeDetail==null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//箱物料的库存数量不足；小于要拿出来的数量
if(sour_ChangeDetail.Qty<dtoItem.Qty)
return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
//减库存
sour_ChangeDetail.Qty = sour_ChangeDetail.Qty - dtoItem.Qty;
var sour_update_entity = sour;
sour_update_entity.Details = sour.Details;
foreach (var dtoItem in dto.Details)
{
//找到原来的箱库存对应要改变的物料:这个一定是存在的，不存在就有问题
var sour_ChangeDetail = sour_update_entity.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
if (sour_ChangeDetail == null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//箱物料的库存数量不足；小于要拿出来的数量
if (sour_ChangeDetail.Qty < dtoItem.Qty)
return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
//减库存
sour_ChangeDetail.Qty = sour_ChangeDetail.Qty - dtoItem.Qty;
//再移除要改箱的序列号；最后就是原箱库存的新序列号
sour_ChangeDetail.SerialNumbers.RemoveAll(x => dtoItem.SerialNumbers.Contains(x));
//再移除要改箱的序列号；最后就是原箱库存的新序列号
sour_ChangeDetail.SerialNumbers.RemoveAll(x => dtoItem.SerialNumbers.Contains(x));
}
update_entitys.Add(sour_update_entity);
}
update_entitys.Add(sour_update_entity);
#endregion
#region 目标箱库存-库存处理
//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
//2.2找到要改变的目标箱数据：备注（目标箱号不一定存在于库存的情况和存在库存的情况）存在：直接变更库存值，不存在不做操作
var tagBox = targetBoxInventorys.Where(x => x.BoxId == dto.TargetBoxId).FirstOrDefault();
if (tagBox != null)
{
var tag_update_entity = tagBox;
//2.2.1这里为了重新上架，改变仓库和仓位的需求
if (!string.IsNullOrEmpty(dto.StockCode) && dto.SubStockId.HasValue)
if (!string.IsNullOrEmpty(dto.StockCode) && dto.SubStockId.HasValue)
{
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遍历改变的明细
@@ -122,11 +112,11 @@ namespace WMS.Web.Domain.Services
//2.2.2找到目标箱对应要改变的物料
var tagChangeDetail = tag_update_entity.Details.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault();
if (tagChangeDetail != null)
{
{
tagChangeDetail.Qty = tagChangeDetail.Qty + item.Qty;
tagChangeDetail.SerialNumbers.AddRange(item.SerialNumbers);
}//2.3.没有对应的箱物料，就新增明细
else
else
{
var newTagChangeDetail = new BoxInventoryDetails();
newTagChangeDetail.MaterialId = item.MaterialId;
@@ -134,7 +124,7 @@ namespace WMS.Web.Domain.Services
newTagChangeDetail.SerialNumbers = item.SerialNumbers;
tag_update_entity.Details.Add(newTagChangeDetail);
}
}
}
update_entitys.Add(tag_update_entity);
}
@@ -157,13 +147,69 @@ 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>
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> GenerateMoveBox(List<BoxInventoryMoveGenerateDto> dtoDatas, bool isTransaction)
public async Task<Result> GenerateMoveBox(List<BoxInventoryMoveGenerateDto> dtoDatas, bool isTransaction)
{
//1.判断来源数据是否存在
if (dtoDatas == null || dtoDatas.Count == 0)
@@ -173,16 +219,16 @@ namespace WMS.Web.Domain.Services
var add_entitys = new List<BoxInventory>();
//2.获取“箱库存集合”和“箱基本信息集合”
var boxIds = dtoDatas.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
var boxIds = dtoDatas.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
var boxs= await _boxRepositories.GetEntityList(boxIds);
var boxs = await _boxRepositories.GetEntityList(boxIds);
var serialNumbers = await _serialNumbersRepositories.GetEntityListByBoxIds(boxIds);
//3.遍历：dto
foreach (var dto in dtoDatas)
{
//上架
if (dto.InventoryInOutType==(int)InventoryInOutType.In)
if (dto.InventoryInOutType == (int)InventoryInOutType.In)
{
//3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
var ishave = boxInventorys.Where(x => x.BoxId == dto.BoxId).Any();
@@ -193,7 +239,7 @@ namespace WMS.Web.Domain.Services
if (box == null)
return Result.ReFailure(ResultCodes.BoxNoData);
//3.1.2去箱对应的序列号信息
var box_serialNumbers = serialNumbers.Where(x => x.BoxId == dto.BoxId).Select(x=>new { x.MaterialId,x.SerialNumber}).ToList();
var box_serialNumbers = serialNumbers.Where(x => x.BoxId == dto.BoxId).Select(x => new { x.MaterialId, x.SerialNumber }).ToList();
//3.2组装要新增的箱库存信息：箱和明细
var addEntity = _mapper.Map<BoxInventory>(dto);
@@ -209,7 +255,7 @@ namespace WMS.Web.Domain.Services
add_entitys.Add(addEntity);
}//下架
else
else
{
//3.1下架的时候：箱一定是存在于箱库存当中的，没有则返回提示“箱不存在于库存，请扫其它箱”
var ishave = boxInventorys.Where(x => x.BoxId == dto.BoxId).Any();
@@ -217,7 +263,7 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//3.2整箱移货下架-直接删除当前箱子所在的库存
var box_inventory= boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
var box_inventory = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
delete_entitys.Add(box_inventory);
}
}
@@ -227,12 +273,12 @@ namespace WMS.Web.Domain.Services
if (add_entitys.Count != 0)
{
isSuccess = await _boxInventoryRepositories.AddRange(add_entitys, isTransaction);
if(!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
}
if (delete_entitys.Count != 0)
{
var delete_ids = add_entitys.Select(x => x.Id).ToList();
isSuccess = await _boxInventoryRepositories.DeleteRange(delete_ids,isTransaction);
isSuccess = await _boxInventoryRepositories.DeleteRange(delete_ids, isTransaction);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
}
return Result.ReSuccess();
@@ -244,7 +290,7 @@ namespace WMS.Web.Domain.Services
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> GenerateBackBox(List<BoxInventoryBackGenerateDto> dtoDatas, bool isTransaction)
public async Task<Result> GenerateBackBox(List<BoxInventoryBackGenerateDto> dtoDatas, bool isTransaction)
{
//1.判断来源数据是否存在
if (dtoDatas == null || dtoDatas.Count == 0)
@@ -283,11 +329,11 @@ namespace WMS.Web.Domain.Services
}//下架
else
else
{
//3.1下架的时候：箱一定是存在于箱库存当中的，没有则返回提示“箱不存在于库存，请扫其它箱”
var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (boxInventory==null)
if (boxInventory == null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//3.2创建更新对象
var update_entity = boxInventory;
@@ -334,7 +380,7 @@ namespace WMS.Web.Domain.Services
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> HandlBoxInventory(List<BoxInventoryGenerateDto> dtoDatas, bool isTransaction)
public async Task<Result> HandlBoxInventory(List<BoxInventoryGenerateDto> dtoDatas, bool isTransaction)
{
//1.判断来源数据是否存在
if (dtoDatas == null || dtoDatas.Count == 0)
@@ -361,7 +407,7 @@ namespace WMS.Web.Domain.Services
return outStockInventoryResult;
}
//入库
else
else
{
//生成入库对象：新增和修改
var inStockInventoryResult = this.GenerateInStockBox(dto, boxInventorys, add_entitys, update_entitys);
@@ -370,7 +416,7 @@ namespace WMS.Web.Domain.Services
}
//组装：即时库存明细处理对象
var invDtos= this.GenerateInventoryDetails(dto);
var invDtos = this.GenerateInventoryDetails(dto);
InventoryDetailsGenerateDto.AddRange(invDtos);
}
@@ -392,7 +438,7 @@ namespace WMS.Web.Domain.Services
isSuccess = await _boxInventoryRepositories.UpdateRange(update_entitys, isTransaction);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
}
//5.即时库存：变更处理
if (InventoryDetailsGenerateDto.Count != 0)
{
@@ -412,7 +458,7 @@ namespace WMS.Web.Domain.Services
/// <param name="delete_ids"></param>
/// <param name="update_entitys"></param>
/// <returns></returns>
private Result GenerateOutStockBox(BoxInventoryGenerateDto dto,List<BoxInventory> boxInventorys,List<int> delete_ids, List<BoxInventory> update_entitys)
private Result GenerateOutStockBox(BoxInventoryGenerateDto dto, List<BoxInventory> boxInventorys, List<int> delete_ids, List<BoxInventory> update_entitys)
{
//3.1出库的时候：箱一定是存在于箱库存当中的，没有则返回提示“箱库存数据不存在，请稍候再试！”
// 获取箱库存
@@ -470,13 +516,13 @@ namespace WMS.Web.Domain.Services
/// <param name="add_entitys"></param>
/// <param name="update_entitys"></param>
/// <returns></returns>
private Result GenerateInStockBox(BoxInventoryGenerateDto dto, List<BoxInventory> boxInventorys, List<BoxInventory> add_entitys, List<BoxInventory> update_entitys)
private Result GenerateInStockBox(BoxInventoryGenerateDto dto, List<BoxInventory> boxInventorys, List<BoxInventory> add_entitys, List<BoxInventory> update_entitys)
{
//按箱上架入库
if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
{
//3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
var isHave = boxInventorys.Where(x=>x.BoxId==dto.BoxId).Any();
var isHave = boxInventorys.Where(x => x.BoxId == dto.BoxId).Any();
if (isHave)
return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);