From 38760ecbc33f4d3b1c456e34aeff34e4962244a8 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 22 May 2023 13:40:14 +0800
Subject: [PATCH] =?UTF-8?q?user=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=8C=89id=E8=8E=B7=E5=8F=96=E7=99=BB=E9=99=86=E8=B4=A6?=
=?UTF-8?q?=E6=88=B7=E5=90=8D=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Outgoing/UnplannedIssueNoteConverter.cs | 24 +++++++------------
...Wms.DataExchange.Application.Contracts.xml | 5 ++++
.../Users/ISfsUserAppService.cs | 1 +
.../Users/SfsUserAppService.cs | 11 +++++++++
4 files changed, 26 insertions(+), 15 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 a85ad87fe..b7cd69800 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,14 +2,9 @@ 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.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;
@@ -25,21 +20,20 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter
private readonly IOutgoingToExternalManager _outgoingToExternalManager;
private readonly IDepartmentAppService _departmentAppService;
private readonly IObjectMapper _objectMapper;
- private readonly IIdentityUserAppService identityUserAppService;
+ private readonly ISfsUserAppService _sfsUserAppService;
public UnplannedIssueNoteConverter(
IOutgoingFromWmsManager outgoingFromWmsManager
, IOutgoingToExternalManager outgoingToExternalManager
, IDepartmentAppService departmentAppService
, IObjectMapper objectMapper
-,
-IIdentityUserAppService identityUserAppService)
+ , ISfsUserAppService sfsUserAppService)
{
_outgoingFromWmsManager = outgoingFromWmsManager;
_outgoingToExternalManager = outgoingToExternalManager;
_departmentAppService = departmentAppService;
_objectMapper = objectMapper;
- this.identityUserAppService = identityUserAppService;
+ _sfsUserAppService = sfsUserAppService;
}
///
@@ -60,10 +54,10 @@ IIdentityUserAppService identityUserAppService)
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)
+ var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false);
+ if (string.IsNullOrEmpty(username))
{
- exchangeReceipt.Worker = user.UserName;
+ exchangeReceipt.Worker = username;
}
}
@@ -124,8 +118,8 @@ IIdentityUserAppService identityUserAppService)
///
///
///
- 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/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
index 35fdcdbee..55c669b1b 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
@@ -1631,6 +1631,11 @@
操作员
+
+
+ 创建人id
+
+
生效日期
diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/Users/ISfsUserAppService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/Users/ISfsUserAppService.cs
index 79a275705..63c0fbf78 100644
--- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/Users/ISfsUserAppService.cs
+++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application.Contracts/Users/ISfsUserAppService.cs
@@ -8,6 +8,7 @@ namespace Win_in.Sfs.Auth.Users;
public interface ISfsUserAppService : IApplicationService
{
+ Task GetUserNameById(Guid id);
Task UpdateByNmaeAsync(IdentityUserInputDto entity);
Task UpdateDepartmentCodeAsync(Guid id, string departmentCode);
diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Users/SfsUserAppService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Users/SfsUserAppService.cs
index 14ebda3ed..93c4d501f 100644
--- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Users/SfsUserAppService.cs
+++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Users/SfsUserAppService.cs
@@ -82,6 +82,17 @@ public class SfsUserAppService : ApplicationService, ISfsUserAppService
return userresult;
}
+ [HttpPost("get-username-by-id")]
+ public virtual async Task GetUserNameById(Guid id)
+ {
+ string username = "";
+ var user = await _userRepository.GetAsync(id).ConfigureAwait(false);
+ if (user != null)
+ {
+ username = user.UserName;
+ }
+ return username;
+ }
///
/// 修改密码