From 5e7417b24ae221675e547782e31f7db130a5f972 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 24 Jun 2024 14:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E6=96=99=E4=BB=BB=E5=8A=A1=E6=8C=89?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=85=88=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BE=85=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E6=98=BE=E7=A4=BA=E7=AD=89=E5=BE=85=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Jobs/IssueJobs/AssembleIssueJobsController.cs | 4 ++-- .../Controllers/Jobs/IssueJobs/CoatingIssueJobsController.cs | 4 ++-- .../Jobs/IssueJobs/InjectionIssueJobsController.cs | 4 ++-- .../Controllers/Jobs/IssueJobs/KittingIssueJobsController.cs | 4 ++-- .../Jobs/IssueJobs/SparePartIssueJobsController.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 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 a671ec107..6ab0ce990 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 @@ -60,10 +60,10 @@ public class AssembleIssueJobsController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(AssembleIssueJobDTO.JobStatus)} ASC,{nameof(AssembleIssueJobDTO.CreationTime)} ASC", Condition = new Condition { - Filters = new List { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } + Filters = new List { new(nameof(AssembleIssueJobDTO.JobStatus), jsonStatus, "In") } } }; 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 e51636f82..e0c042c3d 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 @@ -60,10 +60,10 @@ public class CoatingIssueJobsController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(CoatingIssueJobDTO.JobStatus)} ASC,{nameof(CoatingIssueJobDTO.CreationTime)} ASC", Condition = new Condition { - Filters = new List { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } + Filters = new List { new(nameof(CoatingIssueJobDTO.JobStatus), jsonStatus, "In") } } }; 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 b9f0dc3f8..ba2c33478 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 @@ -60,10 +60,10 @@ public class InjectionIssueJobsController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(InjectionIssueJobDTO.JobStatus)} ASC,{nameof(InjectionIssueJobDTO.CreationTime)} ASC", Condition = new Condition { - Filters = new List { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } + Filters = new List { new(nameof(InjectionIssueJobDTO.JobStatus), jsonStatus, "In") } } }; 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 7ce5bb355..9efc9c252 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 @@ -60,10 +60,10 @@ public class KittingIssueJobsController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(KittingIssueJobDTO.JobStatus)} ASC,{nameof(KittingIssueJobDTO.CreationTime)} ASC", Condition = new Condition { - Filters = new List { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } + Filters = new List { new(nameof(KittingIssueJobDTO.JobStatus), jsonStatus, "In") } } }; 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 fe5ac52ef..2c6555ca0 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 @@ -60,10 +60,10 @@ public class SparePartIssueJobsController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(SparePartIssueJobDTO.JobStatus)} ASC,{nameof(SparePartIssueJobDTO.CreationTime)} ASC", Condition = new Condition { - Filters = new List { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } + Filters = new List { new(nameof(SparePartIssueJobDTO.JobStatus), jsonStatus, "In") } } };