更新

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs

@@ -55,8 +55,14 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService)
             #region 主表
             var wmsReceipt = JsonSerializer.Deserialize<UnplannedIssueNoteDTO>(outgoingFromWms.DataContent);
             var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(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))

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs

@@ -59,10 +59,16 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService
             #region 主表
             var wmsReceipt = JsonSerializer.Deserialize<UnplannedReceiptNoteDTO>(outgoingFromWms.DataContent);
             var exchangeReceipt = _objectMapper.Map<UnplannedReceiptNoteDTO, UnplannedReceiptNoteExchangeDto>(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);

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")]

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<UnplannedIssueRequestDetail> detailList = new List<UnplannedIssueRequestDetail>();
@@ -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)

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)
         //{