From ef43e2fcd2dead733ae48d9081a22d1363d1a30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 19 Nov 2024 11:04:41 +0800 Subject: [PATCH 1/2] =?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 | 13 +++++++------ .../Jobs/IssueJobs/CoatingIssueJobsController.cs | 5 +++-- .../Jobs/IssueJobs/InjectionIssueJobsController.cs | 5 +++-- .../Jobs/IssueJobs/KittingIssueJobsController.cs | 5 +++-- .../Jobs/IssueJobs/SparePartIssueJobsController.cs | 4 +++- .../AssembleIssueJobs/AssembleIssueJobAppService.cs | 3 ++- .../Jobs/Issue/AssembleIssueJobEventHandler.cs | 6 ++++++ 7 files changed, 27 insertions(+), 14 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 06d40b9eb..7630ea0ea 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); @@ -120,7 +120,8 @@ public class AssembleIssueJobsController : 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/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 26b5b65fa..79acaebce 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); } @@ -120,7 +120,8 @@ public class CoatingIssueJobsController : 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/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 197e8cbd4..91c8327f7 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); } @@ -120,7 +120,8 @@ public class InjectionIssueJobsController : 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/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 9386bfc88..d6d2d6737 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); } @@ -120,7 +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/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs index 7caaaa07f..5a2abdf7d 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs @@ -120,7 +120,9 @@ public class SparePartIssueJobsController : 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/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index 4f9f966a0..2ba6653df 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 @@ -161,7 +161,7 @@ public class AssembleIssueJobAppService } /// - /// 库移回调 + /// 库移回调 /// /// /// @@ -181,6 +181,7 @@ public class AssembleIssueJobAppService job.JobStatus = EnumJobStatus.Open; + jobDetail.TransferLibFromArriveDate = transferLibNoteDetail.HandledFromArriveDate; jobDetail.TransferLibFromContainerCode = transferLibNoteDetail.HandledFromContainerCode; jobDetail.TransferLibFromExpireDate = transferLibNoteDetail.HandledFromExpireDate; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs index 5e75579cd..d531f9666 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/Issue/AssembleIssueJobEventHandler.cs @@ -112,6 +112,9 @@ public class AssembleIssueJobEventHandler : inputoExpectOutEditInput.SupplierBatch = detail.RecommendFromSupplierBatch; inputoExpectOutEditInput.WarehouseCode = detail.RecommendFromWarehouseCode; + + + expectOutEditInputs.Add(inputoExpectOutEditInput); } @@ -126,6 +129,9 @@ public class AssembleIssueJobEventHandler : /// private async Task CreateTransferLibAsync(AssembleIssueJob assembleIssueJob) { + + + foreach (var detail in assembleIssueJob.Details) { var locationDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode) From 09d8914e0dd62d6fdbc8cab96339306ff63bf61b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 19 Nov 2024 11:41:39 +0800 Subject: [PATCH 2/2] =?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 --- .../IssueJobs/CoatingIssueJobsController.cs | 8 ++++---- .../IssueJobs/InjectionIssueJobsController.cs | 8 ++++---- .../IssueJobs/KittingIssueJobsController.cs | 8 ++++---- .../AssembleIssueJobAppService.cs | 17 ++++++++++------- 4 files changed, 22 insertions(+), 19 deletions(-) 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 79acaebce..e8eebd2c8 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 @@ -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 91c8327f7..4806e2192 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 @@ -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); 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 d6d2d6737..7dca7ee99 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 @@ -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); 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 2ba6653df..8f19e2425 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 @@ -571,8 +571,17 @@ public class AssembleIssueJobAppService var query = _repository.WithDetails() .Where(p => numbers.Contains(p.Number) && p.JobStatus != EnumJobStatus.Done); - var entities = query.ToList(); + if (entities.Count > 0) + { + var efs=entities.Where(p => p.JobStatus == EnumJobStatus.Wait); + if (efs!=null && efs.ToList().Count > 0) + { + var task=efs.FirstOrDefault(); + errors.Add($"立体库任务{task.Number}当前状态为库移状态!"); + } + } + if (entities.Count == 0) { errors.Add($"任务号{string.Join(",", numbers)}不存在!"); @@ -580,12 +589,6 @@ public class AssembleIssueJobAppService var dtos = ObjectMapper.Map, List>(entities); - - - - - - if (input.Jobs.Count != entities.Count) { errors.Add("立体库提交出库任务和WMS任务不符,请核对! \n");