From 6c3c6edd3624ddd83edc35e5a91b981875d7dce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Fri, 8 Nov 2024 10:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnplannedIssueNoteAppService.cs              | 16 ++++++++++++++--
 .../UnplannedReceiptNoteAppService.cs            |  9 ++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedIssuesNotes/UnplannedIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedIssuesNotes/UnplannedIssueNoteAppService.cs
index 0c6db34a7..0c9005c33 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedIssuesNotes/UnplannedIssueNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedIssuesNotes/UnplannedIssueNoteAppService.cs
@@ -27,11 +27,14 @@ public class UnplannedIssueNoteAppService :
     private readonly IUnplannedIssueNoteManager _unplannedIssueNoteManager;
     private readonly ISfsUserAppService _userAppService;
 
+    private readonly IUnplannedIssueRequestManager _unplannedIssueRequestManager;
+
     public UnplannedIssueNoteAppService(IUnplannedIssueNoteRepository repository,
-        IUnplannedIssueNoteManager unplannedIssueNoteManager, ISfsUserAppService userAppService) : base(repository)
+        IUnplannedIssueNoteManager unplannedIssueNoteManager, ISfsUserAppService userAppService, IUnplannedIssueRequestManager unplannedIssueRequestManager) : base(repository)
     {
         _unplannedIssueNoteManager = unplannedIssueNoteManager;
         _userAppService = userAppService;
+        _unplannedIssueRequestManager = unplannedIssueRequestManager;
     }
 
     [HttpPost("")]
@@ -47,6 +50,15 @@ public class UnplannedIssueNoteAppService :
         entity.ItemName = input.ItemName;
         entity.FromErpLocationCode = input.FromErpLocationCode;
 
+
+
+       
+        var request=  await _unplannedIssueRequestManager.GetByNumberAsync(input.UnplannedIssueRequestNumber).ConfigureAwait(false);
+
+
+
+
+
         entity.Details = new List<UnplannedIssueNoteDetail>();
 
         foreach (var inputDetail in input.Details)
@@ -57,7 +69,7 @@ public class UnplannedIssueNoteAppService :
 
             entity.Details.Add(detail);
             //2023-10-20 袁静雯要求修改计划外出入库 Worker为userName
-            var userName = input.Worker;
+            var userName = request.Worker;
                 //await _userAppService.GetUserNameByUserAsync(input.Worker).ConfigureAwait(false);
             entity.Worker = userName;
         }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteAppService.cs
index e9c9e4f37..b53b2aa5e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteAppService.cs
@@ -23,16 +23,20 @@ public class UnplannedReceiptNoteAppService :
     SfsStoreWithDetailsAppServiceBase<UnplannedReceiptNote, UnplannedReceiptNoteDTO, SfsStoreRequestInputBase, UnplannedReceiptNoteEditInput,
         UnplannedReceiptNoteDetail, UnplannedReceiptNoteDetailDTO, SfsStoreRequestInputBase, UnplannedReceiptNoteImportInput>,
     IUnplannedReceiptNoteAppService
+
 {
     private readonly IUnplannedReceiptNoteManager _unplannedReceiptNoteManager;
     private readonly ISfsUserAppService _userAppService;
+    private readonly IUnplannedReceiptRequestManager _unplannedReceiptRequestManager;
 
     public UnplannedReceiptNoteAppService(IUnplannedReceiptNoteRepository repository,
         IUnplannedReceiptNoteManager unplannedReceiptNoteManager,
+        IUnplannedReceiptRequestManager unplannedReceiptRequestManager,
         ISfsUserAppService userAppService) : base(repository)
     {
         _unplannedReceiptNoteManager = unplannedReceiptNoteManager;
         _userAppService = userAppService;
+        _unplannedReceiptRequestManager = unplannedReceiptRequestManager;
     }
 
     [HttpPost("")]
@@ -42,6 +46,9 @@ public class UnplannedReceiptNoteAppService :
         var entity = ObjectMapper.Map<UnplannedReceiptNoteEditInput, UnplannedReceiptNote>(input);
 
         entity.Details = new List<UnplannedReceiptNoteDetail>();
+        var receipt=  await _unplannedReceiptRequestManager.GetByNumberAsync(input.UnplannedReceiptRequestNumber).ConfigureAwait(false);
+        entity.Worker = receipt.Worker;
+
 
         foreach (var inputDetail in input.Details)
         {
@@ -49,7 +56,7 @@ public class UnplannedReceiptNoteAppService :
 
             detail.ExtraProperties = inputDetail.ExtraProperties;
 
-            var userName = await _userAppService.GetUserNameByUserAsync(input.Worker).ConfigureAwait(false);
+           // var userName = await _userAppService.GetUserNameByUserAsync(input.Worker).ConfigureAwait(false);
             entity.Details.Add(detail);
         }