From dad84b72d7363739bb6423f02ea60439ac8e89c7 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 17 Apr 2025 17:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7tyrep?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0worker=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Outgoing/CustomerReturnNoteConverter.cs               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs
index 5c362a725..9fed08a83 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/CustomerReturnNoteConverter.cs
@@ -5,6 +5,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Auth.Application.Contracts;
+using Win_in.Sfs.Auth.Users;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
 using Win_in.Sfs.Wms.DataExchange.Domain.Shared;
@@ -20,18 +21,21 @@ public class CustomerReturnNoteConverter : IOutgoingConverter
     private readonly IOutgoingToExternalManager _outgoingToExternalManager;
     private readonly IDepartmentAppService _departmentAppService;
     private readonly IObjectMapper _objectMapper;
+    private readonly ISfsUserAppService _sfsUserAppService;
 
     public CustomerReturnNoteConverter(
         IOutgoingFromWmsManager outgoingFromWmsManager
         , IOutgoingToExternalManager outgoingToExternalManager
           , IDepartmentAppService departmentAppService
         , IObjectMapper objectMapper
+        , ISfsUserAppService sfsUserAppService
     )
     {
         _outgoingFromWmsManager = outgoingFromWmsManager;
         _outgoingToExternalManager = outgoingToExternalManager;
         _departmentAppService = departmentAppService;
         _objectMapper = objectMapper;
+        _sfsUserAppService = sfsUserAppService;
     }
 
     /// <summary>
@@ -49,7 +53,9 @@ public class CustomerReturnNoteConverter : IOutgoingConverter
             #region 主表
             var wmsReceipt = JsonSerializer.Deserialize<CustomerReturnNoteDTO>(outgoingFromWms.DataContent);
             var exchangeReceipt = _objectMapper.Map<CustomerReturnNoteDTO, CustomerReturnNoteExchangeDto>(wmsReceipt);
-            var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
+            var username = await _sfsUserAppService.GetUserNameByUserAsync(exchangeReceipt.Worker).ConfigureAwait(false);
+
+            var department = await _departmentAppService.GetByUsernameAsync(username).ConfigureAwait(false);
             var departmentCode = department == null ? "" : department.Code;
             var purchaseOrder = BuildDataInterface(exchangeReceipt, departmentCode,tyrpNumber);
             var outgoingToExternal = new OutgoingToExternal()