From 5089cea56a10ee50d25a68c98903096922ea6bb7 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 26 Jun 2024 11:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E6=96=99=E4=BB=BB=E5=8A=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=83=A8=E3=80=81=E5=BE=85=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E7=AD=89=E5=BE=85=E7=AD=9B=E9=80=89=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IssueJobs/AssembleIssueJobsController.cs  | 23 ++++++++++++-------
 .../IssueJobs/CoatingIssueJobsController.cs   | 23 ++++++++++++-------
 .../IssueJobs/InjectionIssueJobsController.cs | 23 ++++++++++++-------
 .../IssueJobs/KittingIssueJobsController.cs   | 23 ++++++++++++-------
 .../IssueJobs/SparePartIssueJobsController.cs | 23 ++++++++++++-------
 5 files changed, 75 insertions(+), 40 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 6ab0ce990..82750ac6a 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
@@ -35,24 +35,31 @@ public class AssembleIssueJobsController : AbpController
     /// </summary>
     /// <param name="pageSize"></param>
     /// <param name="pageIndex"></param>
-    /// <param name="isFinished"></param>
+    /// <param name="jobStatus"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<AssembleIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
-        bool isFinished)
+    public virtual async Task<PagedResultDto<AssembleIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, string jobStatus)
     {
         var status = new List<int>();
-        if (isFinished)
-        {
-            status.Add((int)EnumJobStatus.Done);
-        }
-        else
+        if (jobStatus == "ALL")
         {
             status.Add((int)EnumJobStatus.Open);
             status.Add((int)EnumJobStatus.Wait);
             status.Add((int)EnumJobStatus.Doing);
             status.Add((int)EnumJobStatus.Partial);
         }
+        else if (jobStatus == "Open")
+        {
+            status.Add((int)EnumJobStatus.Open);
+        }
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
 
         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 e0c042c3d..cf7f0d047 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
@@ -35,24 +35,31 @@ public class CoatingIssueJobsController : AbpController
     /// </summary>
     /// <param name="pageSize"></param>
     /// <param name="pageIndex"></param>
-    /// <param name="isFinished"></param>
+    /// <param name="jobStatus"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<CoatingIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
-        bool isFinished)
+    public virtual async Task<PagedResultDto<CoatingIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, string jobStatus)
     {
         var status = new List<int>();
-        if (isFinished)
-        {
-            status.Add((int)EnumJobStatus.Done);
-        }
-        else
+        if (jobStatus == "ALL")
         {
             status.Add((int)EnumJobStatus.Open);
             status.Add((int)EnumJobStatus.Wait);
             status.Add((int)EnumJobStatus.Doing);
             status.Add((int)EnumJobStatus.Partial);
         }
+        else if (jobStatus == "Open")
+        {
+            status.Add((int)EnumJobStatus.Open);
+        }
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
 
         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 ba2c33478..59ab445ea 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
@@ -35,24 +35,31 @@ public class InjectionIssueJobsController : AbpController
     /// </summary>
     /// <param name="pageSize"></param>
     /// <param name="pageIndex"></param>
-    /// <param name="isFinished"></param>
+    /// <param name="jobStatus"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
-        bool isFinished)
+    public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, string jobStatus)
     {
         var status = new List<int>();
-        if (isFinished)
-        {
-            status.Add((int)EnumJobStatus.Done);
-        }
-        else
+        if (jobStatus == "ALL")
         {
             status.Add((int)EnumJobStatus.Open);
             status.Add((int)EnumJobStatus.Wait);
             status.Add((int)EnumJobStatus.Doing);
             status.Add((int)EnumJobStatus.Partial);
         }
+        else if (jobStatus == "Open")
+        {
+            status.Add((int)EnumJobStatus.Open);
+        }
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
 
         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 9efc9c252..799e9e24b 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
@@ -35,24 +35,31 @@ public class KittingIssueJobsController : AbpController
     /// </summary>
     /// <param name="pageSize"></param>
     /// <param name="pageIndex"></param>
-    /// <param name="isFinished"></param>
+    /// <param name="jobStatus"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<KittingIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
-        bool isFinished)
+    public virtual async Task<PagedResultDto<KittingIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, string jobStatus)
     {
         var status = new List<int>();
-        if (isFinished)
-        {
-            status.Add((int)EnumJobStatus.Done);
-        }
-        else
+        if (jobStatus=="ALL")
         {
             status.Add((int)EnumJobStatus.Open);
             status.Add((int)EnumJobStatus.Wait);
             status.Add((int)EnumJobStatus.Doing);
             status.Add((int)EnumJobStatus.Partial);
         }
+        else if(jobStatus == "Open")
+        {
+            status.Add((int)EnumJobStatus.Open);
+        }
+        else if(jobStatus == "Wait")
+        {           
+            status.Add((int)EnumJobStatus.Wait);           
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
 
         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 2c6555ca0..66cbe7fae 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
@@ -35,24 +35,31 @@ public class SparePartIssueJobsController : AbpController
     /// </summary>
     /// <param name="pageSize"></param>
     /// <param name="pageIndex"></param>
-    /// <param name="isFinished"></param>
+    /// <param name="jobStatus"></param>
     /// <returns></returns>
     [HttpPost("list")]
-    public virtual async Task<PagedResultDto<SparePartIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
-        bool isFinished)
+    public virtual async Task<PagedResultDto<SparePartIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, string jobStatus)
     {
         var status = new List<int>();
-        if (isFinished)
-        {
-            status.Add((int)EnumJobStatus.Done);
-        }
-        else
+        if (jobStatus == "ALL")
         {
             status.Add((int)EnumJobStatus.Open);
             status.Add((int)EnumJobStatus.Wait);
             status.Add((int)EnumJobStatus.Doing);
             status.Add((int)EnumJobStatus.Partial);
         }
+        else if (jobStatus == "Open")
+        {
+            status.Add((int)EnumJobStatus.Open);
+        }
+        else if (jobStatus == "Wait")
+        {
+            status.Add((int)EnumJobStatus.Wait);
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
 
         var jsonStatus = JsonSerializer.Serialize(status);