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 5edd2ff82..c3ca6d964 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 @@ -135,8 +135,11 @@ public class AssembleIssueJobAppService assembleJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(assembleJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.Number) - .ConfigureAwait(false); + //await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.Number) + // .ConfigureAwait(false); + + await _transferLibRequestAppService.CompleteByJobNumAsync(assembleJob.Number) + .ConfigureAwait(false); assembleJob.JobStatus = EnumJobStatus.Cancelled; await _repository.UpdateAsync(assembleJob).ConfigureAwait(false); @@ -377,7 +380,7 @@ public class AssembleIssueJobAppService await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number) + await _transferLibRequestAppService.CompleteByJobNumAsync(assembleIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(assembleIssueJob).ConfigureAwait(false); @@ -399,7 +402,7 @@ public class AssembleIssueJobAppService assembleIssueJob.JobStatus = EnumJobStatus.Done; await _repository.UpdateAsync(assembleIssueJob).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(assembleIssueJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number) + 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 e1c07dd37..0c29e3a20 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 @@ -299,7 +299,7 @@ public class CoatingIssueJobAppService await CoatingIssueRequestAppService.UpdateStatusCompletedAsync(coatingIssueJob.CoatingRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(coatingIssueJob.CoatingRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(coatingIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(coatingIssueJob).ConfigureAwait(false); @@ -321,7 +321,7 @@ public class CoatingIssueJobAppService coatingIssueJob.JobStatus = EnumJobStatus.Done; await _repository.UpdateAsync(coatingIssueJob).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(coatingIssueJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(coatingIssueJob.CoatingRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(coatingIssueJob.Number) .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 d45994af6..aba801c3d 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 @@ -276,7 +276,7 @@ public class InjectionIssueJobAppService await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(injectionIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(injectionIssueJob).ConfigureAwait(false); @@ -298,7 +298,7 @@ public class InjectionIssueJobAppService injectionIssueJob.JobStatus = EnumJobStatus.Done; await _repository.UpdateAsync(injectionIssueJob).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(injectionIssueJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallReuestNumberAsync(injectionIssueJob.InjectionRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(injectionIssueJob.Number) .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 36e00dbef..e6982c258 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 @@ -283,7 +283,7 @@ public class KittingIssueJobAppService await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber, kittingIssueJob.Number) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber) + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber) .ConfigureAwait(false); await _repository.UpdateAsync(kittingIssueJob).ConfigureAwait(false); @@ -305,7 +305,7 @@ public class KittingIssueJobAppService kittingIssueJob.JobStatus = EnumJobStatus.Done; await _repository.UpdateAsync(kittingIssueJob).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number) .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 f481bddf1..6d799fcdb 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 @@ -277,7 +277,7 @@ public class SparePartIssueJobAppService await SparePartIssueRequestAppService.UpdateStatusCompletedAsync(sparePartIssueJob.SparePartRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(sparePartIssueJob.SparePartRequestNumber) + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(sparePartIssueJob.SparePartRequestNumber) .ConfigureAwait(false); await _repository.UpdateAsync(sparePartIssueJob).ConfigureAwait(false); @@ -299,7 +299,7 @@ public class SparePartIssueJobAppService sparePartIssueJob.JobStatus = EnumJobStatus.Done; await _repository.UpdateAsync(sparePartIssueJob).ConfigureAwait(false); await _expectOutAppService.RemoveByNumberAsync(sparePartIssueJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(sparePartIssueJob.SparePartRequestNumber) + await _transferLibRequestAppService.CompleteByJobNumAsync(sparePartIssueJob.Number) .ConfigureAwait(false); } }