From 93ba8bb2736bd5ed9fccdf7cbca54a3623d22ca5 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 11:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/IssueJobs/AssembleIssueJobsController.cs | 12 ++++++------ .../Jobs/IssueJobs/CoatingIssueJobsController.cs | 10 +++++----- .../Jobs/IssueJobs/InjectionIssueJobsController.cs | 12 ++++++------ .../Jobs/IssueJobs/KittingIssueJobsController.cs | 14 +++++++------- .../ITransferLibRequestAppService.cs | 3 +++ .../AssembleIssueJobAppService.cs | 12 ++++++++---- .../CoatingIssueJobs/CoatingIssueJobAppService.cs | 1 + .../InjectionIssueJobAppService.cs | 1 + .../KittingIssueJobs/KittingIssueJobAppService.cs | 1 + .../TransferLibRequestAppService.cs | 14 ++++++++++++++ .../UnplannedIssueRequestForDongyangAppService.cs | 1 + 11 files changed, 53 insertions(+), 28 deletions(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs index 7630ea0ea..71ba3bc9a 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs @@ -44,7 +44,7 @@ public class AssembleIssueJobsController : AbpController if (jobStatus == "ALL") { status.Add((int)EnumJobStatus.Open); - // status.Add((int)EnumJobStatus.Wait); + status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); } @@ -52,10 +52,10 @@ public class AssembleIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Open); } - //else if (jobStatus == "Wait") - //{ - // status.Add((int)EnumJobStatus.Wait); - //} + else if (jobStatus == "Wait") + { + status.Add((int)EnumJobStatus.Wait); + } else { status.Add((int)EnumJobStatus.Done); @@ -121,7 +121,7 @@ public class AssembleIssueJobsController : AbpController var status = new List { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial - //, (int)EnumJobStatus.Wait + , (int)EnumJobStatus.Wait }; var jsonStatus = JsonSerializer.Serialize(status); diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs index e8eebd2c8..24ac8c54a 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs @@ -44,7 +44,7 @@ public class CoatingIssueJobsController : AbpController if (jobStatus == "ALL") { status.Add((int)EnumJobStatus.Open); - //status.Add((int)EnumJobStatus.Wait); + status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); } @@ -52,10 +52,10 @@ public class CoatingIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Open); } - //else if (jobStatus == "Wait") - //{ - // status.Add((int)EnumJobStatus.Wait); - //} + else if (jobStatus == "Wait") + { + status.Add((int)EnumJobStatus.Wait); + } else { status.Add((int)EnumJobStatus.Done); diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs index 4806e2192..174cc29ee 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/InjectionIssueJobsController.cs @@ -44,7 +44,7 @@ public class InjectionIssueJobsController : AbpController if (jobStatus == "ALL") { status.Add((int)EnumJobStatus.Open); - //status.Add((int)EnumJobStatus.Wait); + status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); } @@ -52,10 +52,10 @@ public class InjectionIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Open); } - //else if (jobStatus == "Wait") - //{ - // status.Add((int)EnumJobStatus.Wait); - //} + else if (jobStatus == "Wait") + { + status.Add((int)EnumJobStatus.Wait); + } else { status.Add((int)EnumJobStatus.Done); @@ -121,7 +121,7 @@ public class InjectionIssueJobsController : AbpController var status = new List { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial - //, (int)EnumJobStatus.Wait + , (int)EnumJobStatus.Wait }; var jsonStatus = JsonSerializer.Serialize(status); diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs index 7dca7ee99..e18176f4a 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs @@ -44,7 +44,7 @@ public class KittingIssueJobsController : AbpController if (jobStatus=="ALL") { status.Add((int)EnumJobStatus.Open); - //status.Add((int)EnumJobStatus.Wait); + status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); } @@ -52,10 +52,10 @@ public class KittingIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Open); } - //else if(jobStatus == "Wait") - //{ - // status.Add((int)EnumJobStatus.Wait); - //} + else if (jobStatus == "Wait") + { + status.Add((int)EnumJobStatus.Wait); + } else { status.Add((int)EnumJobStatus.Done); @@ -120,8 +120,8 @@ public class KittingIssueJobsController : AbpController { var status = new List { - (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial - //(int)EnumJobStatus.Wait + (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial, + (int)EnumJobStatus.Wait }; var jsonStatus = JsonSerializer.Serialize(status); 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 d93c634b8..db7325e20 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 @@ -20,4 +20,7 @@ public interface ITransferLibRequestAppService Task CompleteByJobAsync(string requestNumber); Task CancelByCallRequestNumberAsync(string callJobNumber); Task CompleteByCallRequestNumberAsync(string callRequestNumber); + + Task CompleteByJobNumAsync(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 0c889b107..f47fc6aea 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 @@ -129,14 +129,13 @@ public class AssembleIssueJobAppService { throw new UserFriendlyException($"未找到ID为 {id} 的任务"); } - if (assembleJob.JobStatus == EnumJobStatus.Open || assembleJob.JobStatus == EnumJobStatus.Partial || assembleJob.JobStatus == EnumJobStatus.Wait || assembleJob.JobStatus == EnumJobStatus.Doing) { await _expectOutAppService.RemoveByNumberAsync(assembleJob.Number).ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.AssembleRequestNumber) + await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleJob.Number) .ConfigureAwait(false); assembleJob.JobStatus = EnumJobStatus.Cancelled; @@ -378,7 +377,7 @@ public class AssembleIssueJobAppService await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); - await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber) + await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number) .ConfigureAwait(false); await _repository.UpdateAsync(assembleIssueJob).ConfigureAwait(false); @@ -400,7 +399,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.AssembleRequestNumber) + await _transferLibRequestAppService.CancelByCallRequestNumberAsync(assembleIssueJob.Number) .ConfigureAwait(false); } } @@ -874,6 +873,11 @@ public class AssembleIssueJobAppService await AssembleIssueRequestAppService.UpdateStatusCompletedAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(assembleIssueJob.AssembleRequestNumber) .ConfigureAwait(false); + + + + await Task.CompletedTask.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 e93976c35..80ba628dd 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,6 +694,7 @@ public class CoatingIssueJobAppService await CoatingIssueRequestAppService.UpdateStatusCompletedAsync(coatingIssueJob.CoatingRequestNumber) .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(coatingIssueJob.CoatingRequestNumber).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 df5e89502..55c9fa0df 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,6 +640,7 @@ public class InjectionIssueJobAppService await InjectionIssueRequestAppService.UpdateStatusCompletedAsync(injectionIssueJob.InjectionRequestNumber) .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(injectionIssueJob.InjectionRequestNumber).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 cd3f45fe1..8aa36b09b 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,6 +652,7 @@ public class KittingIssueJobAppService await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber,kittingIssueJob.Number) .ConfigureAwait(false); + await _transferLibRequestAppService.CompleteByCallRequestNumberAsync(kittingIssueJob.KittingRequestNumber).ConfigureAwait(false); await Task.CompletedTask.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 93267adb9..9146958f5 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 @@ -406,6 +406,20 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase } } + + [HttpPost("Complete-By-JobNum")] + public async Task CompleteByJobNumAsync(string jobNumber) + { + var list = await _repository.GetListAsync(p => p.CallJobNumber == jobNumber).ConfigureAwait(false); + foreach (var request in list) + { + await CompleteAsync(request.Id).ConfigureAwait(false); + } + } + + + + /// /// 【创建】库移请求 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs index f979003c0..ad849e8fc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs @@ -206,6 +206,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA detail.Explain = first.Explain; detail.ExpireDate = DateTime.MaxValue; + await SetDetailPropertiesAsync(detail).ConfigureAwait(false); detailList.Add(detail); }