From 9eea18fd69d85873b59030a851e2e49ac369a97d Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 26 Apr 2024 15:07:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E9=80=80?= =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/UnplannedIssueNoteConverter.cs | 8 +++++++- .../Outgoing/UnplannedReceiptNoteConverter.cs | 7 ++++++- 2 files changed, 13 insertions(+), 2 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 01f33279a..78be52e0d 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 @@ -58,6 +58,12 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService) var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); var departmentCode = department == null ? "" : department.Code; var requset=await _unplannedIssueRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedIssueRequestNumber).ConfigureAwait(false); + string worker = requset?.Worker; + if (!string.IsNullOrEmpty(worker)) + { + worker = await _sfsUserAppService.GetUserNameByUserAsync(requset.Worker).ConfigureAwait(false); + } + //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) //{ // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); @@ -67,7 +73,7 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService) // } //} - var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, requset?.Worker); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, worker); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedIssue.ToString(), diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs index 6908c580b..f1e4db193 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs @@ -59,6 +59,11 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService ) var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); var departmentCode = department == null ? "" : department.Code; var requset = await _unplannedReceiptRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedReceiptRequestNumber).ConfigureAwait(false); + string worker = requset?.Worker; + if (!string.IsNullOrEmpty(worker)) + { + worker = await _sfsUserAppService.GetUserNameByUserAsync(requset.Worker).ConfigureAwait(false); + } //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) //{ // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); @@ -67,7 +72,7 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService ) // exchangeReceipt.Worker = username; // } //} - var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, requset?.Worker); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode, worker); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(),