HuaYiZhongHeng/BaiBuLiKu.git

			@@ -22,6 +22,7 @@
			using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
			using WIDESEAWCS_SignalR;
			using WIDESEAWCS_Tasks.StackerCraneJob;
			using WIDESEAWCS_Common;

			namespace WIDESEAWCS_Tasks
			{
			@@ -67,7 +68,12 @@

			if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
			{
			Dt_Task? task = GetTask(commonStackerCrane);
			Dt_Task? task = null;
			if (StaticVariable.isLineRun)
			{
			StaticVariable.isStackerRun = false;
			task = GetTask(commonStackerCrane);
			}
			if (task != null)
			{
			StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
			@@ -125,6 +131,10 @@
			WriteError("CommonStackerStationCraneJob", "test", ex);
			//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
			}
			finally
			{
			StaticVariable.isStackerRun = true;
			}
			//WriteDebug("CommonStackerStationCraneJob", "test");
			return Task.CompletedTask;
			}
			@@ -166,6 +176,11 @@
			private Dt_Task? GetTask(CommonStackerStationCrane commonStackerCrane)
			{
			Dt_Task task;
			task = _taskService.QueryOutFireAlarmTask(commonStackerCrane.DeviceCode);
			if (task != null)
			{
			return task;
			}

			task = _taskService.QueryRelocationTask(commonStackerCrane.DeviceCode);
			if (task != null)
			@@ -294,6 +309,7 @@
			stackerCraneTaskCommand.WorkType = 1;
			stackerCraneTaskCommand.TrayType = 0;
			stackerCraneTaskCommand.StartCommand = 1;
			stackerCraneTaskCommand.FireCommand = Convert.ToInt16(task.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm ? 2 : 0);

			string[] sourceCodes = task.SourceAddress.Split("-");
			if (sourceCodes.Length == 3)