MeiRuiAn/HuaiAn.git

			@@ -16,6 +16,7 @@
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
			using WIDESEAWCS_Tasks.HoisterJob;
			using WIDESEAWCS_Tasks.StackerCraneJob;

			namespace WIDESEAWCS_Tasks
			@@ -64,7 +65,7 @@
			if (sendFlag)
			{
			commonStackerCrane.LastTaskType = task.TaskType;
			_taskService.UpdateTaskStatusToNext(task.TaskNum);
			//_taskService.UpdateTaskStatusToNext(task.TaskNum);
			}
			}
			}
			@@ -92,7 +93,7 @@
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			{
			Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			_taskService.StackCraneTaskCompleted(e.TaskNum);
			// _taskService.StackCraneTaskCompleted(e.TaskNum);
			commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			}
			@@ -123,6 +124,10 @@
			else
			{
			task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
			if (task == null)
			{
			task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
			}
			}
			}

			@@ -157,12 +162,13 @@
			/// <returns>濡傛灉鏈鍗犵敤锛岃繑鍥炰紶鍏ョ殑浠诲姟淇℃伅锛屽惁鍒欙紝杩斿洖null</returns>
			private Dt_Task? OutTaskStationIsOccupied([NotNull] Dt_Task task)
			{
			Dt_Router? router = _routerService.QueryNextRoutes(task.Roadway, task.NextAddress).FirstOrDefault();
			Dt_Router? router = _routerService.QueryNextRoutes(task.DeviceCode, task.NextAddress).FirstOrDefault();
			if (router != null)
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == router.ChildPosiDeviceCode);
			if (device != null)
			{
			if (device.DeviceCode == "YMCTSJ" \|\| task.DeviceCode == "CSJCSC01") return task;
			CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
			if (conveyorLine.IsOccupied(router.ChildPosi))//鍑哄簱绔欏彴鏈鍗犵敤
			{