非生产领退料修改

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(),

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(),