叫料任务增加全部、待处理、等待筛选类型

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);
 

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);
 

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);
 

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);
 

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);