MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -2,6 +2,7 @@
			using Quartz;
			using System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.Linq;
			using System.Text;
			using System.Threading.Tasks;
			@@ -74,7 +75,13 @@

			if (Carry != null)
			{
			if (Carry.Floor == "1F")
			if (Carry.SourceAddress.Contains("XB001") \|\| Carry.TargetAddress.Contains("XB001"))
			{
			_taskService.SendAgvTask("cattleCarry1", Carry.TaskNum);
			Carry.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryExecuting;
			_taskRepository.UpdateData(Carry);
			}
			else if (Carry.Floor == "1F")
			{
			_taskService.SendAgvTask("forkAutoTemplate1", Carry.TaskNum);
			Carry.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryExecuting;
			@@ -94,17 +101,24 @@
			if (InTask != null)
			{
			var OutTask = _taskRepository.QueryFirst(x => x.TaskState >= (int)TaskOutStatusEnum.OutNew && x.TaskState <(int)TaskOutStatusEnum.AGV_OutExecuting);
			var Task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InExecuting);
			if (OutTask == null && Task == null)
			var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InExecuting);
			if (OutTask == null && task == null)
			{
			CommonConveyorLine? conveyorLine = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1001") as CommonConveyorLine;
			if (conveyorLine != null)
			{
			bool IsWrite = false;
			short InteractiveSignal = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, "LK001");
			var structs = BitConverter.GetBytes(InteractiveSignal).Reverse().ToArray().ToBoolArray();
			if (structs[0])
			{
			conveyorLine.Communicator.WriteNoRead("DB100.0", 9999);
			IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 0);
			Thread.Sleep(1000);
			IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 9999);
			if (!IsWrite)
			{
			return Task.CompletedTask;
			}

			_taskService.SendAgvTask("LIFANG", InTask.TaskNum);