HuaYiZhongHeng/BaiBuLiKu.git

			@@ -143,6 +143,9 @@
			//Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			ConsoleHelper.WriteColorLine($"【{commonStackerCrane.DeviceName}】任务完成,任务号：【{e.TaskNum}】", ConsoleColor.Blue);
			var task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);

			if (task == null) commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);

			if (commonStackerCrane.DeviceCode.Contains("GW") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
			@@ -164,7 +167,13 @@
			else
			return;
			}

			_taskService.StackCraneTaskCompleted(e.TaskNum);
			if (commonStackerCrane.DeviceCode.Contains("CH") && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			}
			commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			}
			@@ -178,7 +187,7 @@
			private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
			{
			Dt_Task task;
			var taskRun = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting \|\| x.TaskState == (int)TaskInStatusEnum.SC_InExecuting);
			var taskRun = _taskRepository.QueryFirst(x => x.Roadway == commonStackerCrane.DeviceCode && (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting \|\| x.TaskState == (int)TaskInStatusEnum.SC_InExecuting));
			if (taskRun != null) { return null; }
			if (commonStackerCrane.LastTaskType == null)
			{
			@@ -289,7 +298,7 @@
			if (device != null)
			{
			CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
			if (conveyorLine.IsOccupied(router.ChildPosi))//出库站台未被占用
			//if (conveyorLine.IsOccupied(router.ChildPosi))//出库站台未被占用
			{
			return task;
			}
			@@ -425,38 +434,6 @@
			}
			return stackerCraneTaskCommand;
			}


			/// <summary>
			/// 设备心跳
			/// </summary>
			/// <param name="commonStackerCrane"></param>
			//public async void EqptAlive(CommonStackerCrane commonStackerCrane)
			//{
			// if (commonStackerCrane.StackerOnline)
			// {
			// BasicDto dto = new BasicDto
			// {
			// EmployeeNo = "T00001",
			// EquipmentCode = commonStackerCrane.DeviceCode,
			// RequestTime = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
			// SessionId = Guid.NewGuid().ToString(),
			// Software = commonStackerCrane.DeviceName,
			// };
			// var respone = await HttpHelper.PostAsync("http://ts-momapp01:12020/api/MachineIntegration/EqptAlive", dto.ToJsonString());
			// if (respone != null)
			// {
			// var result = JsonConvert.DeserializeObject<ResponseEqptAliveDto>(respone);
			// if (result != null && result.Success)
			// {
			// if (result.KeyFlag == "99")
			// commonStackerCrane.StackerOnline = true;
			// else if (result.KeyFlag == "98")
			// commonStackerCrane.StackerOnline = false;
			// }
			// }
			// }
			//}

			}
			}