diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 846cfaaf..465d3a91 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2596,6 +2596,61 @@ 物料库存数量 + + + + + + + + 类型：1为入库，2为出库 + + + + + 箱ID + + + + + 组织编码 + + + + + 仓库编码 + + + + + 仓位ID + + + + + 明细 + + + + + + + + + + 物料ID + + + + + 数量 + + + + + 序列号集 + + 即时库存明细：生成dto @@ -4126,6 +4181,11 @@ 盘点数量 + + + 序列号 + + 备注 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 620087b6..4fa25925 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1605,6 +1605,11 @@ 备注 + + + 序列号 + + 创建 @@ -2213,6 +2218,14 @@ + + + 盘点-箱库存的变更 + + + + + 改箱 移箱服务 @@ -3310,6 +3323,14 @@ + + + 盘点单-箱库存的变更 + + + + + 处理箱库存变更：出入库 diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryTakeGenerateDto.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryTakeGenerateDto.cs new file mode 100644 index 00000000..b7fc775b --- /dev/null +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryTakeGenerateDto.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Inventory +{ + /// + /// + /// + public class BoxInventoryTakeGenerateDto + { + /// + /// 类型：1为入库，2为出库 + /// + public int InventoryInOutType { get; set; } + + /// + /// 箱ID + /// + public int BoxId { get; set; } + + /// + /// 组织编码 + /// + public string OrgCode { get; set; } + + /// + /// 仓库编码 + /// + public string StockCode { get; set; } + + /// + /// 仓位ID + /// + public int SubStockId { get; set; } + + /// + /// 明细 + /// + public List Details { get; set; } = new List(); + } + + /// + /// + /// + public class BoxInventoryTakeDetailsGenerateDto + { + /// + /// 物料ID + /// + public int MaterialId { get; set; } + /// + /// 数量 + /// + public decimal Qty { get; set; } + + /// + /// 序列号集 + /// + public List SerialNumbers { get; set; } = new List(); + } +} diff --git a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs index e23be792..2c514451 100644 --- a/src/WMS.Web.Domain/IService/IBoxInventoryService.cs +++ b/src/WMS.Web.Domain/IService/IBoxInventoryService.cs @@ -45,6 +45,14 @@ namespace WMS.Web.Domain.IService /// Task GenerateBackBox(List dtoDatas, bool isTransaction); + /// + /// 盘点-箱库存的变更 + /// + /// + /// + /// + Task GenerateTakeBox(List dtoDatas, bool isTransaction); + } } diff --git a/src/WMS.Web.Domain/Mappers/InventoryMapper.cs b/src/WMS.Web.Domain/Mappers/InventoryMapper.cs index 503ce590..892b60cf 100644 --- a/src/WMS.Web.Domain/Mappers/InventoryMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InventoryMapper.cs @@ -37,6 +37,11 @@ namespace WMS.Web.Domain.Mappers CreateMap(); CreateMap(); + //盘点 + CreateMap(); + CreateMap(); + + //物料收发明细-映射 CreateMap() .ForMember(x => x.OrderType, ops => ops.MapFrom(x => x.OrderType)) diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index 197a0bc0..dfff0ebf 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -608,11 +608,195 @@ namespace WMS.Web.Domain.Services if (dtoDatas == null || dtoDatas.Count == 0) return Result.ReFailure(ResultCodes.InventoryNoSourceError); - var generateDtoList = new List(); + //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(); + generateDtoList.AddRange(generateDtoList_in); + generateDtoList.AddRange(generateDtoList_out); + //提交处理 + return await this.GenerateTakeBox(generateDtoList, isTransaction); + } + + /// + /// 盘点单-箱库存的变更 + /// + /// + /// + /// + private async Task GenerateTakeBox(List dtoDatas, bool isTransaction) + { + //1.判断来源数据是否存在 + if (dtoDatas == null || dtoDatas.Count == 0) + return Result.ReFailure(ResultCodes.InventoryNoSourceError); + + var update_entitys = new List(); + var InventoryDetailsGenerateDto = new List(); + + //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(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(); } diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index 828d1032..3321f738 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -120,7 +120,7 @@ namespace WMS.Web.Repositories var response = _mapper.Map(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);