From 7f2df1fb4066ddc7fe6c37d1dc1b7bdf2a2525a6 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 11:49:06 +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 --- .../DTOs/UnplannedIssueNoteDTO.cs | 4 ++++ .../Inputs/UnplannedIssueNoteEditInput.cs | 3 +++ .../DTOs/UnplannedReceiptNoteDTO.cs | 3 +++ .../Inputs/UnplannedReceiptNoteEditInput.cs | 7 +++++++ .../UnplannedIssueNoteAppService.cs | 20 ++++++------------- .../UnplannedReceiptNoteAppService.cs | 2 +- .../UnplannedIssueNotes/UnplannedIssueNote.cs | 11 ++++++++++ .../UnplannedReceiptNote.cs | 4 ++++ 8 files changed, 39 insertions(+), 15 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs index a73a4e9c4..c03436a42 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs @@ -118,4 +118,8 @@ public class UnplannedIssueNoteDTO : SfsStoreDTOBase [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + + [Display(Name = "执行人")] + public string Executor { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs index 568b28b4e..64814aba1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs @@ -140,6 +140,9 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + [Display(Name = "执行人")] + public string Executor { get; set; } + diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs index 20743c67b..1d8196589 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs @@ -117,4 +117,7 @@ public class UnplannedReceiptNoteDTO : SfsStoreDTOBase [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + + [Display(Name = "执行人")] + public string Executor { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs index f74d511e7..41f546b8e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs @@ -139,4 +139,11 @@ public class UnplannedReceiptNoteEditInput : SfsStoreCreateOrUpdateInputBase /// [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + + [Display(Name = "执行人")] + public string Executor { get; set; } + + + + } 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 0c9005c33..fdb882607 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 @@ -48,30 +48,22 @@ public class UnplannedIssueNoteAppService : entity.ItemDesc1=input.ItemDesc1; entity.ItemDesc2=input.ItemDesc2; entity.ItemName = input.ItemName; - entity.FromErpLocationCode = input.FromErpLocationCode; - - - - + entity.FromErpLocationCode = input.FromErpLocationCode; var request= await _unplannedIssueRequestManager.GetByNumberAsync(input.UnplannedIssueRequestNumber).ConfigureAwait(false); - - - - - + var userName = request.Worker; + entity.Worker = userName; + entity.Executor = input.Worker; entity.Details = new List(); foreach (var inputDetail in input.Details) { var detail = ObjectMapper.Map(inputDetail); - detail.ExtraProperties = inputDetail.ExtraProperties; - entity.Details.Add(detail); //2023-10-20 袁静雯要求修改计划外出入库 Worker为userName - var userName = request.Worker; + //await _userAppService.GetUserNameByUserAsync(input.Worker).ConfigureAwait(false); - entity.Worker = userName; + } await _unplannedIssueNoteManager.CreateAsync(entity).ConfigureAwait(false); 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 b53b2aa5e..aea13ba28 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 @@ -48,7 +48,7 @@ public class UnplannedReceiptNoteAppService : entity.Details = new List(); var receipt= await _unplannedReceiptRequestManager.GetByNumberAsync(input.UnplannedReceiptRequestNumber).ConfigureAwait(false); entity.Worker = receipt.Worker; - + entity.Executor = input.Worker; foreach (var inputDetail in input.Details) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs index edb326ec1..d641b2126 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs @@ -127,4 +127,15 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + + + /// + /// 是否有箱码 + /// + [Display(Name = "执行人")] + public string Executor { get; set; } + + + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs index 48be95781..94b7884dc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs @@ -127,4 +127,8 @@ public class UnplannedReceiptNote : SfsStoreAggregateRootBase [Display(Name = "是否有箱码")] public int IsHasPackingCode { get; set; } + + + [Display(Name = "执行人")] + public string Executor { get; set; } }