Skip to content

张东亮 / SO940-AGV

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 36baed89 由 张东亮
选项

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

1 个父辈 2e45d045
内嵌 并排
正在显示 2 个修改的文件 包含 9 行增加 和 7 行删除
DeviceLibrary/bean/job/GoLineForRecyJob.cs
...@@ -310,7 +310,7 @@ namespace DeviceLibrary ...@@ -310,7 +310,7 @@ namespace DeviceLibrary
AllocateTask(agv, SettingString.StopSound); AllocateTask(agv, SettingString.StopSound);
System.Threading.Thread.Sleep(5000); System.Threading.Thread.Sleep(5000);
} }
else else if(agv.IsExistShelf)
{ {
runInfo = "人员在" + JobParam.TargetNode + "操作完成"; runInfo = "人员在" + JobParam.TargetNode + "操作完成";
JobRunStep.Msg = runInfo; JobRunStep.Msg = runInfo;
......
DeviceLibrary/service/FixtureService.cs
...@@ -94,6 +94,8 @@ namespace DeviceLibrary ...@@ -94,6 +94,8 @@ namespace DeviceLibrary
public string Type { get; set; } public string Type { get; set; }
[DataMember] [DataMember]
public string HasLoad { get; set; } public string HasLoad { get; set; }
[DataMember]
public string Arrived { get; set; }
} }
[ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConcurrencyMode = ConcurrencyMode.Single, IncludeExceptionDetailInFaults = true)] [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single, ConcurrencyMode = ConcurrencyMode.Single, IncludeExceptionDetailInFaults = true)]
[AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)] [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
...@@ -230,17 +232,17 @@ namespace DeviceLibrary ...@@ -230,17 +232,17 @@ namespace DeviceLibrary
FixInfo fixInfo; FixInfo fixInfo;
if (AGVManager.agvInfo[0].CurJob == null) 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 : 当前无任务，治具类型为空"); Log.Info($"GetTypeByGet : 当前无任务，治具类型为空");
} }
else if (AGVManager.agvInfo[0].CurJob.JobParam != null && AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo != null) 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()}"); Log.Info($"GetTypeByGet : {AGVManager.agvInfo[0].IsExistShelf},{AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type.ToString()}");
} }
else 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 : 当前无任务，查询失败"); Log.Info($"GetTypeByGet : 当前无任务，查询失败");
} }
return fixInfo; return fixInfo;
...@@ -251,17 +253,17 @@ namespace DeviceLibrary ...@@ -251,17 +253,17 @@ namespace DeviceLibrary
FixInfo fixInfo; FixInfo fixInfo;
if (AGVManager.agvInfo[0].CurJob == null) 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 : 当前无任务，治具类型为空"); Log.Info($"GetTypeByPost : 当前无任务，治具类型为空");
} }
else if (AGVManager.agvInfo[0].CurJob.JobParam != null && AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo != null) 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()}"); Log.Info($"GetTypeByPost : {AGVManager.agvInfo[0].IsExistShelf},{AGVManager.agvInfo[0].CurJob.JobParam.FixMissionInfo.Type.ToString()}");
} }
else 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 : 当前无任务，查询失败"); Log.Info($"GetTypeByPost : 当前无任务，查询失败");
} }
return fixInfo; return fixInfo;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!