From 68a6cc912edf2ce5ef7eebba24d2b4a71905220e Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Mon, 1 Jul 2024 08:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=89=8D=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=20.=C2=A0=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Stores/PurchaseReturnNoteController.cs          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs
index 988c531e5..ef49614cd 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Users;
 using Win_in.Sfs.Label.Application.Contracts;
 using Win_in.Sfs.Label.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -30,6 +31,7 @@ public class PurchaseReturnNoteController : AbpController
 
     private readonly IBalanceAppService _balanceAppService;
     private readonly IPurchaseOrderAppService _purchaseOrderAppService;
+    private readonly ICurrentUser _currentUser;
     /// <summary>
     ///
     /// </summary>
@@ -39,13 +41,14 @@ public class PurchaseReturnNoteController : AbpController
     public PurchaseReturnNoteController(IPurchaseReturnNoteAppService noteAppService,
                                     IInventoryLabelAppService labelAppService,
                                     IBalanceAppService balanceAppService,
-                                     IPurchaseOrderAppService purchaseOrderAppService
-    )
+                                     IPurchaseOrderAppService purchaseOrderAppService,
+                                     ICurrentUser currentUser)
     {
         _noteAppService = noteAppService;
         this._labelAppService = labelAppService;
         this._balanceAppService = balanceAppService;
         _purchaseOrderAppService = purchaseOrderAppService;
+        _currentUser = currentUser;
     }
 
     /// <summary>
@@ -70,9 +73,12 @@ public class PurchaseReturnNoteController : AbpController
         //  await this.SetDetailPoNumberAsync(input.Details);
 
         var noteCreateInputs = await BuildNoteCreateInputsAsync(input, EnumPurchaseReturnType.BeforePuton).ConfigureAwait(false);
-
         foreach (var noteCreateInput in noteCreateInputs)
         {
+            if (noteCreateInput.Worker.IsNullOrEmpty())
+            {
+                noteCreateInput.Worker = _currentUser.UserName;
+            }
             await _noteAppService.CreateAsync(noteCreateInput).ConfigureAwait(false);
         }
 
@@ -141,7 +147,6 @@ public class PurchaseReturnNoteController : AbpController
 
             createInputs.Add(returnNoteEditInput);
         }
-
         return createInputs;
     }
     private async Task SetDetailByPoAsync(string poNumber, PurchaseReturnNoteDetailInput createInputDetail)