Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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;
@@ -39,8 +40,8 @@ public class PurchaseReturnNoteController : AbpController
     public PurchaseReturnNoteController(IPurchaseReturnNoteAppService noteAppService,
                                     IInventoryLabelAppService labelAppService,
                                     IBalanceAppService balanceAppService,
-                                     IPurchaseOrderAppService purchaseOrderAppService
-    )
+                                    IPurchaseOrderAppService purchaseOrderAppService
+                                    )
     {
         _noteAppService = noteAppService;
         this._labelAppService = labelAppService;
@@ -70,7 +71,6 @@ public class PurchaseReturnNoteController : AbpController
         //  await this.SetDetailPoNumberAsync(input.Details);
 
         var noteCreateInputs = await BuildNoteCreateInputsAsync(input, EnumPurchaseReturnType.BeforePuton).ConfigureAwait(false);
-
         foreach (var noteCreateInput in noteCreateInputs)
         {
             await _noteAppService.CreateAsync(noteCreateInput).ConfigureAwait(false);
@@ -141,7 +141,6 @@ public class PurchaseReturnNoteController : AbpController
 
             createInputs.Add(returnNoteEditInput);
         }
-
         return createInputs;
     }
     private async Task SetDetailByPoAsync(string poNumber, PurchaseReturnNoteDetailInput createInputDetail)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReturnNotes/PurchaseReturnNoteAppService.cs

@@ -15,7 +15,7 @@ using System.Linq.Expressions;
 using System.Threading;
 
 using Volo.Abp.Application.Dtos;
-
+using Volo.Abp.Users;
 using Win_in.Sfs.FileStorage.Application.Contracts;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
@@ -31,12 +31,17 @@ public class PurchaseReturnNoteAppService : SfsStoreWithDetailsAppServiceBase<Pu
 {
     private readonly IPurchaseReturnNoteManager _purchaseReturnNoteManager;
 
+    private readonly ICurrentUser _currentUser;
+
     public PurchaseReturnNoteAppService(
         IPurchaseReturnNoteRepository repository,
-        IPurchaseReturnNoteManager purchaseReturnNoteManager)
+        IPurchaseReturnNoteManager purchaseReturnNoteManager,
+        ICurrentUser currentUser
+        )
         : base(repository)
     {
         _purchaseReturnNoteManager = purchaseReturnNoteManager;
+        _currentUser = currentUser;
     }
 
     [HttpPost("confirm")]
@@ -66,6 +71,10 @@ public class PurchaseReturnNoteAppService : SfsStoreWithDetailsAppServiceBase<Pu
     public override async Task<PurchaseReturnNoteDTO> CreateAsync(PurchaseReturnNoteEditInput input)
     {
         var entity = ObjectMapper.Map<PurchaseReturnNoteEditInput, PurchaseReturnNote>(input);
+        if (entity.Worker.IsNullOrEmpty() && _currentUser != null)
+        {
+            entity.Worker = _currentUser.UserName;
+        }
         await _purchaseReturnNoteManager.CreateAsync(entity).ConfigureAwait(false);
 
         var dto = ObjectMapper.Map<PurchaseReturnNote, PurchaseReturnNoteDTO>(entity);