YouLiBang/ZheJiangHanTong.git

			@@ -62,6 +62,11 @@
			if (takePositions.Length != 5)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "åè´§ä½ç½®éè¯¯");
			if (task.ExceptionMessage?.Contains("åè´§ä½ç½®éè¯¯") ?? true)
			{
			task.ExceptionMessage = "åè´§ä½ç½®éè¯¯";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			@@ -69,6 +74,11 @@
			if (putPositions.Length != 5)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "æ¾è´§ä½ç½®éè¯¯");
			if (task.ExceptionMessage?.Contains("æ¾è´§ä½ç½®éè¯¯") ?? true)
			{
			task.ExceptionMessage = "æ¾è´§ä½ç½®éè¯¯";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			@@ -76,17 +86,32 @@
			if (containerItem == null)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "æ¿æå°ºå¯¸è·åéè¯¯");
			if (task.ExceptionMessage?.Contains("æ¿æå°ºå¯¸è·åéè¯¯") ?? true)
			{
			task.ExceptionMessage = "æ¿æå°ºå¯¸è·åéè¯¯";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (!LightStatusStorage.StationStautsDic.TryGetValue(putPositions[0],out bool stationStatus))
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", $"å·¥ä½ã{putPositions[0]}ãææ å«æ¿æ°æ®éè¯¯,{LightStatusStorage.StationStautsDic.Serialize()}");
			if (task.ExceptionMessage?.Contains($"å·¥ä½ã{putPositions[0]}ãææ å«æ¿æ°æ®éè¯¯") ?? true)
			{
			task.ExceptionMessage = $"å·¥ä½ã{putPositions[0]}ãææ å«æ¿æ°æ®éè¯¯";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}
			if (!stationStatus)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", $"å·¥ä½ã{putPositions[0]}ãæ å«æ¿,{LightStatusStorage.StationStautsDic.Serialize()}");
			if (task.ExceptionMessage?.Contains($"å·¥ä½ã{putPositions[0]}ãæ å«æ¿") ?? true)
			{
			task.ExceptionMessage = $"å·¥ä½ã{putPositions[0]}ãæ å«æ¿";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			@@ -96,7 +121,12 @@

			if (OPositions.HPositions[takePositions[0]].PositionZ == 0)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "åè´§Zåæ è¯»åä¸º0");
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "è¯»ååè´§Zåæ è¯»åä¸º0");
			if (task.ExceptionMessage?.Contains($"è¯»ååè´§Zåæ è¯»åä¸º0") ?? true)
			{
			task.ExceptionMessage = $"è¯»ååè´§Zåæ è¯»åä¸º0";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			@@ -108,7 +138,12 @@

			if (OPositions.HPositions[takePositions[0]].PositionZ == 0)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "æ¾è´§Zåæ è¯»åä¸º0");
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "è¯»åæ¾è´§Zåæ è¯»åä¸º0");
			if (task.ExceptionMessage?.Contains($"è¯»åæ¾è´§Zåæ è¯»åä¸º0") ?? true)
			{
			task.ExceptionMessage = $"è¯»åæ¾è´§Zåæ è¯»åä¸º0";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}
			int putPoR = 0;
			@@ -140,6 +175,11 @@
			else
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "Råæ éè¯¯");
			if (task.ExceptionMessage?.Contains($"Råæ éè¯¯") ?? true)
			{
			task.ExceptionMessage = $"Råæ éè¯¯";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}
			}
			@@ -164,6 +204,11 @@
			if(devicePro == null)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}", "è®¾å¤åè®®åæ°éè¯¯ï¼æªæ¾å°æå¤§æå°åæ å°å");
			if (task.ExceptionMessage?.Contains($"è®¾å¤åè®®åæ°éè¯¯ï¼æªæ¾å°æå¤§æå°åæ å°å") ?? true)
			{
			task.ExceptionMessage = $"è®¾å¤åè®®åæ°éè¯¯ï¼æªæ¾å°æå¤§æå°åæ å°å";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}
			int[] data = otherDevice.Communicator.Read<int>(devicePro.DeviceProAddress, (ushort)(devicePros.Count));
			@@ -190,48 +235,88 @@
			if (takePoX < minX \|\| takePoX > maxX)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Xåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}");
			if (task.ExceptionMessage?.Contains($"Xåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}") ?? true)
			{
			task.ExceptionMessage = $"Xåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (putPoX < minX \|\| putPoX > maxX)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Xæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}");
			if (task.ExceptionMessage?.Contains($"Xæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}") ?? true)
			{
			task.ExceptionMessage = $"Xæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoX},æå¤§å¼ï¼{maxX},æå°å¼ï¼{minX}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (takePoY < minY \|\| takePoY > maxY)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Yåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}");
			if (task.ExceptionMessage?.Contains($"Yåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}") ?? true)
			{
			task.ExceptionMessage = $"Yåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (putPoY < minY \|\| putPoY > maxY)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Yæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}");
			if (task.ExceptionMessage?.Contains($"Yæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}") ?? true)
			{
			task.ExceptionMessage = $"Yæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoY},æå¤§å¼ï¼{maxY},æå°å¼ï¼{minY}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (takePoZ < minZ \|\| takePoZ > maxZ)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Zåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}");
			if (task.ExceptionMessage?.Contains($"Zåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}") ?? true)
			{
			task.ExceptionMessage = $"Zåè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (putPoZ < minZ \|\| putPoZ > maxZ)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Zæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}");
			if (task.ExceptionMessage?.Contains($"Zæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}") ?? true)
			{
			task.ExceptionMessage = $"Zæ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoZ},æå¤§å¼ï¼{maxZ},æå°å¼ï¼{minZ}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (takePoR < minR \|\| takePoR > maxR)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Råè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}");
			if (task.ExceptionMessage?.Contains($"Råè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}") ?? true)
			{
			task.ExceptionMessage = $"Råè´§åæ è¶åºèå´,åè´§åæ ï¼{takePoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}

			if (putPoR < minR \|\| putPoR > maxR)
			{
			WriteError($"{otherDevice.DeviceCode}-{otherDevice.DeviceName}-åæ ", $"Ræ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}");
			if (task.ExceptionMessage?.Contains($"Ræ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}") ?? true)
			{
			task.ExceptionMessage = $"Ræ¾è´§åæ è¶åºèå´,åè´§åæ ï¼{putPoR},æå¤§å¼ï¼{maxR},æå°å¼ï¼{minR}";
			_taskRepository.UpdateData(task);
			}
			return Task.CompletedTask;
			}
			#endregion