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 a07c26d02..6e09ce488 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 @@ -55,8 +55,14 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService) #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(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 requset = await _unplannedIssueRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedIssueRequestNumber).ConfigureAwait(false); string worker = requset?.Worker; if (!string.IsNullOrEmpty(worker)) 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 9286c791f..8135a0f4a 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,10 +59,16 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(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 requset = await _unplannedReceiptRequestAppService.GetByNumberAsync(exchangeReceipt.UnplannedReceiptRequestNumber).ConfigureAwait(false); string worker = requset?.Worker; + + + if (!string.IsNullOrEmpty(worker)) { worker = await _sfsUserAppService.GetUserNameByUserAsync(requset.Worker).ConfigureAwait(false); diff --git a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Departments/DepartmentAppService.cs b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Departments/DepartmentAppService.cs index 7633ed318..feef0c494 100644 --- a/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Departments/DepartmentAppService.cs +++ b/be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Application/Departments/DepartmentAppService.cs @@ -57,6 +57,12 @@ public class DepartmentAppService return deptDto; } + + + + + + [AllowAnonymous] [HttpGet("by-userid")] diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index cc56a22ca..6914511ee 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -185,11 +185,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA request.DeptName = first.DeptName; request.BuildDate = DateTime.Now; request.OANumber = first.OANumber; - - - - - + //request.Worker = first.Worker; await SetEntityPropertiesAsync(request).ConfigureAwait(false); List detailList = new List(); @@ -217,12 +213,12 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA request.Details = detailList; - var user = await _sfsUserAppService.FindUserByUserNameAsync(first.Worker).ConfigureAwait(false); - if (string.IsNullOrEmpty(user)) - { - throw new UserFriendlyException("没有查到用户"); - } - request.Worker = user; + //var user = await _sfsUserAppService.FindUserByUserNameAsync(first.Worker).ConfigureAwait(false); + //if (string.IsNullOrEmpty(user)) + //{ + // throw new UserFriendlyException("没有查到用户"); + //} + request.Worker = first.Worker; @@ -376,7 +372,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA unplannedReceiptRequest.AutoHandle = true; unplannedReceiptRequest.DirectCreateNote = false; unplannedReceiptRequest.BuildDate = DateTime.Now; - unplannedReceiptRequest.Worker = CurrentUser.GetName(); + foreach (var detail in unplannedReceiptRequest.Details) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs index 028d16598..0b744a78e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs @@ -78,12 +78,13 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ entity.AutoAgree = true; entity.AutoHandle = true; entity.DirectCreateNote = false; - var user = await _sfsUserAppService.FindUserByUserNameAsync(input.Worker).ConfigureAwait(false); - if (string.IsNullOrEmpty(user)) - { - throw new UserFriendlyException("没有查到用户"); - } - entity.Worker = user; + entity.Worker = input.Worker; + //var user = await _sfsUserAppService.FindUserByUserNameAsync(input.Worker).ConfigureAwait(false); + //if (string.IsNullOrEmpty(user)) + //{ + // throw new UserFriendlyException("没有查到用户"); + //} + //entity.Worker = user; //var userEntity = await _userRepository.FindByNormalizedUserNameAsync(input.Worker).ConfigureAwait(false); //if (userEntity == null) //{