治具回收时，增加产线未放治具误点提交按钮的防呆

DeviceLibrary/bean/job/GoLineForRecyJob.cs

@@ -310,7 +310,7 @@ namespace DeviceLibrary
                             AllocateTask(agv, SettingString.StopSound);
                             System.Threading.Thread.Sleep(5000);
                         }
-                        else
+                        else if(agv.IsExistShelf)
                         {
                             runInfo = "人员在" + JobParam.TargetNode + "操作完成";
                             JobRunStep.Msg = runInfo;

DeviceLibrary/service/FixtureService.cs

@@ -94,6 +94,8 @@ namespace DeviceLibrary
         public string Type { get; set; }
         [DataMember]
         public string HasLoad { get; set; }
+        [DataMember]
+        public string Arrived { get; set; }
     }
     [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConcurrencyMode = ConcurrencyMode.Single, IncludeExceptionDetailInFaults = true)]
     [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
@@ -230,17 +232,17 @@ namespace DeviceLibrary
             FixInfo fixInfo;
             if (AGVManager.agvInfo[0].CurJob == null)
             {
-                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString() };
+                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString(),Arrived="False"};
                 Log.Info($"GetTypeByGet : 当前无任务，治具类型为空");
             }
             else if (AGVManager.agvInfo[0].CurJob.JobParam != null && AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo != null)
             {
-                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type).ToString() };
+                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type).ToString(),Arrived= AGVManager.agvInfo[0].TaskRunState.TaskState.Equals(SettingString.Done)?"True":"False"};
                 Log.Info($"GetTypeByGet : {AGVManager.agvInfo[0].IsExistShelf},{AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type.ToString()}");
             }
             else
             {
-                fixInfo = new FixInfo() { Succeed = false.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString() };
+                fixInfo = new FixInfo() { Succeed = false.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString(), Arrived = "False" };
                 Log.Info($"GetTypeByGet : 当前无任务，查询失败");
             }
             return fixInfo;
@@ -251,17 +253,17 @@ namespace DeviceLibrary
             FixInfo fixInfo;
             if (AGVManager.agvInfo[0].CurJob == null)
             {
-                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString() };
+                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString(), Arrived = "False" };
                 Log.Info($"GetTypeByPost : 当前无任务，治具类型为空");
             }
             else if (AGVManager.agvInfo[0].CurJob.JobParam != null && AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo != null)
             {
-                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type).ToString() };
+                fixInfo = new FixInfo() { Succeed = true.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type).ToString(), Arrived = AGVManager.agvInfo[0].TaskRunState.TaskState.Equals(SettingString.Done) ? "True" : "False" };
                 Log.Info($"GetTypeByPost : {AGVManager.agvInfo[0].IsExistShelf},{AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type.ToString()}");
             }
             else
             {
-                fixInfo = new FixInfo() { Succeed = false.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString() };
+                fixInfo = new FixInfo() { Succeed = false.ToString(), HasLoad = AGVManager.agvInfo[0].IsExistShelf.ToString(), Type = ((int)FixType.None).ToString(), Arrived = "False" };
                 Log.Info($"GetTypeByPost : 当前无任务，查询失败");
             }
             return fixInfo;