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..a40623e23 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 @@ -47,6 +47,7 @@ public class AssembleIssueJobsController : AbpController status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); + status.Add((int)EnumJobStatus.WaitAgv); } else if (jobStatus == "Open") { @@ -56,6 +57,10 @@ public class AssembleIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Wait); } + else if (jobStatus == "WaitAgv") + { + status.Add((int)EnumJobStatus.WaitAgv); + } else { status.Add((int)EnumJobStatus.Done); 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..a34545d0b 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 @@ -47,6 +47,7 @@ public class CoatingIssueJobsController : AbpController status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); + status.Add((int)EnumJobStatus.WaitAgv); } else if (jobStatus == "Open") { @@ -56,6 +57,10 @@ public class CoatingIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Wait); } + else if (jobStatus == "WaitAgv") + { + status.Add((int)EnumJobStatus.WaitAgv); + } 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 197e8cbd4..6cf37f50b 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 @@ -47,6 +47,7 @@ public class InjectionIssueJobsController : AbpController status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); + status.Add((int)EnumJobStatus.WaitAgv); } else if (jobStatus == "Open") { @@ -56,6 +57,10 @@ public class InjectionIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Wait); } + else if (jobStatus == "WaitAgv") + { + status.Add((int)EnumJobStatus.WaitAgv); + } 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 9386bfc88..34b294a81 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 @@ -47,6 +47,7 @@ public class KittingIssueJobsController : AbpController status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); + status.Add((int)EnumJobStatus.WaitAgv); } else if(jobStatus == "Open") { @@ -56,6 +57,10 @@ public class KittingIssueJobsController : AbpController { status.Add((int)EnumJobStatus.Wait); } + else if (jobStatus == "WaitAgv") + { + status.Add((int)EnumJobStatus.WaitAgv); + } else { status.Add((int)EnumJobStatus.Done); 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..fe7a940b0 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 @@ -44,18 +44,23 @@ public class SparePartIssueJobsController : 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); + status.Add((int)EnumJobStatus.WaitAgv); } else if (jobStatus == "Open") { status.Add((int)EnumJobStatus.Open); } - //else if (jobStatus == "Wait") - //{ - // status.Add((int)EnumJobStatus.Wait); - //} + else if (jobStatus == "Wait") + { + status.Add((int)EnumJobStatus.Wait); + } + else if (jobStatus == "WaitAgv") + { + status.Add((int)EnumJobStatus.WaitAgv); + } else { status.Add((int)EnumJobStatus.Done);