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 0c29e3a20..17e8eb4f6 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 @@ -125,8 +125,7 @@ public class CoatingIssueJobAppService coatingJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(coatingJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(coatingJob.CoatingRequestNumber) - .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByJobNumAsync(coatingJob.Number).ConfigureAwait(false); coatingJob.JobStatus = EnumJobStatus.Cancelled; await _repository.UpdateAsync(coatingJob).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 aba801c3d..2eaff6b37 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 @@ -117,8 +117,8 @@ public class InjectionIssueJobAppService injectionJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(injectionJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(injectionJob.InjectionRequestNumber) - .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByJobNumAsync(injectionJob.Number).ConfigureAwait(false); + injectionJob.JobStatus = EnumJobStatus.Cancelled; await _repository.UpdateAsync(injectionJob).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 e6982c258..76cae4b3c 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 @@ -125,7 +125,7 @@ public class KittingIssueJobAppService kittingJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(kittingJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(kittingJob.KittingRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(kittingJob.KittingRequestNumber) .ConfigureAwait(false); kittingJob.JobStatus = EnumJobStatus.Cancelled; @@ -283,7 +283,7 @@ public class KittingIssueJobAppService await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber, kittingIssueJob.Number) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(kittingIssueJob).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 6d799fcdb..fd5393a13 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 @@ -118,7 +118,7 @@ public class SparePartIssueJobAppService sparePartJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(sparePartJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(sparePartJob.SparePartRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(sparePartJob.SparePartRequestNumber) .ConfigureAwait(false); sparePartJob.JobStatus = EnumJobStatus.Cancelled; @@ -277,7 +277,7 @@ public class SparePartIssueJobAppService await SparePartIssueRequestAppService.UpdateStatusCompletedAsync(sparePartIssueJob.SparePartRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(sparePartIssueJob.SparePartRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(sparePartIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(sparePartIssueJob).ConfigureAwait(false); @@ -631,6 +631,8 @@ public class SparePartIssueJobAppService await SparePartIssueRequestAppService.UpdateStatusCompletedAsync(sparePartIssueJob.SparePartRequestNumber) .ConfigureAwait(false); + + await Task.CompletedTask.ConfigureAwait(false); }