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
///
///
///
- ///
+ ///
///
[HttpPost("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex,
- bool isFinished)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, string jobStatus)
{
var status = new List();
- 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
///
///
///
- ///
+ ///
///
[HttpPost("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex,
- bool isFinished)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, string jobStatus)
{
var status = new List();
- 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
///
///
///
- ///
+ ///
///
[HttpPost("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex,
- bool isFinished)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, string jobStatus)
{
var status = new List();
- 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
///
///
///
- ///
+ ///
///
[HttpPost("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex,
- bool isFinished)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, string jobStatus)
{
var status = new List();
- 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
///
///
///
- ///
+ ///
///
[HttpPost("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex,
- bool isFinished)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, string jobStatus)
{
var status = new List();
- 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);