From 69d0d62ec2fbab9aed07b21761ac292ad86f6d04 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 19 May 2023 17:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E9=80=80=E6=96=99user=E4=BC=A0=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Outgoing/UnplannedIssueNoteConverter.cs   | 25 ++++++++++++++++---
 .../UnplannedIssueNoteExchangeDto.cs          |  5 ++++
 2 files changed, 26 insertions(+), 4 deletions(-)

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;
     }
 
     /// <summary>
@@ -49,6 +58,15 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
             var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(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
     /// </summary>
     /// <param name="exchangeOrder"></param>
     /// <returns></returns>
-    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
     /// 操作员
     /// </summary>
     public string Worker { get; set; }
+    /// <summary>
+    /// 创建人id
+    /// </summary>
+
+    public Guid? CreatorId { get; set; }
 
     /// <summary>
     /// 生效日期