ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -71,73 +71,98 @@
			DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(R_RgvCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();

			DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(W_RgvCPDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
			Console.WriteLine(DateTime.Now.ToString("yyyy-mm-ddd HH:mm:ss"));
			if (deviceProRead != null && deviceProWrite != null)
			{
			R_RGVCPInfo rgvInfoRead = device.Communicator.ReadCustomer<R_RGVCPInfo>(deviceProRead.DeviceProAddress);
			W_RGVCPInfo rgvInfoWrite = device.Communicator.ReadCustomer<W_RGVCPInfo>(deviceProWrite.DeviceProAddress);
			if (rgvInfoRead==null \|\| rgvInfoWrite==null)
			{
			return Task.CompletedTask;
			}
			if ((rgvInfoRead.Mode == 5 \|\| rgvInfoRead.Mode == 4) && rgvInfoRead.State == 0 && rgvInfoRead.TaskDone==1)
			{
			//è·åä»»å¡ æ¯å¦æRGVæ§è¡çä»»å¡
			List<Dt_Task> tasks = _taskRepository.QueryData(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState != TaskStatusEnum.RGV_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode);
			//è·åä»»å¡

			Dt_Task? task1 = tasks.FirstOrDefault(x => x.HeightType == 1);
			Dt_Task? task2 = tasks.FirstOrDefault(x => x.HeightType == 2);
			Dt_Task? task3 = tasks.FirstOrDefault(x => x.HeightType == 3);
			List<Dt_Task> tasksDown = _taskRepository.QueryData(x => _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.RGV_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode).OrderBy(x=>x.CreateDate).Take(3).ToList();
			//åéRGVå·¥ä½ä»»å¡
			if (tasksDown.Count>=2)
			if (tasksDown.Count>0)
			{
			device.SetValue(W_RgvCPDB.TaskType, 4);
			//å ç¨ä¸¤ä¸ªå·¥ä½
			if (tasksDown.Count==2)
			bool ReceivedDone = false;
			//åéRGVå·¥ä½ä»»å¡å ç¨ä¸ä¸ªå·¥ä½
			if (tasksDown.Count == 1)
			{
			device.SetValue(W_RgvCPDB.WorkStation, 4);
			if (task1 == null)
			{
			//ä¸åæ§è¡å·¥ä½
			device.SetValue(W_RgvCPDB.WorkStation, 1);
			device.SetValue(W_RgvCPDB.WcsTask1, tasksDown[0].TaskNum);
			device.SetValue(W_RgvCPDB.Qu1, tasksDown[0].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang1, tasksDown[0].NextAddress);
			tasksDown[0].HeightType = 1;
			_taskService.UpdateTask(tasksDown[0], TaskStatusEnum.RGV_Executing);
			Thread.Sleep(100);
			ReceivedDone=true;
			}
			if (task2 == null)
			}
			else if (tasksDown.Count == 2)//å ç¨ä¸¤ä¸ªå·¥ä½
			{

			if (task1 == null && task2 == null)
			{
			//ä¸åæ§è¡å·¥ä½
			device.SetValue(W_RgvCPDB.WorkStation, 4);

			device.SetValue(W_RgvCPDB.WcsTask1, tasksDown[0].TaskNum);
			device.SetValue(W_RgvCPDB.Qu1, tasksDown[0].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang1, tasksDown[0].NextAddress);
			tasksDown[0].HeightType = 1;
			_taskService.UpdateTask(tasksDown[0], TaskStatusEnum.RGV_Executing);
			Thread.Sleep(100);
			device.SetValue(W_RgvCPDB.WcsTask2, tasksDown[1].TaskNum);
			device.SetValue(W_RgvCPDB.Qu2, tasksDown[1].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang2, tasksDown[1].NextAddress);
			tasksDown[1].HeightType = 2;
			_taskService.UpdateTask(tasksDown[1], TaskStatusEnum.RGV_Executing);
			Thread.Sleep(100);
			ReceivedDone = true;
			}
			}
			else //å ç¨ä¸ä¸ªå·¥ä½
			{
			device.SetValue(W_RgvCPDB.WorkStation, 7);
			if ( task1 == null)
			if (task1 == null && task2 == null && task3 == null)
			{
			//ä¸åæ§è¡å·¥ä½
			device.SetValue(W_RgvCPDB.WorkStation, 7);

			device.SetValue(W_RgvCPDB.WcsTask1, tasksDown[0].TaskNum);
			device.SetValue(W_RgvCPDB.Qu1, tasksDown[0].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang1, tasksDown[0].NextAddress);
			tasksDown[0].HeightType = 1;
			_taskService.UpdateTask(tasksDown[0], TaskStatusEnum.RGV_Executing);
			}
			if (task2 == null)
			{
			Thread.Sleep(100);
			device.SetValue(W_RgvCPDB.WcsTask2, tasksDown[1].TaskNum);
			device.SetValue(W_RgvCPDB.Qu2, tasksDown[1].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang2, tasksDown[1].NextAddress);
			tasksDown[1].HeightType = 2;
			_taskService.UpdateTask(tasksDown[1], TaskStatusEnum.RGV_Executing);
			}
			if (task3 == null)
			{
			Thread.Sleep(100);
			device.SetValue(W_RgvCPDB.WcsTask3, tasksDown[2].TaskNum);
			device.SetValue(W_RgvCPDB.Qu3, tasksDown[2].CurrentAddress);
			device.SetValue(W_RgvCPDB.Fang3, tasksDown[2].NextAddress);
			tasksDown[2].HeightType = 3;
			_taskService.UpdateTask(tasksDown[2], TaskStatusEnum.RGV_Executing);
			Thread.Sleep(100);
			ReceivedDone = true;
			}
			}
			device.SetValue(W_RgvCPDB.TaskReceivedDone, 1);
			if (ReceivedDone)
			{
			device.SetValue(W_RgvCPDB.TaskType, 4);
			device.SetValue(W_RgvCPDB.TaskReceivedDone, 1);
			}
			}
			}
			else if((rgvInfoRead.Mode == 5 \|\| rgvInfoRead.Mode == 4) && rgvInfoRead.TaskDone == 3)
			@@ -153,11 +178,11 @@
			task.DeviceCode = stationManger.StationDeviceCode;
			device.SetValue(W_RgvCPDB.TaskReceivedDone, 2);
			_taskService.UpdateTask(task, TaskStatusEnum.Line_Execute);
			WriteError(device.DeviceName, $"RGVä»»å¡å®æ,ä»»å¡å·{rgvInfoRead.RgvEndTask}");
			WriteInfo(device.DeviceName, $"RGVä»»å¡å®æ,ä»»å¡å·{rgvInfoRead.RgvEndTask}");
			}
			else
			{
			WriteError(device.DeviceName, $"æªæ¾å°RGVå¯¹åºçç»æä»»å¡{rgvInfoRead.RgvEndTask}");
			WriteInfo(device.DeviceName, $"æªæ¾å°RGVå¯¹åºçç»æä»»å¡{rgvInfoRead.RgvEndTask}");
			}
			}
			else if (rgvInfoRead.TaskDone == 2 && rgvInfoWrite.TaskReceivedDone == 1)