Merge branch 'Agv分支2024-11-19' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into Agv分支2024-11-19

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

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

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

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

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