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 f47fc6aea..5edd2ff82 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 @@ -745,12 +745,12 @@ public class AssembleIssueJobAppService if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) { - input.JobStatus = EnumJobStatus.Open; + input.JobStatus = EnumJobStatus.Wait; } else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) { - input.JobStatus = EnumJobStatus.Wait; + jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate; jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode; @@ -873,7 +873,7 @@ public class AssembleIssueJobAppService await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(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 80ba628dd..e1c07dd37 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 @@ -694,7 +694,7 @@ public class CoatingIssueJobAppService await CoatingIssueRequestAppService.UpdateStatusCompletedAsync(coatingIssueJob.CoatingRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(coatingIssueJob.CoatingRequestNumber).ConfigureAwait(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 55c9fa0df..d45994af6 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 @@ -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.CancelByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber) + await _transferLibRequestAppService.CancelByCallReuestNumberAsync(injectionIssueJob.InjectionRequestNumber) .ConfigureAwait(false); } } @@ -537,11 +537,11 @@ public class InjectionIssueJobAppService if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) { - input.JobStatus = EnumJobStatus.Open; + input.JobStatus = EnumJobStatus.Wait; } else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) { - input.JobStatus = EnumJobStatus.Wait; + jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate; jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode; jobDetailInputdetail.TransferLibFromExpireDate = jobDetailInputdetail.RecommendFromExpireDate; @@ -640,7 +640,7 @@ public class InjectionIssueJobAppService await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber).ConfigureAwait(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 8aa36b09b..36e00dbef 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 @@ -542,12 +542,12 @@ public class KittingIssueJobAppService if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode != 1) { - input.JobStatus = EnumJobStatus.Open; + input.JobStatus = EnumJobStatus.Wait; } else if (loctionDto.Type == EnumLocationType.RAW && loctionDto.RowCode == 1) { - input.JobStatus = EnumJobStatus.Wait; + jobDetailInputdetail.TransferLibFromArriveDate = jobDetailInputdetail.RecommendFromArriveDate; jobDetailInputdetail.TransferLibFromContainerCode = jobDetailInputdetail.RecommendFromContainerCode; @@ -652,7 +652,7 @@ public class KittingIssueJobAppService await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber,kittingIssueJob.Number) .ConfigureAwait(false); - await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber).ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByJobNumAsync(kittingIssueJob.Number).ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false); }