From 618af1f89c0f07828f78625d7a22fbc3146f0b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 21 Nov 2024 16:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ITransferLibJobAppService.cs | 3 +++ .../ITransferLibRequestAppService.cs | 4 +++- .../AssembleIssueJobAppService.cs | 12 ++++++++++- .../CoatingIssueJobAppService.cs | 12 ++++++++++- .../InjectionIssueJobAppService.cs | 10 +++++++++- .../KittingIssueJobAppService.cs | 14 ++++++++++++- .../SparePartIssueJobAppService.cs | 13 ++++++++++-- .../TransferLibJobAppService.cs | 20 +++++++++++++++++++ .../TransferLibRequestAppService.cs | 15 ++++++++++++++ 9 files changed, 96 insertions(+), 7 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/ITransferLibJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/ITransferLibJobAppService.cs index b023b698b..ceda17d92 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/ITransferLibJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/ITransferLibJobAppService.cs @@ -8,4 +8,7 @@ public interface ITransferLibJobAppService { Task> GetByRequestNumberAsync(string requestNumber); Task CompleteByRequestAsync(string requestNumber); + + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs index db7325e20..eb66dac2f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs @@ -22,5 +22,7 @@ public interface ITransferLibRequestAppService Task CompleteByCallRequestNumberAsync(string callRequestNumber); Task CompleteByJobNumAsync(string jobNumber); - + + Task IsCompleted(string jobNumber); + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index c3ca6d964..34e0d837f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -873,10 +873,20 @@ public class AssembleIssueJobAppService //await _expectOutAppService.RemoveByNumberAsync(assembleIssueJob.Number).ConfigureAwait(false); + + + await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByJobNumAsync(assembleIssueJob.Number).ConfigureAwait(false); + var flag=await _transferLibRequestAppService.IsCompleted(assembleIssueJob.Number).ConfigureAwait(false); + if (flag==false) + { + await _transferLibRequestAppService.CompleteByJobNumAsync(assembleIssueJob.Number).ConfigureAwait(false); + + } + + diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index 17e8eb4f6..ca2cc0e21 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -693,7 +693,17 @@ public class CoatingIssueJobAppService await CoatingIssueRequestAppService.UpdateStatusCompletedAsync(coatingIssueJob.CoatingRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByJobNumAsync(coatingIssueJob.Number).ConfigureAwait(false); + // await _transferLibRequestAppService.CompleteByJobNumAsync(coatingIssueJob.Number).ConfigureAwait(false); + + var flag = await _transferLibRequestAppService.IsCompleted(coatingIssueJob.Number).ConfigureAwait(false); + if (flag == false) + { + await _transferLibRequestAppService.CompleteByJobNumAsync(coatingIssueJob.Number).ConfigureAwait(false); + + } + + + await Task.CompletedTask.ConfigureAwait(false); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index 2eaff6b37..4dfa06640 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -640,7 +640,15 @@ public class InjectionIssueJobAppService await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByJobNumAsync(injectionIssueJob.Number).ConfigureAwait(false); + + + var flag = await _transferLibRequestAppService.IsCompleted(injectionIssueJob.Number).ConfigureAwait(false); + if (flag == false) + { + await _transferLibRequestAppService.CompleteByJobNumAsync(injectionIssueJob.Number).ConfigureAwait(false); + + } + await Task.CompletedTask.ConfigureAwait(false); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index 76cae4b3c..479722a50 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -652,7 +652,19 @@ public class KittingIssueJobAppService await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber,kittingIssueJob.Number) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number).ConfigureAwait(false); + + + var flag = await _transferLibRequestAppService.IsCompleted(kittingIssueJob.Number).ConfigureAwait(false); + if (flag == false) + { + await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number).ConfigureAwait(false); + + } + + + + + // await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number).ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index fd5393a13..5fd070e75 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -628,8 +628,17 @@ public class SparePartIssueJobAppService //await _expectOutAppService.RemoveByNumberAsync(sparePartIssueJob.Number).ConfigureAwait(false); - await SparePartIssueRequestAppService.UpdateStatusCompletedAsync(sparePartIssueJob.SparePartRequestNumber) - .ConfigureAwait(false); + + var flag = await _transferLibRequestAppService.IsCompleted(sparePartIssueJob.Number).ConfigureAwait(false); + if (flag == false) + { + await _transferLibRequestAppService.CompleteByJobNumAsync(sparePartIssueJob.Number).ConfigureAwait(false); + + } + + + //await SparePartIssueRequestAppService.UpdateStatusCompletedAsync(sparePartIssueJob.SparePartRequestNumber) + // .ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs index edeb8f883..b0cfd8036 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs @@ -299,6 +299,26 @@ public class TransferLibJobAppService return ObjectMapper.Map, List>(list); } + + [HttpPost("get-by-job/Id")] + [UnitOfWork] + public async Task IsCompleted(string jobNumber) + { + var list = await _repository.GetListAsync(p => p.JobNumber == jobNumber).ConfigureAwait(false); + if (list.Count > 0) + { + return true; + } + return false; + + + } + + + + + + public override async Task CancelAcceptAsync(Guid id) { var job = await _repository.FindAsync(p => p.Id == id).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs index 3d050816d..6f15c7508 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs @@ -493,4 +493,19 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase protected void ChecktQty(TransferLibRequestImportInput importInput, List validationRresult) { } + + public async Task IsCompleted(string jobNumber) + { + var list = await _repository.GetListAsync(p => p.CallJobNumber == jobNumber).ConfigureAwait(false); + if (list.Count > 0) + { + var entity=list.FirstOrDefault(); + if (entity.RequestStatus == EnumRequestStatus.Completed) + { + return true; + } + } + return false; + + } }