diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index ce9d194e..43e458ed 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1790,16 +1790,61 @@ 上架方式 + + + 仓库编码 + + + + + 仓位ID + + 箱信息 - + + + 箱 + + + + + 箱信息ID + + + + + 箱号 + + + 入库单明细 + + + 明细 + + + + + 物料Id + + + + + 入库数量 + + + + + 序列号集 + + 采购上架-请求对象 diff --git a/src/WMS.Web.Core/Dto/InStock/NoPurchaseShelfRequest.cs b/src/WMS.Web.Core/Dto/InStock/NoPurchaseShelfRequest.cs index 3305ce8b..9f1a19c8 100644 --- a/src/WMS.Web.Core/Dto/InStock/NoPurchaseShelfRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/NoPurchaseShelfRequest.cs @@ -23,14 +23,64 @@ namespace WMS.Web.Core.Dto.InStock [Required(ErrorMessage = "上架方式不能为空")] public int ShelfMethod { get; set; } + /// + /// 仓库编码 + /// + [Required(ErrorMessage = "仓库不能为空")] + public string StockCode { get; set; } + /// + /// 仓位ID + /// + [Required(ErrorMessage = " 仓位不能为空")] + public int SubStockId { get; set; } + /// /// 箱信息 /// - public List Boxs { get; set; } = new List(); + public List Boxs { get; set; } = new List(); + } + + /// + /// 箱 + /// + public class NoPurchaseShelfBoxRequest + { + /// + /// 箱信息ID + /// + public int BoxId { get; set; } + + /// + /// 箱号 + /// + public string BoxBillNo { get; set; } /// /// 入库单明细 /// - public List Details { get; set; } = new List(); - } + public List Details { get; set; } = new List(); + } + + /// + /// 明细 + /// + public class NoPurchaseShelfDetailsRequest + { + /// + /// 物料Id + /// + [Required(ErrorMessage = "物料不能为空")] + public int MaterialId { get; set; } + + /// + /// 入库数量 + /// + [Required(ErrorMessage = "入库数量不能为空")] + public decimal Qty { get; set; } + + /// + /// 序列号集 + /// + public List SerialNumbers { get; set; } = new List(); + } } diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index f3ac92f6..11b78b4b 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -5,6 +5,7 @@ using System.Text; using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Dto.InStockTask; +using WMS.Web.Core.Dto.Inventory; using WMS.Web.Domain.Entitys; namespace WMS.Web.Domain.Mappers @@ -29,7 +30,10 @@ namespace WMS.Web.Domain.Mappers - CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap(); + CreateMap() .ForMember(x => x.Details, ops => ops.Ignore()); diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 6dfaa2e9..b96f6e25 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -38,7 +38,7 @@ namespace WMS.Web.Domain.Services private readonly IInStockRepositories _inStockRepositories; private readonly IInStockTaskRepositories _inStockTaskRepositories; private readonly IErpBasicDataExtendService _erpBasicDataExtendService; - public InStockService(IMapper mapper, IErpService erpService, IBoxInventoryService boxInventoryService,ISerialNumberService serialNumberService, ILoginService loginService, IBoxRepositories boxRepositories, + public InStockService(IMapper mapper, IErpService erpService, IBoxInventoryService boxInventoryService, ISerialNumberService serialNumberService, ILoginService loginService, IBoxRepositories boxRepositories, IBasicsRepositories basicsRepositories, IErpBasicDataExtendService erpBasicDataExtendService, IChangeMoveBoxService changeMoveBoxService, IInStockRepositories inStockRepositories, IInStockTaskRepositories inStockTaskRepositories) { @@ -60,7 +60,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task Sync(OperateRequest dto) + public async Task Sync(OperateRequest dto) { return Result.ReSuccess(); } @@ -76,7 +76,7 @@ namespace WMS.Web.Domain.Services IDbContextTransaction _transaction = _basicsRepositories.GetTransaction(); bool isRollback = false; bool isTransaction = false; - var result = await this.Update(dto, loginInfo.UserInfo.StaffId,true, isTransaction); + var result = await this.Update(dto, loginInfo.UserInfo.StaffId, true, isTransaction); if (!result.IsSuccess) isRollback = true; //提交事务 @@ -122,14 +122,14 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task ShelfNoPurchase(NoPurchaseShelfRequest dto,LoginInDto loginInDto) + public async Task ShelfNoPurchase(NoPurchaseShelfRequest dto, LoginInDto loginInDto) { IDbContextTransaction _transaction = _basicsRepositories.GetTransaction(); bool isRollback = false; bool isTransaction = false; //保存非采购上架的数据 var shelfSave_result = await this.ShelfNoPurchaseSave(dto, loginInDto, isTransaction); - if(!shelfSave_result.IsSuccess) isRollback = true; + if (!shelfSave_result.IsSuccess) isRollback = true; //提交事务 var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction); if (!isSuccess) @@ -151,13 +151,13 @@ namespace WMS.Web.Domain.Services materials = materials_result.Data.ToList(); //1.先判断：箱号已经绑定了入库任务单中；备注：业务说法就是箱是否收货了 - var tast= await _inStockTaskRepositories.GetBy(boxBillNo); - if (tast==null) + var tast = await _inStockTaskRepositories.GetBy(boxBillNo); + if (tast == null) return Result.ReFailure(ResultCodes.Box_NoBind_Task_Data); //2.找到箱对应的物料信息 - var box= await _boxRepositories.GetByNo(boxBillNo); - if(box==null) + var box = await _boxRepositories.GetByNo(boxBillNo); + if (box == null) return Result.ReFailure(ResultCodes.BoxNoData); //3.组装返回数据 @@ -176,7 +176,7 @@ namespace WMS.Web.Domain.Services task_detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, task_detail.MaterialId); result.Details.Add(task_detail); } - return Result.ReSuccess(result); + return Result.ReSuccess(result); } /// @@ -202,18 +202,18 @@ namespace WMS.Web.Domain.Services if (entity != null) { //保存成功后：序列号跟踪流程添加 - var serialNumber_result= await _serialNumberService.InStock(entity, loginInfo, isTransaction); + var serialNumber_result = await _serialNumberService.InStock(entity, loginInfo, isTransaction); if (!serialNumber_result.IsSuccess) return serialNumber_result; //保存成功后：变更箱库存 var boxInventoryGenerateDto = dto.Details.GroupBy(x => new { x.BoxId, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryGenerateDto() { - InventoryInOutMethod= (int)InventoryInOutMethod.Box, - InventoryInOutType=(int)InventoryInOutType.In, - BoxId=x.Key.BoxId, - StockCode=x.Key.StockCode, - SubStockId=x.Key.SubStockId + InventoryInOutMethod = (int)InventoryInOutMethod.Box, + InventoryInOutType = (int)InventoryInOutType.In, + BoxId = x.Key.BoxId, + StockCode = x.Key.StockCode, + SubStockId = x.Key.SubStockId }).ToList(); foreach (var item in dto.Details) @@ -246,51 +246,55 @@ namespace WMS.Web.Domain.Services /// private async Task ShelfNoPurchaseSave(NoPurchaseShelfRequest dto, LoginInDto loginInfo, bool isTransaction = true) { - //1.修改-入库任务单的信息 - var updateInStockTaskRequest = new UpdateInStockTaskRequest(); - updateInStockTaskRequest.Id = dto.TaskId; - updateInStockTaskRequest.Boxs = dto.Boxs; - updateInStockTaskRequest.Details = new List(); - foreach (var item in dto.Details) - { - var updateInStockTaskDetailsRequest = new UpdateInStockTaskDetailsRequest(); - updateInStockTaskDetailsRequest.MaterialId = item.MaterialId; - updateInStockTaskDetailsRequest.ReceiveQty = item.Qty; - updateInStockTaskRequest.Details.Add(updateInStockTaskDetailsRequest); - } - //1.1.先找到箱IDs：获取箱基本信息 - var boxIds = dto.Details.GroupBy(x => x.BoxId).Select(x => x.Key).ToList(); - //var boxInfos= await _boxRepositories.GetEntityList(boxIds); - //foreach (var item in boxInfos) - //{ - // var task_box = new UpdateInStockTaskBoxRequest(); - // task_box.BoxId = item.Id; - // task_box.BoxBillNo = item.BoxBillNo; - // updateInStockTaskRequest.Boxs.Add(task_box); - //} - - //1.2.修改入库任务单 - var update_result = await this.Update(updateInStockTaskRequest, loginInfo.UserInfo.StaffId, null, isTransaction, true); - if (!update_result.IsSuccess) - return update_result; + //1.获取来源单 + var task = await _inStockTaskRepositories.Get(dto.TaskId); + if (task == null) + return Result.ReFailure(ResultCodes.SourceBillNoDateError); - //2.入库单生成 + //2.生成:入库单 var entity = new InStock(); - entity.Type = update_result.Data.Type; - entity.Details = _mapper.Map>(dto.Details); + entity.Type = task.Type; + entity.Details = new List(); + + var temps=new List(); + //3.遍历：box信息,并拼装入库单明细 + foreach (var box in dto.Boxs) + { + //3.1先数据映射 + var dets = _mapper.Map>(box.Details); + //3.2遍历赋值：boxID和仓库和仓位和来源单和供应商和组织 + dets.ForEach(item => + { + item.TaskId = dto.TaskId; + item.SourceBillNo = task.SourceBillNo; + item.BoxId = box.BoxId; + item.SubStockId = dto.SubStockId; + item.StockCode = dto.StockCode; + + var taskDet= task.Details.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault(); + item.SupplierId = taskDet.SupplierId; + item.OrgId = taskDet.OrgId; + }); + //3.3添加到临时集合中 + temps.AddRange(dets); + } + //3.4给对象明细赋值 + entity.Details = temps; + //4.创建 entity.Create(loginInfo.UserInfo.StaffId); - //2.1保存入库单信息 + //5.1保存入库单信息 entity = await _inStockRepositories.Add(entity, isTransaction); - if(entity==null) + if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError); - //2.2当按产品上架：就要调用改箱的操作； + //6.当按产品上架：就要调用改箱的操作； if (dto.ShelfMethod == (int)ShelfMethod.Product) { + var dto_box = dto.Boxs.FirstOrDefault(); var changeBox = new SaveChangeBoxRecordRequest(); - changeBox.DestBoxId = boxIds.FirstOrDefault(); - foreach (var item in dto.Details) + changeBox.DestBoxId = dto_box.BoxId; + foreach (var item in dto_box.Details) { var changeBoxRD = new SaveChangeBoxRecordDetailsRequest(); changeBoxRD.MaterialId = item.MaterialId; @@ -303,35 +307,24 @@ namespace WMS.Web.Domain.Services return changeBoxSave_Result; } - //2.3序列号跟踪流程添加；备注：和上面的改箱操作后会记录序列号轨迹不冲突； + //6.1序列号跟踪流程添加；备注：和上面的改箱操作后会记录序列号轨迹不冲突； var serialNumber_result = await _serialNumberService.InStock(entity, loginInfo, isTransaction); if (!serialNumber_result.IsSuccess) return serialNumber_result; - //3.箱库存的变更 - //3.1组装头部 - var boxInventoryGenerateDto = dto.Details.GroupBy(x => new { x.BoxId, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryGenerateDto() + //7.箱库存的变更 + //7.1组装头部和明细 + var boxInventoryGenerateDto = dto.Boxs.Select(item => new BoxInventoryGenerateDto() { - InventoryInOutMethod = dto.ShelfMethod == (int)ShelfMethod.Product?(int)InventoryInOutMethod.Box: (int)InventoryInOutMethod.Product, + InventoryInOutMethod = dto.ShelfMethod == (int)ShelfMethod.Product ? (int)InventoryInOutMethod.Box : (int)InventoryInOutMethod.Product, InventoryInOutType = (int)InventoryInOutType.In, - BoxId = x.Key.BoxId, - StockCode = x.Key.StockCode, - SubStockId = x.Key.SubStockId + BoxId = item.BoxId, + StockCode = dto.StockCode, + SubStockId = dto.SubStockId, + Details = _mapper.Map>(item.Details) }).ToList(); - //3.2组装明细 - foreach (var item in dto.Details) - { - var current = boxInventoryGenerateDto.Where(x => x.BoxId == item.BoxId).FirstOrDefault(); - if (current != null) - { - var detail = new BoxInventoryGenerateDetailsDto(); - detail.MaterialId = item.MaterialId; - detail.Qty = item.Qty; - detail.SerialNumbers = item.SerialNumbers; - current.Details.Add(detail); - } - } - //3.3执行处理箱库存 + + //7.2执行处理箱库存 var boxInventoryResult = await _boxInventoryService.HandlBoxInventory(boxInventoryGenerateDto, isTransaction); if (!boxInventoryResult.IsSuccess) return boxInventoryResult; @@ -347,7 +340,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task> Update(UpdateInStockTaskRequest dto, int staffId,bool? isReceive, bool isTransaction = true,bool isNoPurchaseShelf=false) + public async Task> Update(UpdateInStockTaskRequest dto, int staffId, bool? isReceive, bool isTransaction = true, bool isNoPurchaseShelf = false) { var entity = await _inStockTaskRepositories.Get(dto.Id); if (entity == null) @@ -374,7 +367,7 @@ namespace WMS.Web.Domain.Services else entity.Shelf(staffId); } - var result =await _inStockTaskRepositories.Update(entity, isTransaction); + var result = await _inStockTaskRepositories.Update(entity, isTransaction); if (result != null) return Result.ReSuccess(entity); else @@ -392,7 +385,7 @@ namespace WMS.Web.Domain.Services public async Task UpdateRange(List ids, int staffId, bool isReceive, bool isTransaction = true) { var entitys = await _inStockTaskRepositories.GetList(ids); - if (entitys == null || entitys.Count==0) + if (entitys == null || entitys.Count == 0) return Result.ReFailure(ResultCodes.DateWriteError); foreach (var item in entitys) @@ -401,7 +394,7 @@ namespace WMS.Web.Domain.Services item.Receive(staffId); else item.Shelf(staffId); - } + } var isSuccess = await _inStockTaskRepositories.UpdateRange(entitys, isTransaction); if (isSuccess) return Result.ReSuccess(); @@ -414,7 +407,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task> Contrast(ContrastMaterialsRequest dto) + public async Task> Contrast(ContrastMaterialsRequest dto) { //1.找到任务单的明细信息 var task = await _inStockTaskRepositories.Get(dto.TaskId); @@ -427,7 +420,7 @@ namespace WMS.Web.Domain.Services //2.找到箱对应的物料信息：多个箱 var boxs = await _boxRepositories.GetEntityListByNos(dto.BoxBillNos); - if (boxs == null || boxs.Count==0) + if (boxs == null || boxs.Count == 0) return Result.ReFailure(ResultCodes.BoxNoData); //合并多个箱明细的数据：相同物料数量合并 @@ -435,12 +428,12 @@ namespace WMS.Web.Domain.Services //3.比对：false为比对失败; bool isRight = boxDetails.All(x => task.Details.Any(t => t.MaterialId == x.MaterialId && t.AccruedQty >= x.Qty)) && boxDetails.Count == task.Details.Count; - if(!isRight) + if (!isRight) return Result.ReFailure(ResultCodes.ContrastError); //4.是否任务单存在绑定箱号判断:存在的话，就不能收货或者非采购上架 bool isHave = task.Boxs.Where(x => dto.BoxBillNos.Contains(x.BoxBillNo)).Any(); - if(isHave) + if (isHave) return Result.ReFailure(ResultCodes.BoxHaveError); //4.返回对比结果：true为比对成功，并把箱ID和箱号返回 @@ -452,8 +445,8 @@ namespace WMS.Web.Domain.Services r_box.BoxBillNo = box.BoxBillNo; r_box.BoxId = box.Id; r_box.TotalCount = box.Details.Sum(x => x.Qty); - r_box.Details =_mapper.Map>( box.Details); - } + r_box.Details = _mapper.Map>(box.Details); + } return Result.ReSuccess(response); } } diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 45b51989..74ea401e 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -21,6 +21,7 @@ namespace WMS.Web.Domain.Values /// public static ValueTuple DateWriteError = (40004, "数据操作失败"); public static ValueTuple NoDateError = (40005, "数据不存在"); + public static ValueTuple SourceBillNoDateError = (40005, "来源单不存在，请核对后再试"); //出库任务单 public static ValueTuple MergeStatusError = (70000, "所选单据数据不一致,不能合并");