From 254146704c332174ce1abee3d7c56e993dbdfaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 12 Dec 2024 09:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssembleIssueJobs/AssembleIssueJobAppService.cs | 10 ++++++++++ .../CoatingIssueJobs/CoatingIssueJobAppService.cs | 12 ++++++++++++ .../InjectionIssueJobAppService.cs | 13 +++++++++++++ .../KittingIssueJobs/KittingIssueJobAppService.cs | 10 ++++++++++ .../SparePartIssueJobAppService.cs | 10 ++++++++++ .../UnplannedIssueJobAppService.cs | 8 +++++--- .../UnplannedReceiptJobAppService.cs | 6 +++++- 7 files changed, 65 insertions(+), 4 deletions(-) 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 b124e5515..cb6bea628 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 @@ -1076,6 +1076,16 @@ public class AssembleIssueJobAppService using var unitOfWork = _unitOfWorkManager.Begin(); try { + + if (job.JobStatus == EnumJobStatus.Done) + { + throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); + } + + if (job.Details.Count == 0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } var first = job.Details.FirstOrDefault(); var request = new AgvRequest(); request.MatCode = first.ItemCode; 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 6d251da16..6518d705a 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 @@ -965,6 +965,18 @@ public class CoatingIssueJobAppService using var unitOfWork = _unitOfWorkManager.Begin(); try { + + if (job.JobStatus == EnumJobStatus.Done) + { + throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); + } + + if (job.Details.Count == 0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } + + var first = job.Details.FirstOrDefault(); var request = new AgvRequest(); request.MatCode = first.ItemCode; 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 99b5d437c..5ac57f944 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 @@ -917,6 +917,19 @@ public class InjectionIssueJobAppService using var unitOfWork = _unitOfWorkManager.Begin(); try { + + if (job.JobStatus == EnumJobStatus.Done) + { + throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); + } + + if (job.Details.Count == 0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } + + + var first = job.Details.FirstOrDefault(); var request = new AgvRequest(); request.MatCode = first.ItemCode; 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 babe9b08e..410a9355f 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 @@ -926,6 +926,16 @@ public class KittingIssueJobAppService using var unitOfWork = _unitOfWorkManager.Begin(); try { + + if (job.JobStatus == EnumJobStatus.Done) + { + throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); + } + + if (job.Details.Count == 0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } var first = job.Details.FirstOrDefault(); var request = new AgvRequest(); request.MatCode = first.ItemCode; 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 7f4cd55a2..39a11bc11 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 @@ -901,9 +901,19 @@ public class SparePartIssueJobAppService ReqCode = job.SparePartRequestNumber, Message = "OK" }; + using var unitOfWork = _unitOfWorkManager.Begin(); try { + + if (job.JobStatus == EnumJobStatus.Done) + { + throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); + } + if (job.Details.Count == 0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } var first = job.Details.FirstOrDefault(); var request = new AgvRequest(); request.MatCode = first.ItemCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs index 47183db22..f96e2bdca 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs @@ -881,18 +881,20 @@ public class UnplannedIssueJobAppService { + if (job.JobStatus == EnumJobStatus.Done) { throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); } - var first = job.FacDetails.FirstOrDefault(); - - if (first == null) + if (job.Details.Count == 0) { throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); } + var first = job.FacDetails.FirstOrDefault(); + + var request = new AgvRequestUnplanned(); request.MatCode = first.ItemCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs index 08ca3ed1c..46c0db919 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs @@ -547,8 +547,12 @@ public class UnplannedReceiptJobAppService throw new UserFriendlyException($"任务{job.Number}为已完成状态,不能发起AGV任务!"); } - + if (job.Details.Count==0) + { + throw new UserFriendlyException($"任务{job.Number}没有推荐库存!"); + } var first = job.Details.FirstOrDefault(); + var request = new AgvRequestUnplanned(); request.MatCode = first.ItemCode; request.MatQty = first.RecommendQty;