MeiRuiAn/HuaiAn.git

			@@ -7,7 +7,9 @@
			using System.Text;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.Enums;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_IBasicInfoRepository;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			@@ -19,7 +21,6 @@
			using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
			using WIDESEAWCS_Tasks.HoisterJob;
			using WIDESEAWCS_Tasks.StackerCraneJob;
			using WIDESEAWCS_Tasks.é»çä»;

			namespace WIDESEAWCS_Tasks
			{
			@@ -69,7 +70,10 @@
			if (sendFlag)
			{
			commonStackerCrane.LastTaskType = task.TaskType;
			// _taskService.UpdateTaskStatusToNext(task.TaskNum);
			int oldState = task.TaskState;
			task.TaskState = TaskStatusEnum.SC_Executing.ObjToInt();
			_taskRepository.UpdateData(task);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"ç³»ç»èªå¨æµç¨ï¼ä»»å¡ç¶æä»ã{oldState}ãè½¬å°ã{task.TaskState}ã");
			}
			}
			}
			@@ -97,9 +101,48 @@
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			{
			Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			// _taskService.StackCraneTaskCompleted(e.TaskNum);
			StackerCraneTaskCompleted(e.TaskNum, commonStackerCrane.DeviceName);
			commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			}
			}

			public WebResponseContent StackerCraneTaskCompleted(int taskNum, string deviceName)
			{
			try
			{
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
			if (task != null)
			{
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			int oldStatus = task.TaskState;
			task.DeviceCode = "AGV";
			task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
			task.CurrentAddress = task.NextAddress;
			task.NextAddress = task.TargetAddress;
			_taskRepository.UpdateData(task);
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ï¼ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			}
			else if (task.TaskType.GetTaskTypeGroup() != TaskTypeGroup.InboundGroup)
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ï¼ä»»å¡å®æ");
			_taskRepository.DeleteAndMoveIntoHty(task, OperateTypeEnum.èªå¨å®æ);
			HttpHelper.Post("", "");//todo è°ç¨WMSä»»å¡å®ææ¹æ³
			}
			}
			else
			{
			WriteInfo(deviceName, $"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			return WebResponseContent.Instance.Error($"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			}

			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			WriteError(deviceName, $"ä»»å¡å®æéè¯¯", ex);
			return WebResponseContent.Instance.Error(ex.Message);
			}
			}

			@@ -156,6 +199,11 @@
			}
			}

			if(task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			HttpHelper.Post("", "");
			}

			return task;
			}

			@@ -166,7 +214,7 @@
			/// <returns>å¦ææªè¢«å ç¨ï¼è¿åä¼ å¥çä»»å¡ä¿¡æ¯ï¼å¦åï¼è¿ånull</returns>
			private Dt_Task? OutTaskStationIsOccupied([NotNull] Dt_Task task)
			{
			Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.TargetAddress && x.StackerCraneCode == task.Roadway);
			Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress && x.StackerCraneCode == task.DeviceCode);
			if (stationManger != null)
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			@@ -177,6 +225,7 @@
			{
			task.TargetAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			client.SetValue(GroundStationDBName.R_IsCanPut, true, stationManger.StationCode);
			return task;
			}
			}