MeiRuiAn/HuaiAn.git

			@@ -93,8 +93,9 @@
			task.Dispatchertime = DateTime.Now;
			task.ExceptionMessage = "";
			_taskService.UpdateTask(task, TaskStatusEnum.SC_Executing);

			commonStackerCrane.Communicator.Write("DB105.54", (short)1);
			//å»¶æ¶1s
			Thread.Sleep(1000);
			}
			}
			}
			@@ -148,7 +149,7 @@
			task.TaskState = TaskStatusEnum.Line_Execute.ObjToInt();
			task.CurrentAddress = stationManger.StationCode;
			_taskRepository.UpdateData(task);
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ï¼ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"ç³»ç»èªå¨æµç¨,ä»»å¡ç¶æä»ã{oldStatus}ãè½¬å°ã{task.TaskState}ã");
			//todo å®æ
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup \|\| task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			@@ -214,7 +215,7 @@
			if (OutTaskStationIsOccupied(task) == null)
			{
			bool flag = false;
			List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
			List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress, task.TaskType).Select(x => x.ChildPosi).ToList();
			List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);
			foreach (var item in tasks)
			{
			@@ -233,7 +234,7 @@

			if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
			string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.WMSIsReloaction.ToString())?.ApiAddress;
			if (string.IsNullOrEmpty(url))
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			@@ -241,7 +242,7 @@
			_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"æªæ¾å°WMSç§»åºå¤ææ¥å£");
			return null;
			}
			HttpHelper.Post($"{url}?taskNum={task.TaskNum}&locationCode={task.NextAddress}", "");//todo è°ç¨WMSä»»å¡å®ææ¹æ³
			//HttpHelper.Post($"{url}?taskNum={task.TaskNum}&locationCode={task.NextAddress}", "");//todo è°ç¨WMSä»»å¡å®ææ¹æ³
			}

			return task;
			@@ -261,7 +262,8 @@
			if (device != null)
			{
			OtherDevice client = (OtherDevice)device;
			if (!client.GetValue<R_ConveyorLineDB, bool>(R_ConveyorLineDB.Goods, stationManger.StationCode))//åºåºç«å°æªè¢«å ç¨
			bool ReadGood = client.GetValue<R_ConveyorLineDB, bool>(R_ConveyorLineDB.Goods, stationManger.StationCode);
			if (!ReadGood)//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);