From fbc4753d10f5729e21618b3f7f507a9930da4b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 23 Dec 2024 15:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99RequestHand?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssembleIssueJobAppService.cs | 2 +- .../CoatingIssueJobAppService.cs | 2 +- .../InjectionIssueJobAppService.cs | 2 +- .../KittingIssueJobAppService.cs | 2 +- .../SparePartIssueJobAppService.cs | 17 +---------------- .../UnplannedReceiptJobAppService.cs | 6 +++--- .../CoatingIssueRequestEventHandler.cs | 8 ++++++++ .../InjectionIssueRequestEventHandler.cs | 8 ++++++++ .../KittingIssueRequestEventHandler.cs | 7 +++++++ .../SparePartIssueRequestEventHandler.cs | 8 ++++++++ 10 files changed, 39 insertions(+), 23 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 234b5a239..fca185326 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 @@ -916,7 +916,7 @@ public class AssembleIssueJobAppService if (entity == null) { - return ReturnMessage("-1", $"{entity.Number}任务单据不存在!"); + return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!"); } var dto=ObjectMapper.Map(entity); if (entity.JobStatus == EnumJobStatus.Done) 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 1ae7f1108..c505fa4b7 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 @@ -937,7 +937,7 @@ public class CoatingIssueJobAppService if (entity == null) { - return ReturnMessage("-1", $"{entity.Number}任务单据不存在!"); + return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!"); } var dto = ObjectMapper.Map(entity); if (entity.JobStatus == EnumJobStatus.Done) 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 c8f5adf19..d728e68f5 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 @@ -886,7 +886,7 @@ public class InjectionIssueJobAppService if (entity == null) { - return ReturnMessage("-1", $"{entity.Number}任务单据不存在!"); + return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!"); } var dto = ObjectMapper.Map(entity); if (entity.JobStatus == EnumJobStatus.Done) 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 92deb262b..d411cfca9 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 @@ -901,7 +901,7 @@ public class KittingIssueJobAppService if (entity == null) { - return ReturnMessage("-1", $"{entity.Number}任务单据不存在!"); + return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!"); } var dto = ObjectMapper.Map(entity); if (entity.JobStatus == EnumJobStatus.Done) 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 6fbcd1c12..8d888a483 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 @@ -360,21 +360,6 @@ public class SparePartIssueJobAppService ? "LYF" : _options.Value.StereosPassword; - - - - //if (sparePartIssueJob.IsClaims) - //{ - // if (sparePartIssueJob.ClaimsUserId != _currentUser.Id.ToString()) - // { - // throw new UserFriendlyException($"该任务已被【{sparePartIssueJob.ClaimsUserName}】承接"); - // } - //} - //else - //{ - // throw new UserFriendlyException("该任务未被承接，请重新刷新页面，承接任务"); - //} - var sparePartIssueJobDto = ObjectMapper.Map(sparePartIssueJob); sparePartIssueJobDto.Details = new List { issueJobDetailDto }; var sparePartIssueNoteEditInput = await BuildSparePartIssueNoteAsync(sparePartIssueJobDto).ConfigureAwait(false); @@ -912,7 +897,7 @@ public class SparePartIssueJobAppService if (entity == null) { - return ReturnMessage("-1", $"{entity.Number}任务单据不存在!"); + return ReturnMessage("-1", $"{request.Data.First().OrderNum}任务单据不存在!"); } var dto = ObjectMapper.Map(entity); if (entity.JobStatus == EnumJobStatus.Done) 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 64da11afc..ede6b06fd 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 @@ -400,7 +400,7 @@ public class UnplannedReceiptJobAppService } if (job.JobStatus != EnumJobStatus.WaitAgv) { - return ReturnMessage("-1", "该任务状态不是等待AGV中"); + return ReturnMessage("-1", $"{agvRequest.OrderNum}任务状态不是等待AGV中"); } var toLocationDto = await _locationAppService.GetByCodeAsync(agvRequest.EndPosition).ConfigureAwait(false); if (toLocationDto == null) @@ -426,8 +426,8 @@ public class UnplannedReceiptJobAppService /// /// 返回信息 /// - /// 0成功其他失败 - /// OK成功其他错误信息 + /// 0成功其他失败 + /// OK成功其他错误信息 /// private AgvResultObject ReturnMessage(string code, string message) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs index 4a62caf3f..cca1e2797 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs @@ -605,6 +605,14 @@ public class CoatingIssueRequestEventHandler if (CoatingIssueJobEditInputs.Count > 0) //有库存 可以创建任务 { + CoatingIssueJobEditInputs.ForEach(p => + { + p.Details.ForEach(x => x.Remark = CoatingIssueRequest.Remark); + p.Remark = CoatingIssueRequest.Remark; + }); + + + //新增任务 var addCoatingIssueJobDtos = await _CoatingIssueJobAppService .CreateManyAsync(CoatingIssueJobEditInputs) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs index 0b886f202..403b6ce3c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs @@ -605,6 +605,14 @@ public class InjectionIssueRequestEventHandler if (InjectionIssueJobEditInputs.Count > 0) //有库存 可以创建任务 { + InjectionIssueJobEditInputs.ForEach(p => + { + p.Details.ForEach(x => x.Remark = InjectionIssueRequest.Remark); + p.Remark = InjectionIssueRequest.Remark; + }); + + + //新增任务 var addInjectionIssueJobDtos = await _InjectionIssueJobAppService .CreateManyAsync(InjectionIssueJobEditInputs) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs index 8f22bf842..567625b02 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs @@ -605,6 +605,13 @@ public class KittingIssueRequestEventHandler if (KittingIssueJobEditInputs.Count > 0) //有库存 可以创建任务 { + KittingIssueJobEditInputs.ForEach(p => + { + p.Details.ForEach(x => x.Remark = KittingIssueRequest.Remark); + p.Remark = KittingIssueRequest.Remark; + }); + + //新增任务 var addKittingIssueJobDtos = await _KittingIssueJobAppService .CreateManyAsync(KittingIssueJobEditInputs) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs index f4e3152e4..1cfd0e9d2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs @@ -605,6 +605,14 @@ public class SparePartIssueRequestEventHandler if (SparePartIssueJobEditInputs.Count > 0) //有库存 可以创建任务 { + SparePartIssueJobEditInputs.ForEach(p => + { + p.Details.ForEach(x => x.Remark = SparePartIssueRequest.Remark); + p.Remark = SparePartIssueRequest.Remark; + }); + + + //新增任务 var addSparePartIssueJobDtos = await _SparePartIssueJobAppService .CreateManyAsync(SparePartIssueJobEditInputs)