ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -145,7 +145,7 @@
			{
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StackerCraneStationCode == task.NextAddress && x.StackerCraneCode == deviceCode);
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == task.NextAddress && x.StackerCraneCode == deviceCode);
			if (stationManger == null)
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"è¾éçº¿åºåºç«ç¹æªéç½®,{task.NextAddress}");
			@@ -163,8 +163,21 @@
			//åæä¸æ¥¼åºåºä¸åçº¿ä½é»è¾
			if (stationManger.StationDeviceCode == "CL1_YL")
			{
			IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManger.StationDeviceCode);
			if (device != null)
			{
			OtherDevice otherDevice = (OtherDevice)device;
			otherDevice.SetValue(WR_CLineYLDB.WR_Task, taskNum, stationManger.StationCode);
			// å åæºå®æ
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute, deviceCode: stationManger.StationDeviceCode, currentAddress: stationManger.StationCode, nextAddress: router.NextPosi);
			}
			else
			{
			WriteError(deviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			}

			}
			else//åæäºæ¥¼åºåºä¸åçº¿ä½é»è¾
			{
			@@ -182,7 +195,7 @@
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			WriteError(deviceCode, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			return WebResponseContent.Instance.Error($"æªæ¾å°åºåºç«å°ã{stationManger.StationDeviceCode}ãå¯¹åºçéè®¯å¯¹è±¡ï¼æ æ³åéè¾éçº¿åºåºä¿¡å·");
			}
			@@ -193,19 +206,23 @@
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup \|\| task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			WriteInfo(deviceCode, $"å åæºä»»å¡å®æ,ä»»å¡å·:{taskNum}");
			_taskService.TaskCompleted(taskNum);
			WebResponseContent responseContent = _taskService.TaskCompleted(taskNum);
			if (!responseContent.Status)
			{
			_taskService.UpdateTaskExceptionMessage(taskNum, $"{responseContent.Message}");
			}
			WriteInfo(deviceCode, $"å åæºå¥åºä»»å¡å®æ,ä»»å¡å·:{taskNum}");
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			WriteError(deviceCode, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			_taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°è¯¥ä»»å¡ç±»ååè°WMSä»»å¡å®ææ¥å£,{task.TaskType}");
			}
			}
			else
			{
			WriteInfo(deviceCode, $"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			WriteError(deviceCode, $"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			return WebResponseContent.Instance.Error($"æªæ¾å°ä»»å¡ä¿¡æ¯,ä»»å¡å·:{taskNum}");
			}

			@@ -301,8 +318,8 @@
			OtherDevice client = (OtherDevice)device;
			if (client.GetValue<WR_CLineYLDB, short>(WR_CLineYLDB.WR_Request, stationManger.StationCode) != 99)//åºåºç«å°æªè¢«å ç¨
			{
			task.NextAddress = stationManger.StackerCraneStationCode;
			_taskRepository.UpdateData(task);
			//task.NextAddress = stationManger.StackerCraneStationCode;
			//_taskRepository.UpdateData(task);
			return task;
			}
			else
			@@ -394,7 +411,8 @@
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)//å¤ææ¯å¦æ¯åºåºä»»å¡
			{
			string[] targetCodes = task.NextAddress.Split("-");
			Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x=>x.StationCode==task.NextAddress && x.StackerCraneCode==task.DeviceCode);
			string[] targetCodes = stationManger.StackerCraneStationCode.Split("-");
			if (targetCodes.Length == 3)
			{
			stackerCraneTaskCommand.EndRow = Convert.ToInt16(targetCodes[0]);