MeiRuiAn/HuaiAn.git

			@@ -19,7 +19,10 @@
			using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
			using WIDESEAWCS_Tasks.HoisterJob;
			using WIDESEAWCS_Tasks.StackerCraneJob;
			using WIDESEAWCS_Tasks.é»çä»;
			using WIDESEAWCS_Tasks;
			using WIDESEAWCS_Core;
			using SqlSugar.Extensions;
			using WIDESEAWCS_Tasks.ConveyorLineJob;

			namespace WIDESEAWCS_Tasks
			{
			@@ -69,7 +72,12 @@
			if (sendFlag)
			{
			commonStackerCrane.LastTaskType = task.TaskType;
			// _taskService.UpdateTaskStatusToNext(task.TaskNum);
			task.Dispatchertime = DateTime.Now;
			task.ExceptionMessage = "";
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Executing);
			commonStackerCrane.Communicator.Write("DB105.54", (short)1);
			//å»¶æ¶1s
			Thread.Sleep(1000);
			}
			}
			}
			@@ -96,12 +104,62 @@
			{
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			{
			Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			// _taskService.StackCraneTaskCompleted(e.TaskNum);
			StackerCraneTaskCompleted(e.TaskNum, commonStackerCrane.DeviceCode);
			commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			}
			}
			public WebResponseContent StackerCraneTaskCompleted(int taskNum, string deviceCode)
			{
			try
			{
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
			if (task != null)
			{
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StackerCraneStationCode == task.NextAddress);
			if (stationManger == null)
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			return WebResponseContent.Instance.Error($"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			}

			int oldStatus = task.TaskState;
			task.DeviceCode = stationManger.StationDeviceCode;
			task.TaskState = TaskStatusEnum.Line_Execute.ObjToInt();
			task.CurrentAddress = stationManger.StationCode;
			_taskRepository.UpdateData(task);
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			//todo å®æ
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup \|\| task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			_taskService.TaskCompleted(taskNum);
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			}
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			return WebResponseContent.Instance.Error($"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			}

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


			/// <summary>
			/// è·åä»»å¡
			@@ -166,27 +224,29 @@
			/// <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.TargetAddress && x.StackerCraneCode == task.DeviceCode);
			if (stationManger != null)
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			{
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode))//åºåºç«å°æªè¢«å ç¨
			if (!client.GetValue<R_ConveyorLineDB, bool>(R_ConveyorLineDB.Goods, stationManger.StationCode))//åºåºç«å°æªè¢«å ç¨
			{
			task.TargetAddress = stationManger.StackerCraneStationCode;
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			return task;
			}
			}
			else
			{
			WriteInfo(task.DeviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³å¤æåºåºç«å°æ¯å¦è¢«å ç¨");
			}
			}
			else
			{
			WriteInfo(task.DeviceCode, $"æªæ¾å°ç«å°ã{task.NextAddress}ãä¿¡æ¯ï¼æ æ³æ ¡éªç«å°");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°ç«å°ã{task.NextAddress}ãä¿¡æ¯ï¼æ æ³æ ¡éªç«å°");
			}
			return null;
			@@ -208,15 +268,35 @@
			stackerCraneTaskCommand.TrayType = 1;
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//å¤ææ¯å¦æ¯å¥åºä»»å¡
			{
			//List<Dt_Router> routers = _routerService.QueryNextRoutes(task.CurrentAddress, task.Roadway);
			//if (routers.Count > 0)
			//{

			string[] startCodes = task.CurrentAddress.Split("-");

			stackerCraneTaskCommand.StartRow = Convert.ToInt16(startCodes[0]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(startCodes[1]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(startCodes[2]);

			if (startCodes.Length == 3)
			{
			stackerCraneTaskCommand.StartRow = Convert.ToInt16(startCodes[0]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(startCodes[1]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(startCodes[2]);
			}
			else
			{
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"å¥åºä»»å¡èµ·ç¹éè¯¯ï¼èµ·ç¹ï¼ã{task.CurrentAddress}ã");
			return null;
			}
			string[] targetCodes = task.NextAddress.Split("-");
			if (targetCodes.Length == 5)
			{
			stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[1]);
			stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[2]);
			stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[3]);
			}
			else
			{
			//æ°æ®éç½®éè¯¯
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"å¥åºä»»å¡ç»ç¹éè¯¯ï¼ç»ç¹ï¼ã{task.NextAddress}ã");
			return null;
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			string[] targetCodes = task.NextAddress.Split("-");
			if (targetCodes.Length == 3)
			{
			@@ -227,55 +307,31 @@
			else
			{
			//æ°æ®éç½®éè¯¯
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"å¥åºä»»å¡ç»ç¹éè¯¯ï¼èµ·ç¹ï¼ã{task.NextAddress}ã");
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"åºåºä»»å¡ä¸ä¸å°åç¹éè¯¯ï¼èµ·ç¹ï¼ã{task.NextAddress}ã");
			return null;
			}
			//}
			//else
			//{
			// _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°ç«å°ã{task.NextAddress}ãä¿¡æ¯ï¼æ æ³è·åå¯¹åºçå åæºåè´§ç«å°ä¿¡æ¯");
			// return null;
			//}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			//List<Dt_Router> routers = _routerService.QueryNextRoutes(task.Roadway, task.TargetAddress);
			//if (routers.Count > 0)
			string[] sourceCodes = task.CurrentAddress.Split("-");
			if (sourceCodes.Length == 5)
			{
			string[] targetCodes = task.NextAddress.Split("-");

			stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[0]);
			stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
			stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);

			string[] sourceCodes = task.CurrentAddress.Split("-");
			if (sourceCodes.Length == 3)
			{
			stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[0]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
			}
			else
			{
			//æ°æ®éç½®éè¯¯
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"åºåºä»»å¡èµ·ç¹éè¯¯ï¼èµ·ç¹ï¼ã{task.CurrentAddress}ã");
			return null;
			}
			stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[1]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[2]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[3]);
			}
			//else
			//{
			// _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°ç«å°ã{task.NextAddress}ãä¿¡æ¯ï¼æ æ³è·åå¯¹åºçå åæºæ¾è´§ç«å°ä¿¡æ¯");
			// return null;
			//}
			else
			{
			//æ°æ®éç½®éè¯¯
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"åºåºä»»å¡èµ·ç¹éè¯¯ï¼èµ·ç¹ï¼ã{task.CurrentAddress}ã");
			return null;
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			string[] targetCodes = task.NextAddress.Split("-");
			if (targetCodes.Length == 3)
			if (targetCodes.Length == 5)
			{
			stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[0]);
			stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[1]);
			stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[2]);
			stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[1]);
			stackerCraneTaskCommand.EndColumn = Convert.ToInt16(targetCodes[2]);
			stackerCraneTaskCommand.EndLayer = Convert.ToInt16(targetCodes[3]);
			}
			else
			{
			@@ -284,11 +340,11 @@
			return null;
			}
			string[] sourceCodes = task.CurrentAddress.Split("-");
			if (sourceCodes.Length == 3)
			if (sourceCodes.Length == 5)
			{
			stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[0]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[1]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[2]);
			stackerCraneTaskCommand.StartRow = Convert.ToInt16(sourceCodes[1]);
			stackerCraneTaskCommand.StartColumn = Convert.ToInt16(sourceCodes[2]);
			stackerCraneTaskCommand.StartLayer = Convert.ToInt16(sourceCodes[3]);
			}
			else
			{