From 3c5c0f9409c55fec75f0dda9cc1e3ea2ceefaf9e Mon Sep 17 00:00:00 2001 From: Zheng Date: Fri, 7 Jun 2024 13:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B2=A1=E6=9C=89=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssembleIssueRequestManager.cs | 8 ++++++-- .../CoatingIssueRequestManager.cs | 8 ++++++-- .../InjectionIssueRequestManager.cs | 8 ++++++-- .../KittingIssueRequests/KittingIssueRequestManager.cs | 10 ++++++++-- .../SparePartIssueRequestManager.cs | 7 +++++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestManager.cs index a9adfe5ee..8ac47efbc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestManager.cs @@ -36,9 +36,10 @@ public class AssembleIssueRequestManager entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; + await _repository.InsertAsync(entity).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false) .ConfigureAwait(false); - await _repository.InsertAsync(entity).ConfigureAwait(false); + return entity; } @@ -58,6 +59,9 @@ public class AssembleIssueRequestManager public virtual async Task UpdateByEntityAsync(AssembleIssueRequest request) { - return await _repository.UpdateAsync(request).ConfigureAwait(false); + await Task.CompletedTask.ConfigureAwait(false); + var entity = await _repository.GetAsync(request.Id).ConfigureAwait(false); + entity.Details = request.Details; + return await _repository.UpdateAsync(entity, true).ConfigureAwait(false); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs index f9cb23eeb..9c4c47cc6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs @@ -33,9 +33,10 @@ public class CoatingIssueRequestManager entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; + await _repository.InsertAsync(entity).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false) .ConfigureAwait(false); - await _repository.InsertAsync(entity).ConfigureAwait(false); + return entity; } @@ -55,6 +56,9 @@ public class CoatingIssueRequestManager public virtual async Task UpdateByEntityAsync(CoatingIssueRequest request) { - return await _repository.UpdateAsync(request).ConfigureAwait(false); + await Task.CompletedTask.ConfigureAwait(false); + var entity = await _repository.GetAsync(request.Id).ConfigureAwait(false); + entity.Details = request.Details; + return await _repository.UpdateAsync(entity, true).ConfigureAwait(false); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs index 8e36276d3..1028f74b3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs @@ -33,9 +33,10 @@ public class InjectionIssueRequestManager entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; + await _repository.InsertAsync(entity).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false) .ConfigureAwait(false); - await _repository.InsertAsync(entity).ConfigureAwait(false); + return entity; } @@ -55,6 +56,9 @@ public class InjectionIssueRequestManager public virtual async Task UpdateByEntityAsync(InjectionIssueRequest request) { - return await _repository.UpdateAsync(request).ConfigureAwait(false); + await Task.CompletedTask.ConfigureAwait(false); + var entity = await _repository.GetAsync(request.Id).ConfigureAwait(false); + entity.Details = request.Details; + return await _repository.UpdateAsync(entity, true).ConfigureAwait(false); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestManager.cs index dd7aaea26..d497a3af0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestManager.cs @@ -6,6 +6,8 @@ using Win_in.Sfs.Shared.Event; namespace Win_in.Sfs.Wms.Store.Domain; +using Volo.Abp.Uow; + public class KittingIssueRequestManager : SfsStoreRequestManagerBase , IKittingIssueRequestManager @@ -33,9 +35,10 @@ public class KittingIssueRequestManager entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; + await _repository.InsertAsync(entity,true).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity),false) .ConfigureAwait(false); - await _repository.InsertAsync(entity).ConfigureAwait(false); + return entity; } @@ -55,6 +58,9 @@ public class KittingIssueRequestManager public virtual async Task UpdateByEntityAsync(KittingIssueRequest request) { - return await _repository.UpdateAsync(request).ConfigureAwait(false); + await Task.CompletedTask.ConfigureAwait(false); + var entity=await _repository.GetAsync(request.Id).ConfigureAwait(false); + entity.Details = request.Details; + return await _repository.UpdateAsync(entity,true).ConfigureAwait(false); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestManager.cs index f9620dc71..c835fe79b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/SparePartIssueRequests/SparePartIssueRequestManager.cs @@ -33,9 +33,9 @@ public class SparePartIssueRequestManager entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; + await _repository.InsertAsync(entity).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity),false) .ConfigureAwait(false); - await _repository.InsertAsync(entity).ConfigureAwait(false); return entity; } @@ -55,6 +55,9 @@ public class SparePartIssueRequestManager public virtual async Task UpdateByEntityAsync(SparePartIssueRequest request) { - return await _repository.UpdateAsync(request).ConfigureAwait(false); + await Task.CompletedTask.ConfigureAwait(false); + var entity = await _repository.GetAsync(request.Id).ConfigureAwait(false); + entity.Details = request.Details; + return await _repository.UpdateAsync(entity, true).ConfigureAwait(false); } }