diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs index 0f55e3a69..729511aad 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs @@ -2,7 +2,13 @@ using System; using System.Collections.Generic; using System.Text.Json; using System.Threading.Tasks; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Presentation; +using Microsoft.AspNetCore.Identity; +using Nito.AsyncEx; +using Volo.Abp.Identity; using Volo.Abp.ObjectMapping; +using Volo.Abp.Users; using Win_in.Sfs.Auth.Application.Contracts; using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; @@ -19,18 +25,21 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter private readonly IOutgoingToExternalManager _outgoingToExternalManager; private readonly IDepartmentAppService _departmentAppService; private readonly IObjectMapper _objectMapper; + private readonly IIdentityUserAppService identityUserAppService; public UnplannedIssueNoteConverter( IOutgoingFromWmsManager outgoingFromWmsManager , IOutgoingToExternalManager outgoingToExternalManager , IDepartmentAppService departmentAppService , IObjectMapper objectMapper - ) +, +IIdentityUserAppService identityUserAppService) { _outgoingFromWmsManager = outgoingFromWmsManager; _outgoingToExternalManager = outgoingToExternalManager; _departmentAppService = departmentAppService; _objectMapper = objectMapper; + this.identityUserAppService = identityUserAppService; } /// @@ -49,6 +58,15 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter var exchangeReceipt = _objectMapper.Map(wmsReceipt); var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); var departmentCode = department == null ? "" : department.Code; + if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) + { + var user = await identityUserAppService.GetAsync(guid).ConfigureAwait(false); + if(user != null) + { + exchangeReceipt.Worker = user.Name; + } + } + var purchaseOrder = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { @@ -106,9 +124,8 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder) - { - + private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder) + { var ret = new Wmsoutm() { wmsoutm_nbr = exchangeOrder.Number, diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs index ceb327b31..d13480533 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs @@ -12,6 +12,11 @@ public class UnplannedIssueNoteExchangeDto /// 操作员 /// public string Worker { get; set; } + /// + /// 创建人id + /// + + public Guid? CreatorId { get; set; } /// /// 生效日期