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-23 15:24:40 +08:00
parent 8cf8dab210
commit a49c85752a
7 changed files with 343 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2596,6 +2596,61 @@
物料库存数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto">
<summary>
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.InventoryInOutType">
<summary>
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.BoxId">
<summary>
箱ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.StockCode">
<summary>
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto.Details">
<summary>
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeDetailsGenerateDto">
<summary>
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeDetailsGenerateDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeDetailsGenerateDto.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryTakeDetailsGenerateDto.SerialNumbers">
<summary>
序列号集
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsGenerateDto">
<summary>
即时库存明细：生成dto
@@ -4126,6 +4181,11 @@
盘点数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.SerialNumbers">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest.Remark">
<summary>
备注

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

@@ -1605,6 +1605,11 @@
备注
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStock.SerialNumbers">
<summary>
序列号
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.Create(System.Int32)">
<summary>
创建
@@ -2213,6 +2218,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IBoxInventoryService.GenerateTakeBox(System.Collections.Generic.List{WMS.Web.Domain.Entitys.TakeStock},System.Boolean)">
<summary>
盘点-箱库存的变更
</summary>
<param name="dtoDatas"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.IChangeMoveBoxService">
<summary>
改箱 移箱服务
@@ -3310,6 +3323,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.BoxInventoryService.GenerateTakeBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryTakeGenerateDto},System.Boolean)">
<summary>
盘点单-箱库存的变更
</summary>
<param name="dtoDatas"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.BoxInventoryService.HandlBoxInventory(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryGenerateDto},System.Boolean)">
<summary>
处理箱库存变更：出入库

62
src/WMS.Web.Core/Dto/Inventory/BoxInventoryTakeGenerateDto.cs Normal file
View File

@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
///
/// </summary>
public class BoxInventoryTakeGenerateDto
{
/// <summary>
/// 类型：1为入库，2为出库
/// </summary>
public int InventoryInOutType { get; set; }
/// <summary>
/// 箱ID
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// </summary>
public int SubStockId { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<BoxInventoryTakeDetailsGenerateDto> Details { get; set; } = new List<BoxInventoryTakeDetailsGenerateDto>();
}
/// <summary>
///
/// </summary>
public class BoxInventoryTakeDetailsGenerateDto
{
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 序列号集
/// </summary>
public List<string> SerialNumbers { get; set; } = new List<string>();
}
}

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

@@ -45,6 +45,14 @@ namespace WMS.Web.Domain.IService
/// <returns></returns>
Task<Result> GenerateBackBox(List<BackRecord> dtoDatas, bool isTransaction);
/// <summary>
/// 盘点-箱库存的变更
/// </summary>
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> GenerateTakeBox(List<TakeStock> dtoDatas, bool isTransaction);
}
}

5
src/WMS.Web.Domain/Mappers/InventoryMapper.cs
View File

@@ -37,6 +37,11 @@ namespace WMS.Web.Domain.Mappers
CreateMap<BoxInventoryGenerateDto, BoxInventory>();
CreateMap<BoxInventoryGenerateDetailsDto, BoxInventoryDetails>();
//盘点
CreateMap<BoxInventoryTakeGenerateDto, BoxInventory>();
CreateMap<BoxInventoryTakeDetailsGenerateDto, BoxInventoryDetails>();
//物料收发明细-映射
CreateMap<InventoryInOutDetailsGenerateDto, InventoryInOutDetails>()
.ForMember(x => x.OrderType, ops => ops.MapFrom(x => x.OrderType))

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

@@ -608,11 +608,195 @@ namespace WMS.Web.Domain.Services
if (dtoDatas == null || dtoDatas.Count == 0)
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
var generateDtoList = new List<BoxInventoryBackGenerateDto>();
//2.组装：入库数据
var generateDtoList_in = dtoDatas.Where(x => x.ResultType == TakeStockType.Profit).GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryTakeGenerateDto()
{
BoxId = x.Key.BoxId,
OrgCode = x.Key.OrgCode,
StockCode = x.Key.StockCode,
SubStockId = x.Key.SubStockId,
InventoryInOutType = (int)InventoryInOutType.In
}).ToList();
//2.1.遍历：组装明细
generateDtoList_in.ForEach(x =>
{
foreach (var detItem in dtoDatas)
{
//3.1箱是当前的
if (detItem.BoxId == x.BoxId)
{
//3.2组装明细
var det = new BoxInventoryTakeDetailsGenerateDto();
det.MaterialId = detItem.MaterialId;
det.Qty = detItem.FinalQty;
det.SerialNumbers = detItem.SerialNumbers;
x.Details.Add(det);
}
}
});
//3.组装：出库数据
var generateDtoList_out = dtoDatas.Where(x => x.ResultType == TakeStockType.Loss).GroupBy(x => new { x.BoxId, x.OrgCode, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryTakeGenerateDto()
{
BoxId = x.Key.BoxId,
OrgCode = x.Key.OrgCode,
StockCode = x.Key.StockCode,
SubStockId = x.Key.SubStockId,
InventoryInOutType = (int)InventoryInOutType.Out
}).ToList();
return null;
//3.1遍历：组装明细
generateDtoList_in.ForEach(x =>
{
foreach (var detItem in dtoDatas)
{
//3.1箱是当前的
if (detItem.BoxId == x.BoxId)
{
//3.2组装明细
var det = new BoxInventoryTakeDetailsGenerateDto();
det.MaterialId = detItem.MaterialId;
det.Qty = detItem.FinalQty;
det.SerialNumbers = detItem.SerialNumbers;
x.Details.Add(det);
}
}
});
//整合一起
var generateDtoList = new List<BoxInventoryTakeGenerateDto>();
generateDtoList.AddRange(generateDtoList_in);
generateDtoList.AddRange(generateDtoList_out);
//提交处理
return await this.GenerateTakeBox(generateDtoList, isTransaction);
}
/// <summary>
/// 盘点单-箱库存的变更
/// </summary>
/// <param name="dtoDatas"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
private async Task<Result> GenerateTakeBox(List<BoxInventoryTakeGenerateDto> dtoDatas, bool isTransaction)
{
//1.判断来源数据是否存在
if (dtoDatas == null || dtoDatas.Count == 0)
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
var update_entitys = new List<BoxInventory>();
var InventoryDetailsGenerateDto = new List<InventoryDetailsGenerateDto>();
//2.获取“箱库存集合”
var boxIds = dtoDatas.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
//3.遍历：dto
foreach (var dto in dtoDatas)
{
//入库
if (dto.InventoryInOutType == (int)InventoryInOutType.In)
{
//3.1入库的时候：盘点-箱一定是存在于库存
var boxInvent = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (boxInvent == null)
return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
//3.2组装要新增的箱库存信息：箱和明细和序列号
var updateEntity = boxInvent;
updateEntity.Details = boxInvent.Details;
//3.3序列号重新给值：已有的物料
updateEntity.Details.ForEach(x =>
{
foreach (var detItem in dto.Details)
{
if (x.MaterialId == detItem.MaterialId)
{
x.Qty = x.Qty + detItem.Qty;
x.SerialNumbers = detItem.SerialNumbers;
}
}
});
//3.4明细添加新的物料
foreach (var detItem in dto.Details)
{
var IsHave_upEnDet = updateEntity.Details.Where(x => x.MaterialId == detItem.MaterialId).Any();
if (!IsHave_upEnDet)
{
var newDet = _mapper.Map<BoxInventoryDetails>(detItem);
updateEntity.Details.Add(newDet);
}
//3.2.2组装即时库存dto
var inventoryDet = new InventoryDetailsGenerateDto();
inventoryDet.MaterialId = detItem.MaterialId;
inventoryDet.OrgCode = dto.OrgCode;
inventoryDet.StockCode = dto.StockCode;
inventoryDet.SubStockId = dto.SubStockId;
inventoryDet.Qty = detItem.Qty;
inventoryDet.InventoryInOutType = (int)InventoryInOutType.In;
//3.2.2即时库存：修改箱库存的集合
InventoryDetailsGenerateDto.Add(inventoryDet);
}
//3.5要处理的修改集合
update_entitys.Add(updateEntity);
}//出库
else
{
//3.1出库的时候：盘点-箱库存是存在
var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
if (boxInventory == null)
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
//3.2创建更新对象
var update_entity = boxInventory;
update_entity.Details = boxInventory.Details;
//3.3序列号重新给值：已有的物料
update_entity.Details.ForEach(x =>
{
foreach (var detItem in dto.Details)
{
if (x.MaterialId == detItem.MaterialId)
{
x.Qty = x.Qty - detItem.Qty;
x.SerialNumbers = detItem.SerialNumbers;
}
}
});
//3.4明细添加新的物料
foreach (var detItem in dto.Details)
{
//3.2.2组装即时库存dto
var inventoryDet = new InventoryDetailsGenerateDto();
inventoryDet.MaterialId = detItem.MaterialId;
inventoryDet.OrgCode = dto.OrgCode;
inventoryDet.StockCode = dto.StockCode;
inventoryDet.SubStockId = dto.SubStockId;
inventoryDet.Qty = detItem.Qty;
inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out;
//3.2.2即时库存：修改箱库存的集合
InventoryDetailsGenerateDto.Add(inventoryDet);
}
//3.5要处理的修改集合
update_entitys.Add(update_entity);
}
}
var isSuccess = true;
//4.数据库更新操作:更新和添加
if (update_entitys.Count != 0)
{
isSuccess = await _boxInventoryRepositories.UpdateRange(update_entitys, isTransaction);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
}
//5.即时库存：处理
if (InventoryDetailsGenerateDto.Count != 0)
{
var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto, isTransaction);
if (!InventoryDetailsGenerate_result.IsSuccess)
return InventoryDetailsGenerate_result;
}
return Result.ReSuccess();
}

2
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -120,7 +120,7 @@ namespace WMS.Web.Repositories
var response = _mapper.Map<BoxInventoryResponse>(entity);
if (response != null)
{
var serialNumbs = await _context.SerialNumbers.Where(x => x.BoxId == response.BoxId).ToListAsync();
//var serialNumbs = await _context.SerialNumbers.Where(x => x.BoxId == response.BoxId).ToListAsync();
response.Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, response.StockCode + response.OrgCode);
response.SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, response.SubStockId);