ShiDaKe/ShenYangLiku.git

			@@ -32,6 +32,8 @@
			using System.Threading.Tasks;
			using WIDESEAWCS_QuartzJob.StackerCrane;
			using WIDESEAWCS_Core.BaseRepository;
			using Autofac.Core;
			using WIDESEAWCS_Tasks.ConveyorLineJob;

			namespace WIDESEAWCS_Tasks
			{
			@@ -69,9 +71,11 @@
			getStackerObject.CheckStackerCraneTaskCompleted();
			if (getStackerObject.StackerCraneStatusValue == StackerCraneStatus.Normal)
			{
			var a = speStackerCrane.GetValue<StackerCraneDBName, Int32>(StackerCraneDBName.CurrentTaskNum);
			Dt_Task? task = GetTasks(speStackerCrane);
			if (task != null)
			{
			WriteInfo("æ¥æ¾å åæºä»»å¡å·", $"ä»»å¡ä¿¡æ¯,ä»»å¡å·:{task.TaskNum}ï¼å åæºç¼å·{speStackerCrane.DeviceCode}");
			bool sendFlag = true;
			if (sendFlag)
			{
			@@ -111,7 +115,10 @@
			{
			if (speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			{
			var TaskNum = speStackerCrane.GetValue<StackerCraneDBName, Int32>(StackerCraneDBName.CurrentTaskNum);
			WriteInfo("å åæºä»»å¡å®æ", $"ä»»å¡å·:{TaskNum}");
			StackerCraneTaskCompleted(e.TaskNum, speStackerCrane.DeviceCode);
			WriteInfo("å åæºä»»å¡å®æåé¦ä»»å¡å·", $"ä»»å¡ä¿¡æ¯,ä»»å¡å·:{e.TaskNum}");
			speStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			}
			@@ -188,6 +195,10 @@
			{
			Dt_Task? task;

			if (_taskRepository.QueryFirst(x => x.DeviceCode == commonStackerCrane.DeviceCode && x.TaskState == TaskStatusEnum.SC_Executing.ObjToInt()) != null)
			{
			return null;
			}
			if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);