ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -60,22 +60,26 @@
			commonStackerCrane.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡
			if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal && commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
			{
			Dt_Task? task = GetTask(commonStackerCrane);
			if (task != null)
			short stackerError = commonStackerCrane.Communicator.Read<short>("DB1000.54.0");
			if (stackerError == 0)
			{
			StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
			if (stackerCraneTaskCommand != null)
			Dt_Task? task = GetTask(commonStackerCrane);
			if (task != null)
			{
			bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
			if (sendFlag)
			StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
			if (stackerCraneTaskCommand != null)
			{
			commonStackerCrane.LastTaskType = task.TaskType;
			task.Dispatchertime = DateTime.Now;
			task.ExceptionMessage = "";
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Executing);
			commonStackerCrane.Communicator.Write("DB1000.20.0", true);
			//å»¶æ¶1s
			Thread.Sleep(1000);
			bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
			if (sendFlag)
			{
			commonStackerCrane.LastTaskType = task.TaskType;
			task.Dispatchertime = DateTime.Now;
			task.ExceptionMessage = "";
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Executing);
			commonStackerCrane.Communicator.Write("DB1000.20.0", true);
			//å»¶æ¶1s
			Thread.Sleep(1000);
			}
			}
			}
			}
			@@ -112,7 +116,7 @@
			{
			try
			{
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
			Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum && x.TaskState==TaskStatusEnum.SC_Executing.ObjToInt());
			if (task != null)
			{
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			@@ -131,13 +135,14 @@
			WriteError(deviceCode, $"æªæ¾å°è·¯ç±ä¿¡æ¯,{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;
			task.NextAddress = router.NextPosi;
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute);
			//todo å åæºå®æå®æ

			//_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: router.NextPosi, targetAddress: router.NextPosi);
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			WriteInfo(deviceCode, $"å åæºä»»å¡å®æ,ä»»å¡å·:{taskNum}");
			@@ -186,6 +191,7 @@
			{
			if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			//ä¸ä¸ä¸ªä¸ºåºåºåæ¥æ¯å¦åå¨å¥åºä»»å¡ äº¤æ¿æ§è¡
			task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
			if (task == null)
			{
			@@ -194,6 +200,7 @@
			}
			else
			{
			//ä¸ä¸ä¸ªä¸ºå¥åºåæ¥æ¯å¦åå¨åºåºä»»å¡ äº¤æ¿æ§è¡
			task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
			if (task == null)
			{
			@@ -204,6 +211,7 @@

			if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			//å¤æåºåºç«å°å ç¨
			if (OutTaskStationIsOccupied(task) == null)
			{
			bool flag = false;
			@@ -234,18 +242,24 @@
			/// <returns>å¦ææªè¢«å ç¨ï¼è¿åä¼ å¥çä»»å¡ä¿¡æ¯ï¼å¦åï¼è¿ånull</returns>
			private Dt_Task? OutTaskStationIsOccupied([NotNull] Dt_Task task)
			{
			Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress && x.StackerCraneCode == task.DeviceCode);
			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);
			if (device != null)
			{
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode)==3)//åºåºç«å°æªè¢«å ç¨
			short command = client.GetValue<R_ConveyorLineCPDB, short>(R_ConveyorLineCPDB.Command, stationManger.StationCode);
			if (command==3)//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			return task;
			}
			else
			{
			task.ExceptionMessage = "åºåºç«å°æ æ³ä¸å";
			_taskRepository.UpdateData(task);
			}
			}
			else
			@@ -303,7 +317,7 @@
			return null;
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)//å¤ææ¯å¦æ¯åºåºä»»å¡
			{
			string[] targetCodes = task.NextAddress.Split("-");
			if (targetCodes.Length == 3)
			@@ -332,7 +346,7 @@
			return null;
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)//å¤ææ¯å¦æ¯ç§»åºä»»å¡
			{
			string[] targetCodes = task.NextAddress.Split("-");
			if (targetCodes.Length == 5)