diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 07275574..ab53050c 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -217,7 +217,7 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return Result.ReFailure(ResultCodes.Token_Invalid_Error); - return await _outStockTaskService.GetInfo(id); + return await _outStockTaskService.GetInfo(id, loginInfo); } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 83cee8ee..c5fe270a 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4588,11 +4588,6 @@ 序列号 - - - 仓位 - - 出库数量 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 697d7256..dc8f7385 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3849,7 +3849,7 @@ - + 查询出库任务单详情 @@ -4966,7 +4966,7 @@ - + 获取出库任务单详情 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs index dbedcb58..2b498e7f 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs @@ -26,10 +26,6 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public string SerialNumbers { get; set; } /// - /// 仓位 - /// - public string SubStockCode { get; set; } - /// /// 出库数量 /// public decimal Qty { get; set; } @@ -48,6 +44,6 @@ namespace WMS.Web.Core.Dto.OutStockTask /// /// 出库时间 /// - public DateTime CreateTime { get; set; } = DateTime.Now; + public string CreateTime { get; set; } } } diff --git a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs index ce69f5d1..fd1c1314 100644 --- a/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs +++ b/src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs @@ -62,6 +62,6 @@ namespace WMS.Web.Domain.IService.Public /// /// /// - Task> GetInfo(int id); + Task> GetInfo(int id, LoginInDto loginInfo); } } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index ca97181c..ef38c481 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -7,6 +7,7 @@ using System.Text; using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.OutStock; @@ -20,6 +21,7 @@ using WMS.Web.Domain.IService; using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.Services.Public; using WMS.Web.Domain.Values; +using WMS.Web.Domain.Values.Single; namespace WMS.Web.Domain.Services { @@ -37,10 +39,12 @@ namespace WMS.Web.Domain.Services private readonly IErpOpsSyncDateRepositories _erpOpsSyncDateRepositories; private readonly RedisClientService _redisClientService; private readonly IErpBasicDataExtendService _erpBasicDataExtendService; + private readonly ISingleDataService _singleDataService; public OutStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService, IBasicsRepositories transactionRepositories, IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories, IErpOpsSyncDateRepositories erpOpsSyncDateRepositories, - RedisClientService redisClientService, IErpBasicDataExtendService erpBasicDataExtendService) + RedisClientService redisClientService, IErpBasicDataExtendService erpBasicDataExtendService, + ISingleDataService singleDataService) { _mapper = mapper; _erpService = erpService; @@ -51,6 +55,7 @@ namespace WMS.Web.Domain.Services _erpOpsSyncDateRepositories = erpOpsSyncDateRepositories; _redisClientService = redisClientService; _erpBasicDataExtendService = erpBasicDataExtendService; + _singleDataService = singleDataService; } /// @@ -446,7 +451,7 @@ namespace WMS.Web.Domain.Services /// /// /// - public async Task> GetInfo(int id) + public async Task> GetInfo(int id, LoginInDto loginInfo) { var entity = await _outStockTaskRepositories.Get(id); if (entity == null) @@ -466,6 +471,11 @@ namespace WMS.Web.Domain.Services if (customer_result.IsSuccess) customers = customer_result.Data.ToList(); + var materials_result = await _erpService.BillQueryForMaterial(); + List materials = new List(); + if (materials_result.IsSuccess) + materials = materials_result.Data.ToList(); + OutStockTaskInfoResponse response = new OutStockTaskInfoResponse() { Id = entity.Id, @@ -490,8 +500,12 @@ namespace WMS.Web.Domain.Services BoxBillNo = b.BoxId.ToString(), Qty = b.Qty, SerialNumbers = string.Join(",", b.SerialNumbers), - Method = outStock.Method.GetRemark() - + Method = outStock.Method.GetRemark(), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, outStock.CreatorId), + CreateTime = outStock.CreateTime.DateToStringSeconds(), + MaterialNumber = detail.MaterialNumber, + Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber), + AccruedQty = entity.Details.FirstOrDefault(f => f.MaterialNumber == detail.MaterialNumber)?.AccruedQty ?? 0 }; }