diff --git a/src/WMS.Web.Api/Controllers/InStockController.cs b/src/WMS.Web.Api/Controllers/InStockController.cs index 70bdec6c..b3551060 100644 --- a/src/WMS.Web.Api/Controllers/InStockController.cs +++ b/src/WMS.Web.Api/Controllers/InStockController.cs @@ -49,13 +49,13 @@ namespace WMS.Web.Api.Controllers } /// - /// 上架 + /// 上架-采购订单 /// /// /// [HttpPost] [Route("Shelf")] - public async Task Shelf([FromBody] SaveInStockRequest dto) + public async Task Shelf([FromBody] PurchaseShelfRequest dto) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) @@ -64,6 +64,18 @@ namespace WMS.Web.Api.Controllers return await _inStockService.Shelf(dto, loginInfo); } + /// + /// 上架-非采购订单 + /// + /// + /// + [HttpPost] + [Route("ShelfOther")] + public async Task ShelfOther([FromBody] SaveInStockRequest dto) + { + return Result.ReSuccess(); + } + /// /// 通过箱号获取到入库任务单数据 /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index b75a579d..2cf456a3 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -61,9 +61,16 @@ - + - 上架 + 上架-采购订单 + + + + + + + 上架-非采购订单 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 822eec75..524a5183 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -907,7 +907,7 @@ - 单据头ID + 单据ID(等同-入库任务单ID) @@ -942,7 +942,7 @@ - ID + 单据ID(等同-入库任务单ID) @@ -967,7 +967,7 @@ - ID + 单据ID(等同-入库任务单ID) @@ -1037,7 +1037,7 @@ - 入库任务单ID + 单据ID(等同-入库任务单ID) @@ -1062,7 +1062,7 @@ - 单据头ID + 单据ID(等同-入库任务单ID) @@ -1082,7 +1082,7 @@ - 单据ID + 单据ID(等同-入库任务单ID) @@ -1405,11 +1405,26 @@ 同步成功或者失败 + + + 采购上架-请求对象 + + + + + 明细 + + 保存入库单明细-请求对象 + + + 单据ID(等同-入库任务单ID) + + 来源单号 @@ -1450,21 +1465,6 @@ 保存入库单-请求对象 - - - 入库类型 - - - - - 任务单ID - - - - - 明细 - - 箱库存-查询请求对象 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 69b9c09e..7c08eef3 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -269,11 +269,6 @@ ID - - - 任务单ID - - 单据编号 @@ -330,6 +325,11 @@ 单据头ID + + + 任务单ID + + 来源单号 @@ -1391,9 +1391,9 @@ - + - 上架 + 上架-采购订单 @@ -1406,15 +1406,6 @@ - - - 保存-出库单 - - - - - - 修改-入库任务信息 @@ -2000,9 +1991,9 @@ - + - 上架 + 上架-采购订单 @@ -2015,9 +2006,9 @@ - + - 保存-出库单 + 采购上架-保存 diff --git a/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs b/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs new file mode 100644 index 00000000..b6d2781f --- /dev/null +++ b/src/WMS.Web.Core/Dto/InStock/PurchaseShelfRequest.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.InStock +{ + /// + /// 采购上架-请求对象 + /// + public class PurchaseShelfRequest + { + /// + /// 明细 + /// + public List Details { get; set; } = new List(); + } +} diff --git a/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs index b26b9abc..4a6045df 100644 --- a/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs @@ -10,6 +10,12 @@ namespace WMS.Web.Core.Dto.InStock /// public class SaveInStockDetailsRequest { + /// + /// 单据ID(等同-入库任务单ID) + /// + [Required(ErrorMessage = "任务单ID不能为空")] + public int TaskId { get; set; } + /// /// 来源单号 /// diff --git a/src/WMS.Web.Core/Dto/InStock/SaveInStockRequest.cs b/src/WMS.Web.Core/Dto/InStock/SaveInStockRequest.cs index 6e4ad951..938eda8f 100644 --- a/src/WMS.Web.Core/Dto/InStock/SaveInStockRequest.cs +++ b/src/WMS.Web.Core/Dto/InStock/SaveInStockRequest.cs @@ -10,22 +10,7 @@ namespace WMS.Web.Core.Dto.InStock /// public class SaveInStockRequest { + - /// - /// 入库类型 - /// - [Required(ErrorMessage = "入库类型不能为空")] - public int Type { get; set; } - - /// - /// 任务单ID - /// - [Required(ErrorMessage = "任务单ID不能为空")] - public int TaskId { get; set; } - - /// - /// 明细 - /// - public List Details { get; set; } = new List(); } } diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs index 7332283d..4483f88b 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs @@ -14,7 +14,7 @@ namespace WMS.Web.Core.Dto.InStockTask /// public int Id { get; set; } /// - /// 单据头ID + /// 单据ID(等同-入库任务单ID) /// public int Fid { get; set; } diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs index 92fd1aa0..4b3634bc 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs @@ -10,7 +10,7 @@ namespace WMS.Web.Core.Dto.InStockTask public class InStockTaskInfoDto { /// - /// ID + /// 单据ID(等同-入库任务单ID) /// public int Id { get; set; } /// diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs index c29fd377..5a4d65a5 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs @@ -10,7 +10,7 @@ namespace WMS.Web.Core.Dto.InStockTask public class InStockTaskBillNoQueryResponse { /// - /// ID + /// 单据ID(等同-入库任务单ID) /// public int Id { get; set; } /// diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs index 20f9c4c2..aafb0158 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskBoxRequest.cs @@ -14,7 +14,7 @@ namespace WMS.Web.Core.Dto.InStockTask /// public override int Id { get; set; } = 0; /// - /// 入库任务单ID + /// 单据ID(等同-入库任务单ID) /// public int TaskId { get; set; } diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs index 3d74f892..565b6e0b 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs @@ -14,7 +14,7 @@ namespace WMS.Web.Core.Dto.InStockTask /// public override int Id { get; set; } = 0; /// - /// 单据头ID + /// 单据ID(等同-入库任务单ID) /// public int Fid { get; set; } /// diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskRequest.cs index 3439d3b5..aad2ea22 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskRequest.cs @@ -11,7 +11,7 @@ namespace WMS.Web.Core.Dto.InStockTask public class UpdateInStockTaskRequest { /// - /// 单据ID + /// 单据ID(等同-入库任务单ID) /// [Required(ErrorMessage = "唯一编号不能未空")] public int Id { get; set; } diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index 3ab54ccc..d1d809ef 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -17,12 +17,7 @@ namespace WMS.Web.Domain.Entitys /// ID /// public int Id { get; set; } - - /// - /// 任务单ID - /// - public int TaskId { get; set; } - + /// /// 单据编号 /// diff --git a/src/WMS.Web.Domain/Entitys/InStockDetails.cs b/src/WMS.Web.Domain/Entitys/InStockDetails.cs index 31b556d1..79157cae 100644 --- a/src/WMS.Web.Domain/Entitys/InStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InStockDetails.cs @@ -20,6 +20,11 @@ namespace WMS.Web.Domain.Entitys /// 单据头ID /// public int Fid { get; set; } + /// + /// 任务单ID + /// + public int TaskId { get; set; } + /// /// 来源单号 /// diff --git a/src/WMS.Web.Domain/IService/IInStockService.cs b/src/WMS.Web.Domain/IService/IInStockService.cs index 9feca57d..2acef8bd 100644 --- a/src/WMS.Web.Domain/IService/IInStockService.cs +++ b/src/WMS.Web.Domain/IService/IInStockService.cs @@ -7,6 +7,7 @@ using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Dto.Login; using WMS.Web.Core.Internal.Results; +using WMS.Web.Domain.Values; namespace WMS.Web.Domain.IService { @@ -32,12 +33,12 @@ namespace WMS.Web.Domain.IService Task Receive(UpdateInStockTaskRequest dto, LoginInDto loginInfo); /// - /// 上架 + /// 上架-采购订单 /// /// /// /// - Task Shelf(SaveInStockRequest instock, LoginInDto loginInfo); + Task Shelf(PurchaseShelfRequest instock, LoginInDto loginInfo); /// /// 获取任务单：根据箱号信息 @@ -46,15 +47,6 @@ namespace WMS.Web.Domain.IService /// Task> GetInfoByBox(string boxBillNo); - /// - /// 保存-出库单 - /// - /// - /// - /// - /// - Task Save(SaveInStockRequest dto, int staffId, bool isTransaction = true); - /// /// 修改-入库任务信息 /// diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 8256ae26..8b46e41a 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -79,24 +79,22 @@ namespace WMS.Web.Domain.Services } /// - /// 上架 + /// 上架-采购订单 /// /// /// /// - public async Task Shelf(SaveInStockRequest instock, LoginInDto loginInfo) + public async Task Shelf(PurchaseShelfRequest instock, LoginInDto loginInfo) { IDbContextTransaction _transaction = _transactionRepositories.GetTransaction(); bool isRollback = false; bool isTransaction = false; - //1.添加入库单：（同步金蝶在save方法里面进行） - var save_result = await this.Save(instock, loginInfo.UserInfo.StaffId, isTransaction); + var save_result = await this.Save(instock, InstockType.Purchase, loginInfo.UserInfo.StaffId, isTransaction); if (!save_result.IsSuccess) isRollback = true; { //2.修改入库任务单 - var ids = new List(); - ids.Add(instock.TaskId); + var ids = instock.Details.GroupBy(x => x.TaskId).Select(x => x.Key).ToList(); var result = await this.UpdateRange(ids, loginInfo.UserInfo.StaffId, false, isTransaction); if (!result.IsSuccess) isRollback = true; } @@ -142,17 +140,16 @@ namespace WMS.Web.Domain.Services } /// - /// 保存-出库单 + /// 采购上架-保存 /// /// /// /// /// - public async Task Save(SaveInStockRequest dto, int staffId, bool isTransaction = true) + private async Task Save(PurchaseShelfRequest dto, InstockType type, int staffId, bool isTransaction = true) { var entity = new InStock(); - entity.Type = (InstockType)dto.Type; - entity.TaskId = dto.TaskId; + entity.Type = type; entity.Details = _mapper.Map>(dto.Details); entity.Create(staffId); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index fb41ec13..781114c4 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -201,7 +201,7 @@ namespace WMS.Web.Repositories var list = await query.Select(s => new InStockTaskBillNoQueryResponse() { - Id=s.detail.Id, + Id=s.order.Id, DetailsId=s.detail.Id, SourceBillNo=s.order.SourceBillNo, MaterialId=s.detail.MaterialId,