From 766b90289563b534cfe25e2ccd920f9991ec8393 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Thu, 2 Nov 2023 10:15:45 +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=99=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/UnplannedIssueNoteConverter.cs | 26 +++++++++---------- .../Outgoing/UnplannedReceiptNoteConverter.cs | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 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 38d444074..4661aeabc 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 @@ -52,18 +52,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); 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 username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); - if (!string.IsNullOrEmpty(username)) - { - exchangeReceipt.Worker = username; - } - } + 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 username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); + // if (!string.IsNullOrEmpty(username)) + // { + // exchangeReceipt.Worker = username; + // } + //} - var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedIssue.ToString(), @@ -123,7 +123,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber) + private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode) { var ret = new Wmsoutm() { @@ -133,7 +133,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", wmsoutm_user = exchangeOrder.Worker.Length >= 6 ? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length- 6) : exchangeOrder.Worker, - wmsoutm_dept = "",//根据Worker从UserDepartment中获取 + wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取 // wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"), wmsoutm_cust = "", 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 5688104f2..a448047c5 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 @@ -53,17 +53,17 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); 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 username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); - if (!string.IsNullOrEmpty(username)) - { - exchangeReceipt.Worker = username; - } - } - var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); + 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 username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); + // if (!string.IsNullOrEmpty(username)) + // { + // exchangeReceipt.Worker = username; + // } + //} + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber, departmentCode); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(), @@ -123,7 +123,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber) + private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode) { var ret = new Wmsoutm() @@ -134,7 +134,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter wmsoutm_stat = "Y", wmsoutm_tyrp_dt = "", wmsoutm_user = exchangeOrder.Worker.Length>=6? exchangeOrder.Worker.Substring(exchangeOrder.Worker.Length-6) : exchangeOrder.Worker, - wmsoutm_dept = "",//根据Worker从UserDepartment中获取 + wmsoutm_dept = departmentCode,//根据Worker从UserDepartment中获取 //wmsoutm_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), wmsoutm_date = DateTime.Now.ToString("yyyyMMdd"), wmsoutm_cust = "",