WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -26,6 +26,10 @@
			using System.Net;
			using System.Threading;
			using System.IO;
			using GZ.Device.Agv;
			using System.Net.NetworkInformation;
			using System.Windows.Documents;
			using System.Text.RegularExpressions;

			namespace GZ.Projects.AuxAllWCS
			{
			@@ -125,6 +129,137 @@
			}
			}


			public void ThreaTotal(Tag tag, Device device)
			{
			List<Task> tasks = new List<Task>();
			tasks.Add(GetTask(delegate (Tag tag1, Device device1)
			{
			try
			{
			// foreach (var ip in new List<string> {
			// device1.påé£ç§1ä¸çº¿.Config.IP,
			// device1.påé£ç§2ä¸çº¿.Config.IP,
			// device1.Då®å1å·æºæ¢°æ.Config.IP,
			// device1.Då®å2å·æºæ¢°æ.Config.IP,
			// device1.Jsæ·é¡º1.Config.IP,
			// device1.Jsæ·é¡º2.Config.IP,
			// device1.ç»´å¸å°æè1.Config.IP,
			// device1.ç»´å¸å°æè2.Config.IP,
			// device1.RGV.Config.IP,
			// device1.S1002Read.Config.IP,
			// device1.S2001Read.Config.IP,
			// device1.S3001Read.Config.IP
			//})
			// {
			// string pattern = @"\b(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\.(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\.(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\.(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\b";

			// var matches = Regex.Match(ip, pattern);
			// if (matches.Success)
			// {
			// var b = IsMachineOnline(matches.Value);
			// if (!Iponlines.ContainsKey(ip))
			// {
			// Iponlines.TryAdd(ip, b);
			// }
			// else
			// Iponlines[ip] = b;
			// }
			// }
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}

			}, tag, device, 3000));
			tasks.Add(GetTask(ThreadMXC3, tag, 3000));
			tasks.Add(GetTask(ThreadMXC4, tag, 3000));
			//tasks.Add(GetTask(ResetGats, tag, 3000));

			tasks.Add(GetTask(sa1022, tag, 3000));
			tasks.Add(GetTask(sa1025, tag, 3000));
			tasks.Add(GetTask(sa1030, tag, 3000));
			tasks.Add(GetTask(sa2001, tag, 3000));
			tasks.Add(GetTask(sa2030, tag, 3000));
			tasks.Add(GetTask(sa2008, tag, 3000));
			//tasks.Add(GetTask(sa3001, tag, 3000));
			//tasks.Add(GetTask(sa3005, tag, 3000));
			//tasks.Add(GetTask(sa3006, tag, 3000));
			//tasks.Add(GetTask(sa3010, tag, 3000));

			Task.WaitAll(tasks.ToArray());
			}

			public static ConcurrentDictionary<string, bool> Iponlines = new ConcurrentDictionary<string, bool>();
			public bool IsMachineOnline(string hostNameOrIp, int timeout = 1000)
			{
			//device.påé£ç§1ä¸çº¿.Config.IP
			LogHelper.Info("æ£æµip:>" + hostNameOrIp, "IPå¨çº¿æ£æµ");
			bool res = false;
			try
			{
			using (var ping = new Ping())
			{
			var reply = ping.Send(hostNameOrIp, timeout);
			res = reply.Status == IPStatus.Success;
			}
			}
			catch (PingException)
			{
			res = false;
			}
			catch (Exception)
			{
			// å¶ä»å¼å¸¸å¤ç
			res = false;
			}
			finally
			{
			LogHelper.Info("æ£æµip:>" + hostNameOrIp + " ç»æï¼" + (res ? "é" : "ä¸é"), "IPå¨çº¿æ£æµ");
			}
			return res;
			}

			private Task GetTask(Action<Tag> action, Tag tag, int i = 2500)
			{
			var task = Task.Run(() =>
			{
			while (true)
			{
			try
			{
			action(tag);
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}
			Thread.Sleep(i);
			}
			});
			return task;
			}

			private Task GetTask(Action<Tag, Device> action, Tag tag, Device dev, int i = 2500)
			{
			var task = Task.Run(() =>
			{
			while (true)
			{
			try
			{
			action(tag, dev);
			}
			catch (Exception ex)
			{
			LogHelper.Error(ex.Message, ex);
			}
			Thread.Sleep(i);
			}
			});
			return task;
			}
			public string WriteLine(string value = "")
			{

			@@ -147,6 +282,7 @@

			if (VERX != null)
			{
			LogHelper.Info($"{VERX.deviceName}æ¶é´æ³ {RedisHelper.Get<string>("Jsæ·é¡º1#Timestamp", out string mg)} D1212>{tag.Js1.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
			if (tag.Js1.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 1)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			@@ -165,7 +301,9 @@
			if (tag.Js1.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 0)
			{
			//tag.Js1.D1212_LAST = 0;
			tag.Js1.D1224 = 0;
			RedisHelper.Add($"Jsæ·é¡º1.D1202_LAST", "0", out string msg);
			//Conn.é»è®¤Redis.SetValue("Jsæ·é¡º1.D1224", "0", VERX.deviceName + "Queue");
			}

			if (tag.Js1.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 1)
			@@ -186,6 +324,7 @@
			if (tag.Js1.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js1.D1212, 3) == 0)
			{
			//tag.Js1.D1213_LAST = 0;
			tag.Js1.D1225 = 0;
			RedisHelper.Add($"Jsæ·é¡º1.D1203_LAST", "0", out string msg);
			}
			}
			@@ -201,6 +340,8 @@

			if (VERX != null)
			{
			LogHelper.Info($"{VERX.deviceName} æ¶é´æ³ {RedisHelper.Get<string>("Jsæ·é¡º2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");

			if (tag.Js2.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 1)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			@@ -218,7 +359,7 @@
			if (tag.Js2.D1212_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 0)
			{
			//tag.Js2.D1212_LAST = 0;

			tag.Js2.D1224 = 0;
			RedisHelper.Add($"Jsæ·é¡º2.D1202_LAST", "0", out string msg);
			}
			if (tag.Js2.D1213_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 3) == 1)
			@@ -239,7 +380,7 @@
			if (tag.Js2.D1213_LAST == 1 && TcpServer.GetBitdata(tag.Js2.D1213, 2) == 0)
			{
			//tag.Js2.D1213_LAST = 0;

			tag.Js2.D1225 = 0;
			RedisHelper.Add($"Jsæ·é¡º2.D1203_LAST", "0", out string msg);
			}
			}
			@@ -255,6 +396,8 @@

			if (VERX != null)
			{
			if (tag.wxr1.R44)
			LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R44} R44LAST>{tag.wxr1.R44_LAST} R10>{tag.wxr1.R10}");
			if (tag.wxr1.R44 && !tag.wxr1.R44_LAST && tag.wxr1.R10)
			{
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			@@ -293,16 +436,21 @@
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			{
			//ä¸æ¥æ ¡éªã
			LogHelper.Info($"{VERX.deviceNo[0]} ä¸æ¥æ ¡éª>{traycode}");

			///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
			{
			sceneType = 1,
			cntrCode = traycode,
			}));
			if (str.Contains("true"))
			var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
			if (strr != null && strr.success)
			//if (str.Contains("true"))
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr1.R10 = true;
			//tag.wxr1.R10 = true;
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
			//tag.wxr1.R44_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R44_LAST", "false", out string msg);
			}
			@@ -312,6 +460,10 @@
			}
			}
			else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
			}
			else if (!tag.wxr1.R10)
			{
			TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
			}
			}
			}
			@@ -328,6 +480,8 @@

			if (VERX != null)
			{
			if (tag.wxr1.R46)
			LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr1.R46} R46LAST>{tag.wxr1.R46_LAST} R11>{tag.wxr1.R11}");
			if (tag.wxr1.R46 && !tag.wxr1.R46_LAST && tag.wxr1.R11)
			{
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			@@ -365,16 +519,20 @@
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			{
			//ä¸æ¥æ ¡éªã
			LogHelper.Info($"{VERX.deviceNo[1]} ä¸æ¥æ ¡éª>{traycode}");
			///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
			{
			sceneType = 1,
			cntrCode = traycode,
			}));
			if (str.Contains("true"))
			var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
			if (strr != null && strr.success)
			//if (str.Contains("true"))
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr1.R11 = true;
			//tag.wxr1.R11 = true;
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
			//tag.wxr1.R46_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R46_LAST", "false", out string msg);
			}
			@@ -384,6 +542,10 @@
			}
			}
			else { TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
			}
			else if (!tag.wxr1.R11)
			{
			TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
			}
			}
			}
			@@ -400,6 +562,8 @@

			if (VERX != null)
			{
			if (tag.wxr2.R44)
			LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R44} R44LAST>{tag.wxr2.R44_LAST} R10>{tag.wxr2.R10}");
			if (tag.wxr2.R44 && !tag.wxr2.R44_LAST && tag.wxr2.R10)
			{
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			@@ -437,16 +601,20 @@
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			{
			//ä¸æ¥æ ¡éªã
			LogHelper.Info($"{VERX.deviceNo[0]} ä¸æ¥æ ¡éª>{traycode}");
			///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
			{
			sceneType = 1,
			cntrCode = traycode,
			}));
			if (str.Contains("true"))
			var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
			if (strr != null && strr.success)
			//if (str.Contains("true"))
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr2.R10 = true;
			//tag.wxr2.R10 = true;
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + ".R10", "true", VERX.deviceName + "Queue");
			//tag.wxr2.R44_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R44_LAST", "false", out string msg);
			}
			@@ -456,6 +624,10 @@
			}
			}
			else { TcpServer.TcpServerSend(VERX.deviceNo[0], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E")); }
			}
			else if (!tag.wxr2.R10)
			{
			TcpServer.TrayIps.Remove(VERX.deviceNo[0]);
			}
			}
			}
			@@ -473,6 +645,8 @@

			if (VERX != null)
			{
			if (tag.wxr2.R46)
			LogHelper.Info($"{VERX.deviceName} R46>{tag.wxr2.R46} R46LAST>{tag.wxr2.R46_LAST} R11>{tag.wxr2.R11}");
			if (tag.wxr2.R46 && !tag.wxr2.R46_LAST && tag.wxr2.R11)
			{
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			@@ -494,7 +668,7 @@
			}
			else
			{
			TcpServer.TcpServerSend(VERX.deviceNo[2], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
			TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
			}
			}
			else
			@@ -511,7 +685,7 @@
			else
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode) && !string.IsNullOrEmpty(traycode.Trim()))
			{
			LogHelper.Info($"Threadwxr2R ä¸æ¥æ ¡éª>{traycode}");
			LogHelper.Info($"{VERX.deviceNo[1]} ä¸æ¥æ ¡éª>{traycode}");
			//ä¸æ¥æ ¡éªã
			///var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/202", requestJson);
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
			@@ -519,12 +693,17 @@
			sceneType = 1,
			cntrCode = traycode,
			}));
			if (str.Contains("true"))
			var strr = JsonConvert.DeserializeObject<Mesrespone>(str);
			if (strr != null && strr.success)
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr2.R11 = true;
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R11", "true", "ç»´å¸å°æè1Queue");
			//tag.wxr2.R11 = true;

			LogHelper.Info($"Threadwxr2Rãã -åR11 true");
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + ".R11", "true", VERX.deviceName + "Queue");
			//tag.wxr2.R46_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R46_LAST", "false", out string msg);
			LogHelper.Info($"Threadwxr2Rãã æ ¡éªä¸æå®æã");
			}
			else
			{
			@@ -536,6 +715,10 @@
			LogHelper.Info($"Threadwxr2Rãã -åéæ«ç ");
			TcpServer.TcpServerSend(VERX.deviceNo[1], GZ.Device.PLC.PlcHelper.Hex2Bin("544F4E"));
			}
			}
			else if (!tag.wxr2.R11)
			{
			TcpServer.TrayIps.Remove(VERX.deviceNo[1]);
			}
			}
			}
			@@ -598,39 +781,56 @@

			LogHelper.Info($"æ¥çRGV çµéï¼ã{tag.RGV.Rå½åçµé}ã åçµç¶æï¼ã{tag.RGV.Råçµç¶æ}ã æéä»£ç ï¼ã{tag.RGV.RgvrunError}ã æå¨1èªå¨2ã{tag.RGV.Ræå¨1èªå¨2}ã");

			if (tag.RGV.Råçµç¶æ == 1)
			{
			LogHelper.Info($"RGV åçµæ¨¡å¼ï¼ä¸ç¨ç®¡ã");
			return;
			}
			if (tag.RGV.Ræå¨1èªå¨2 == 1)
			{
			LogHelper.Info($"RGV æå¨æ¨¡å¼ï¼ä¸ç¨ç®¡ã");
			return;
			}
			if (tag.RGV.RgvrunError > 0)
			{
			LogHelper.Info($"RGV æéï¼ä¸ç¨ç®¡ã");
			return;
			}
			LogHelper.Info($"RGV125å½ä»¤æ¥ç Rgvä»»å¡æ°æ® å workmode:{tag.RGV.workMod} taskmod{tag.RGV.taskmod} t1No:{tag.RGV.taskno1} t1do:{tag.RGV.task1do} t2No:{tag.RGV.taskno2} t2do:{tag.RGV.task2do} taskend:{tag.RGV.taskend} ");
			if (tag.RGV.taskend == 125)
			{
			LogHelper.Info($"RGV æ125å½ä»¤æªæ§è¡ã");
			LogHelper.Info($"RGV æ125å½ä»¤æªæ§è¡ã ");

			if (tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No)
			{
			LogHelper.Info($"RGV125å½ä»¤æªæ§è¡ tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No èªå¨æ¸é¤125");
			Conn.é»è®¤Redis.SetValue("RGV.taskend", "0", "RGVQueue", false);
			}
			System.Threading.Thread.Sleep(3000);
			return;
			}
			LogHelper.Info($"ä»»å¡ä¸å Rgv ä»»å¡ è¿å¥ Rgvä¿¡æ¯ W1ç¶æ{tag.RGV.w1status} ReadTask1No>{tag.RGV.ReadTask1No} bit1taskOver>{tag.RGV.bit1taskOver} W2ç¶æ{tag.RGV.w2status} ReadTask2No>{tag.RGV.ReadTask2No} bit2taskOver>{tag.RGV.bit2taskOver}");
			LogHelper.Info($"ä»»å¡ä¸å Rgvä»»å¡æ°æ® è¯» W1ç¶æ{tag.RGV.w1status} ReadTask1No>{tag.RGV.ReadTask1No} 1å·¥ä½æ¡ç :{tag.RGV.bit1Code} bit1taskOver>{tag.RGV.bit1taskOver} W2ç¶æ{tag.RGV.w2status} ReadTask2No>{tag.RGV.ReadTask2No} 2å·¥ä½æ¡ç :{tag.RGV.bit2Code} bit2taskOver>{tag.RGV.bit2taskOver}");
			TaskEntity task1 = null;
			TaskEntity task2 = null;
			var task1Isrun = false;
			if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
			{
			var taskno = tag.RGV.ReadTask1No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task1 != null && task1.S_B_STATE != "å®æ")
			task1Isrun = true;
			//var taskno = tag.RGV.ReadTask1No;
			//string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			//task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			//if (task1 != null && task1.S_B_STATE != "å®æ")
			task1Isrun = true;
			//if (tag.RGV.bit1taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
			}
			var task2Isrun = false;
			if (tag.RGV.ReadTask2No > 0 && tag.RGV.bit2taskOver != 1)
			{
			var taskno = tag.RGV.ReadTask2No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task2 != null && task2.S_B_STATE != "å®æ")
			task2Isrun = true;
			//var taskno = tag.RGV.ReadTask2No;
			//string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			//task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			//if (task2 != null && task2.S_B_STATE != "å®æ")
			task2Isrun = true;
			//if (tag.RGV.bit2taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
			}
			@@ -671,7 +871,7 @@
			task1.S_B_STATE = "åè´§å®æ";
			}
			//tag.RGV.bit1taskOver = 0;
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{task1.S_TASK_NO} ç¶æåæ¢ä¸º{task1.S_B_STATE}");
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{task1.S_TASK_NO} æ¡ç ï¼{tag.RGV.bit1Code} ç¶æåæ¢ä¸º{task1.S_B_STATE}");
			//tag.RGV.bit1taskOver_LAST = 1;
			RedisHelper.Add($"RGV.bit1taskOver_LAST", "1", out string msg);
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡åå¤ç");
			@@ -713,7 +913,7 @@
			task2.S_B_STATE = "åè´§å®æ";
			}
			//tag.RGV.bit2taskOver = 0;
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡{task2.S_TASK_NO} ç¶æåæ¢ä¸º{task2.S_B_STATE}");
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡{task2.S_TASK_NO} æ¡ç ï¼{tag.RGV.bit2Code} ç¶æåæ¢ä¸º{task2.S_B_STATE}");
			RedisHelper.Add($"RGV.bit2taskOver_LAST", "1", out string msg);
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡åå¤ç");
			taskservice.Update(task2);
			@@ -739,9 +939,22 @@
			// var b = RedisHelper.Remove("RGVQueue", out rev);
			// }
			//}
			var tklistall = taskservice.FindList(x => x.S_B_STATE != "å®æ" && x.S_B_STATE != "åæ¶" && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
			var tklist = tklistall.FindAll(x => x.S_B_STATE == "æªæ§è¡");
			var tkunNormal = tklistall.Except(tklist);
			if (tkunNormal.Any())
			foreach (var tk in tkunNormal)
			{
			if (tk.S_TASK_NO != task1?.S_TASK_NO && tk.S_TASK_NO != task2?.S_TASK_NO)
			{
			tk.S_B_STATE = "åæ¶";
			tk.S_NOTE = "ä¸å¨æ§è¡éåä¸,åæ¶";
			taskservice.Update(tk);
			}
			}

			///1 æè´§ å°±2 åã 1 æ²¡è´§ å°±2 å¸è´§ï¼ é½æè´§ å°±1å¸è´§ã é½æ²¡è´§ å°±1å¸
			var tklist = taskservice.FindList(x => x.S_B_STATE == "æªæ§è¡" && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
			// taskservice.FindList(x => x.S_B_STATE == "æªæ§è¡" && x.S_WORK_MODE == "RGV").OrderBy(x => x.T_CREATE).ToList();
			if (task1 != null && task1.S_B_STATE != "å®æ") //1æä»»å¡
			{
			if (task2 != null && task2.S_B_STATE != "å®æ")// 1 æä»»å¡ 2 æä»»å¡ã
			@@ -851,7 +1064,7 @@

			if (tag.RGV.bit1taskOver == 1)
			tag.RGV.bit1taskOver = 0;
			LogHelper.Info($"{task1.S_TASK_NO}> taskend å 0");
			LogHelper.Info($"{task1.S_TASK_NO}> taskend å 125");
			Conn.é»è®¤Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);
			LogHelper.Info($"{task1.S_TASK_NO}> bit1taskOver_LAST å 0");
			RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
			@@ -954,14 +1167,39 @@
			var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
			TaskActRepository taskActRepository = new TaskActRepository();
			TaskRepository taskRepository = new TaskRepository();
			var requires = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE);
			foreach (var item in requires)
			var requires1 = taskActRepository.FindList(x => taskCOdes.Contains(x.S_ACTION_CODE) && x.N_CREATEMETHOD == 0).OrderBy(x => x.T_CREATE).ToList();
			var timeMorhours = requires1.FindAll(x => DateTime.Now.Subtract(x.T_CREATE).TotalHours > 1);
			if (timeMorhours.Any())
			{
			foreach (var mor in timeMorhours)
			{
			mor.N_CREATEMETHOD = 2;
			mor.S_REVIEW_COMMENT = "è¶æ¶ä¸å¤ç";
			taskActRepository.Update(mor);
			}
			requires1 = requires1.Except(timeMorhours).ToList();
			}
			foreach (var requires in requires1.GroupBy(x => x.S_TASK_NO))
			//foreach (var item in requires)
			{
			var rsss = requires.ToList();
			var item = rsss.OrderBy(x => x.S_ACTION_CODE.Contains("release") ? 0 : 1).LastOrDefault();
			if (rsss.Count > 1)
			{
			rsss.Remove(item);
			foreach (var mor in rsss)
			{
			mor.N_CREATEMETHOD = 3;
			mor.S_REVIEW_COMMENT = "å¤ä½ä¸å¤ç";
			taskActRepository.Update(mor);
			}
			}
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE}åæ å¤ç =================> ");
			var tin = taskCOdes.IndexOf(item.S_ACTION_CODE);
			if (tin == -1)
			{
			item.N_CREATEMETHOD = -1;
			item.S_REVIEW_COMMENT = $"ä¿¡å·æªç¥{item.S_ACTION_CODE}ä¸å¤ç";
			taskActRepository.Update(item);
			continue;
			}
			@@ -969,6 +1207,7 @@
			if (task == null)
			{
			item.N_CREATEMETHOD = -1;
			item.S_REVIEW_COMMENT = $"ä»»å¡ä¸¢å¤±ä¸å¤ç";
			taskActRepository.Update(item);
			continue;
			}
			@@ -992,71 +1231,310 @@
			//è½¦èµ°äº å¼åæ
			if (!goin)
			{
			if (dev.deviceType == 1)
			if (dev.deviceType == 4)
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤ç =================> ");
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue", false);
			LogHelper.Info($"è½¦ç¦»å¼è¾éçº¿äº¤äº> {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} SSX AGV äº¤äºããã");
			switch (loc)
			{
			case "1019":
			{
			SetRedistoPlc("A1019åè´§äº¤äº.SOver", "true", "A1019åè´§äº¤äºQueue", "agv åè´§å®æåå®æäº¤äº");
			}
			break;
			case "1030":
			{
			SetRedistoPlc("A1030åè´§äº¤äº.SOver", "true", "A1030åè´§äº¤äºQueue", "agv åè´§å®æåå®æäº¤äº");
			}
			break;
			case "2030":
			{
			SetRedistoPlc("A2030åè´§äº¤äº.SOver", "true", "A2030åè´§äº¤äºQueue", "agv åè´§å®æåå®æäº¤äº");
			}
			break;
			case "3005":
			{
			SetRedistoPlc("A3005åè´§äº¤äº.SOver", "true", "A3005åè´§äº¤äºQueue", "agv åè´§å®æåå®æäº¤äº");
			}
			break;
			case "3010":
			{
			SetRedistoPlc("A3010åè´§äº¤äº.SOver", "true", "A3010åè´§äº¤äºQueue", "agv åè´§å®æåå®æäº¤äº");
			}
			break;
			//}
			//switch (loc)
			//{
			case "1022":
			{
			SetRedistoPlc("A1022æ¾è´§äº¤äº.SOver", "true", "A1022æ¾è´§äº¤äºQueue", "agv æ¾è´§å®æåå®æäº¤äº");
			}
			break;
			case "1025":
			{
			SetRedistoPlc("A1025æ¾è´§äº¤äº.SOver", "true", "A1025æ¾è´§äº¤äºQueue", "agv æ¾è´§å®æåå®æäº¤äº");
			}
			break;
			case "2001":
			{
			SetRedistoPlc("A2001æ¾è´§äº¤äº.SOver", "true", "A2001æ¾è´§äº¤äºQueue", "agv æ¾è´§å®æåå®æäº¤äº");
			tag.SA2001.wTaskNo = 20012007;
			tag.SA2001.wEbit = 2007;
			tag.SA2001.wæçç = TaskProcess.GenerateTaskNo("èææçå·").Substring(3);
			}
			break;
			case "3001":
			{
			SetRedistoPlc("A3001æ¾è´§äº¤äº.SOver", "true", "A3001æ¾è´§äº¤äºQueue", "agv æ¾è´§å®æåå®æäº¤äº");
			}
			break;
			case "3006":
			{
			SetRedistoPlc("A3006æ¾è´§äº¤äº.SOver", "true", "A3006æ¾è´§äº¤äºQueue", "agv æ¾è´§å®æåå®æäº¤äº");
			}
			break;
			}
			}
			else if (dev.deviceType == 2)
			else
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤ç =================> ");
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue"));
			if (dev.deviceType == 1)
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤ç =================> ");
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue", false);
			}
			else if (dev.deviceType == 2)
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤ç =================> ");
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue"));

			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "0", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "0", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "1", dev.deviceName + "Queue");
			}
			else if (dev.deviceType == 5)
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤ç =================> ");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "1", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "0", dev.deviceName + "Queue");
			}
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤çå®æ =================> ");
			}
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å¼å¯åæ å¤çå®æ =================> ");

			item.N_CREATEMETHOD = 1;
			item.S_REVIEW_COMMENT = $"åæ å¼å¯å®æ";
			taskActRepository.Update(item);
			}
			//è½¦è¦è¿å¥äº¤äºã
			else
			{
			if (dev.deviceType == 1)
			if (dev.deviceType == 4)
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å³éåæ å¤ç =================> ");
			var tf = Conn.é»è®¤Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//è¯»å³éç¶æ
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} åæ å³éä¿¡å·{tf}");
			if (tf?.ToLower() == "true")
			LogHelper.Info($"è½¦è¯·æ±è¾éçº¿äº¤äº> {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} SSX AGV äº¤äºããã");
			//tag.SA1019.Sagverr
			switch (loc)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			case "1019":
			{
			if (tag.SA1019.SreadCan)
			{
			LogHelper.Info($"1019 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1019åè´§äº¤äº.Ssetreq", "true", "A1019åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1019.StaskMode = 1;
			}
			}
			break;
			case "1030":
			{
			if (tag.SA1030.SreadCan)
			{
			LogHelper.Info($"1030 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1030åè´§äº¤äº.Ssetreq", "true", "A1030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1030.StaskMode = 1;
			}
			}
			break;
			case "2030":
			{
			if (tag.SA2030.SreadCan)
			{
			LogHelper.Info($"2030 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2030åè´§äº¤äº.Ssetreq", "true", "A2030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2030.StaskMode = 1;
			}
			}
			break;
			case "3005":
			{
			if (tag.ssxè¾éçº¿.s3005.SreadCan)
			{
			LogHelper.Info($"3005 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3005åè´§äº¤äº.Ssetreq", "true", "A3005åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3005.StaskMode = 1;
			}
			}
			break;
			case "3010":
			{
			if (tag.ssxè¾éçº¿.s3010.SreadCan)
			{
			LogHelper.Info($"3010 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3010åè´§äº¤äº.Ssetreq", "true", "A3010åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3010.StaskMode = 1;
			}
			}
			break;
			//}
			//switch (loc)
			//{
			case "1022":
			{
			if (tag.SA1022.SreadCan)
			{
			LogHelper.Info($"1022 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1022æ¾è´§äº¤äº.Ssetreq", "true", "A1022æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1022.StaskMode = 2;
			}
			}
			break;
			case "1025":
			{
			if (tag.SA1025.SreadCan)
			{
			LogHelper.Info($"1025 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1025æ¾è´§äº¤äº.Ssetreq", "true", "A1025æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1025.StaskMode = 2;
			}
			}
			break;
			case "2001":
			{
			if (tag.SA2001.SreadCan)
			{
			LogHelper.Info($"2001 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2001æ¾è´§äº¤äº.Ssetreq", "true", "A2001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2001.StaskMode = 2;
			}
			}
			break;
			case "3001":
			{
			if (tag.ssxè¾éçº¿.s3001.SreadCan)
			{
			LogHelper.Info($"3001 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3001æ¾è´§äº¤äº.Ssetreq", "true", "A3001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3001.StaskMode = 2;
			}
			}
			break;
			case "3006":
			{
			if (tag.ssxè¾éçº¿.s3006.SreadCan)
			{
			LogHelper.Info($"3006 è¯»å°è¾éçº¿åè®¸ã");
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3006æ¾è´§äº¤äº.Ssetreq", "true", "A3006æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3006.StaskMode = 2;
			}
			}
			break;
			}
			else
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
			}
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å³éåæ å¤çå®æ =================> ");
			}
			else if (dev.deviceType == 2)
			else
			{
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å³éåæ å¤ç =================> ");
			var tf = Conn.é»è®¤Redis.GetValue(dev.deviceName + ".D1202");
			int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
			int close = TcpServer.GetBitdata(numm, (V ? 0 : 1));
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} åæ å³éä¿¡å·{close}");
			if (close == 1)
			if (dev.deviceType == 1)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			var tf = Conn.é»è®¤Redis.GetValue(dev.deviceName + "." + (V ? "R50" : "R52"));//è¯»å³éç¶æ
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} åæ å³éä¿¡å·{tf}");
			if (tf?.ToLower() == "true")
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			}
			else
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
			}
			}
			else
			else if (dev.deviceType == 2)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "0", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");
			var tf = Conn.é»è®¤Redis.GetValue(dev.deviceName + ".D1202");
			int numm = int.Parse(string.IsNullOrEmpty(tf) ? "0" : tf);
			int close = TcpServer.GetBitdata(numm, (V ? 0 : 1));
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} åæ å³éä¿¡å·{close}");
			if (close == 1)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			}
			else
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã" + string.Format("{0}{1}{2}", dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue"));
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1222" : "D1223"), "0", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D1220" : "D1221"), "1", dev.deviceName + "Queue");

			string d12201 = RedisHelper.Get<string>(dev.deviceName + "." + (V ? "D1220" : "D1221"), out string msg);
			LogHelper.Info($"ThreadGrats å{(dev.deviceName + "." + (V ? "D1220" : "D1221"))}ä¸º 1 ï¼ åè¯»{d12201}");
			string d12201 = RedisHelper.Get<string>(dev.deviceName + "." + (V ? "D1220" : "D1221"), out string msg);
			LogHelper.Info($"ThreadGrats å{(dev.deviceName + "." + (V ? "D1220" : "D1221"))}ä¸º 1 ï¼ åè¯»{d12201}");
			}
			}
			else if (dev.deviceType == 5)
			{

			var close = (System.UInt16)System.Convert.ChangeType(Conn.é»è®¤Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16));
			if (close == 0)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			}
			else
			{
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D2212" : "D2217"), "1", dev.deviceName + "Queue");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "D2211" : "D2216"), "0", dev.deviceName + "Queue");
			}
			}
			LogHelper.Info($"ThreadGrats {item.S_TASK_NO} >{item.S_ACTION_CODE} è®¾å¤æ¯{dev.deviceName} å³éåæ å¤çå®æ =================> ");
			}
			}

			}

			if (continuuuuu)
			{
			LogHelper.Info($"{item.S_TASK_NO}{item.S_ACTION_CODE} è½¦è¾åéç»§ç»ä»»å¡ï¼");
			@@ -1066,10 +1544,15 @@
			taskCode = item.S_TASK_NO
			});
			item.N_CREATEMETHOD = 1;
			item.S_REVIEW_COMMENT = $"è½¦åç»§ç»ä»»å¡OK";
			taskActRepository.Update(item);
			}
			}
			System.Threading.Thread.Sleep(3000);
			//ResetGats(tag);
			}
			public void ResetGats(Tag tag)
			{
			LogHelper.Info($"ThreadGrats deviceType2åæ åå¥ä½éç½® =================> ");
			//éç½®ä¿¡å·
			foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 2))
			@@ -1079,18 +1562,20 @@
			//int int0 = TcpServer.GetBitdata(numm, 0);
			//int int1 = TcpServer.GetBitdata(numm, 1);

			if (TcpServer.GetBitdata(numm, 0) == 0)
			{
			Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1220", "0", dev.deviceName + "Queue", false);
			Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue", false);
			}
			if (TcpServer.GetBitdata(numm, 1) == 0)
			{
			Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1221", "0", dev.deviceName + "Queue", false);
			Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1223", "0", dev.deviceName + "Queue", false);
			}
			//if (TcpServer.GetBitdata(numm, 0) == 0)
			//{
			// Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1220", "0", dev.deviceName + "Queue", false);
			// Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1222", "0", dev.deviceName + "Queue", false);
			//}
			//if (TcpServer.GetBitdata(numm, 1) == 0)
			//{
			// Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1221", "0", dev.deviceName + "Queue", false);
			// Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1223", "0", dev.deviceName + "Queue", false);
			//}

			if (TcpServer.GetBitdata(numm, 2) == 0)
			{
			//Conn.é»è®¤Redis.GetValue(dev.deviceName + ".D1224");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + ".D1224", "0", dev.deviceName + "Queue", false);
			}
			if (TcpServer.GetBitdata(numm, 3) == 0)
			@@ -1099,6 +1584,33 @@
			}
			}
			LogHelper.Info($"ThreadGrats deviceType2åæ åå¥ä½éç½®å®æã =================> ");
			LogHelper.Info($"ThreadGrats deviceType5åæ åå¥ä½éç½® =================> ");
			//éç½®ä¿¡å·
			//foreach (var dev in Settings.deviceInfos.FindAll(x => x.deviceType == 5))

			{
			//ä¸çº¿å°åï¼10.221.55.181 ç«¯å£ï¼6000
			//if (IsMachineOnline("10.221.55.181"))
			{
			if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
			//tag.DZ1.D2211 = 0;
			Conn.é»è®¤Redis.SetValue("Då®å1å·æºæ¢°æ.D2211", "0", "Då®å1å·æºæ¢°æQueue", false);
			if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
			//tag.DZ1.D2216 = 0;
			Conn.é»è®¤Redis.SetValue("Då®å1å·æºæ¢°æ.D2216", "0", "Då®å1å·æºæ¢°æQueue", false);
			}
			//äºçº¿å°åï¼10.221.55.179 ç«¯å£ï¼6000
			//if (IsMachineOnline("10.221.55.179"))
			{
			if (tag.DZ2.D2211 == 1 && tag.DZ2.D2220 == 1)
			//tag.DZ2.D2211 = 0;
			Conn.é»è®¤Redis.SetValue("Då®å2å·æºæ¢°æ.D2211", "0", "Då®å2å·æºæ¢°æQueue", false);
			if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
			//tag.DZ2.D2216 = 0;
			Conn.é»è®¤Redis.SetValue("Då®å2å·æºæ¢°æ.D2216", "0", "Då®å2å·æºæ¢°æQueue", false);
			}
			}
			LogHelper.Info($"ThreadGrats deviceType5åæ åå¥ä½éç½®å®æã =================> ");
			}
			/// <summary>
			/// 1020 1023ç©ºæ¡ä¸çº¿
			@@ -1107,6 +1619,11 @@
			public void ThreadEdown(Tag tag)
			{
			Console.WriteLine($"ThreadEdown 20 23 = ç©ºä¸æ£æµ =================> ");
			if (tag.RGV.Råçµç¶æ == 1 \|\| tag.RGV.Ræå¨1èªå¨2 == 1 \|\| tag.RGV.RgvrunError > 0)
			{
			LogHelper.Info($"RGV æå¨\|\|æé\|\|åçµï¼ç©ºä¸æ£æµç»æ¢ã");
			return;
			}
			TaskRepository taskRepository = new TaskRepository();
			foreach (var Bssx in new string[] { "1020", "1023" })
			{
			@@ -1129,7 +1646,7 @@
			var listtep = new List<string>();
			if (Bssx == "1020")
			{
			if (tag.SFä¸æä½.RArrive1003 == 1)
			if (!string.IsNullOrEmpty(tag.SFTä¸æå£æç.R1003Barcode) && string.IsNullOrEmpty(tag.SFTä¸æå£æç.R1011Barcode))
			{
			listtep = new List<string> { "1012", "1004" };
			}
			@@ -1140,7 +1657,8 @@
			}
			else
			{
			if (tag.SFä¸æä½.RArrive1005 == 1)
			//if (tag.SFä¸æä½.RArrive1005 == 1)
			if (!string.IsNullOrEmpty(tag.SFTä¸æå£æç.R1005Barcode) && string.IsNullOrEmpty(tag.SFTä¸æå£æç.R1013Barcode))
			{
			listtep = new List<string> { "1014", "1006" };
			}
			@@ -1212,7 +1730,12 @@

			public void ThreadDdown(Tag tag)
			{
			Console.WriteLine($"ThreadDdown 08 10 ==================> 1026");
			Console.WriteLine($"ThreadDdown 08 16==================> 1026");
			if (tag.RGV.Råçµç¶æ == 1 \|\| tag.RGV.Ræå¨1èªå¨2 == 1 \|\| tag.RGV.RgvrunError > 0)
			{
			LogHelper.Info($"RGV æå¨\|\|æé\|\|åçµï¼08 16 > 1026ç»æ¢ã");
			return;
			}
			TaskRepository taskRepository = new TaskRepository();
			foreach (var Bssx in new string[] { "1008", "1016" })
			{
			@@ -1249,6 +1772,19 @@
			{
			RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
			RedisHelper.Add($"S{item}Read.R5ç©ºé²_LAST", "1", out string msg2);

			LogHelper.Info($"{Ræçç } å®åçäº§å®æè¿è¡é²å·¥ï¼ï¼");
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/223", JsonConvert.SerializeObject(new
			{
			cntrCode = Ræçç ,
			type = 1,
			lineCode = "1002,1008".Contains(Bssx) ? "T01" : "T02"
			}));
			//var strr = JsonConvert.DeserializeObject<MES2234>(str);
			//if (strr.success && strr.data != null)
			//{

			//}
			//Conn.é»è®¤Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
			//Conn.é»è®¤Redis.SetValue($"S{item}Read.R5ç©ºé²_LAST", "1", $"S{item}ReadQueue");
			break;
			@@ -1271,6 +1807,11 @@
			public void Thread0210Down(Tag tag)
			{
			Console.WriteLine($"Thread0210Down ==================>");
			if (tag.RGV.Råçµç¶æ == 1 \|\| tag.RGV.Ræå¨1èªå¨2 == 1 \|\| tag.RGV.RgvrunError > 0)
			{
			LogHelper.Info($"RGV æå¨\|\|æé\|\|åçµï¼02 10 > 1017ç»æ¢ã");
			return;
			}
			TaskRepository taskRepository = new TaskRepository();
			foreach (var Bssx in new string[] { "1002", "1010" })
			{
			@@ -1306,6 +1847,13 @@
			{
			RedisHelper.Add($"S{Bssx}Read.RtaskState_LAST", "1", out msg);
			RedisHelper.Add($"S{item}Read.R5ç©ºé²_LAST", "1", out string msg1);
			LogHelper.Info($"{Ræçç } è½¬åçäº§å®æè¿è¡é²å·¥ï¼ï¼");
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/223", JsonConvert.SerializeObject(new
			{
			cntrCode = Ræçç ,
			type = 2,
			lineCode = "1002,1008".Contains(Bssx) ? "T01" : "T02"
			}));
			//Conn.é»è®¤Redis.SetValue($"S{Bssx}Read.RtaskState_LAST", "1", $"S{Bssx}ReadQueue");
			//Conn.é»è®¤Redis.SetValue($"S{item}Read.R5ç©ºé²_LAST", "1", $"S{item}ReadQueue");
			break;
			@@ -1328,6 +1876,7 @@
			public void Threadä¸æä½æ£æµ(Tag tag)
			{
			Console.WriteLine($"Threadä¸æä½æ£æµ =====>");
			var lsi = new List<string>();
			foreach (var ssx in new string[] { "1003", "1005", "1011", "1013" })
			{
			var RArrive = (System.UInt16)System.Convert.ChangeType(Conn.é»è®¤Redis.GetValue($"FNK1003051113.RArrive{ssx}"), typeof(System.UInt16));
			@@ -1347,6 +1896,7 @@
			{
			LogHelper.Info($"ssx == 1003 && tag.SFä¸æä½.WRelease1003:{tag.SFä¸æä½.WRelease1003} åf1 2210=1ï¼Arrive{ssx}BarcodeLast={RtrayCode}");
			tag.FNK1.D2210 = 1;
			//Conn.é»è®¤Redis.SetValue($"påé£ç§1ä¸çº¿.D2210", "1", $"påé£ç§1ä¸çº¿Queue",false);
			}
			break;
			case "1005":
			@@ -1387,33 +1937,33 @@

			if (WRelease == 1 && rReleaseOver == 1)
			{
			switch (ssx)
			{
			case "1003":
			{
			LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK1.D2213{tag.FNK1.D2213}=1? å¹¶å0");
			tag.FNK1.D2213 = 0;
			}
			break;
			case "1005":
			{
			LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK1.D2218{tag.FNK1.D2218}=1? å¹¶å0");
			tag.FNK1.D2218 = 0;
			}
			break;
			case "1011":
			{
			LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK2.D2213{tag.FNK1.D2213}=1? å¹¶å0");
			tag.FNK2.D2213 = 0;
			}
			break;
			case "1013":
			{
			LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK2.D2218{tag.FNK2.D2218}=1? å¹¶å0");
			tag.FNK2.D2218 = 0;
			}
			break;
			}
			//switch (ssx)
			//{
			// case "1003":
			// {
			// LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK1.D2213{tag.FNK1.D2213}=1? å¹¶å0");
			// tag.FNK1.D2213 = 0;
			// }
			// break;
			// case "1005":
			// {
			// LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK1.D2218{tag.FNK1.D2218}=1? å¹¶å0");
			// tag.FNK1.D2218 = 0;
			// }
			// break;
			// case "1011":
			// {
			// LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK2.D2213{tag.FNK1.D2213}=1? å¹¶å0");
			// tag.FNK2.D2213 = 0;
			// }
			// break;
			// case "1013":
			// {
			// LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 è¯»FNK2.D2218{tag.FNK2.D2218}=1? å¹¶å0");
			// tag.FNK2.D2218 = 0;
			// }
			// break;
			//}
			LogHelper.Info($"è¯»{ssx} WRelease=1&& rReleaseOver=1 WRelease å0");
			Conn.é»è®¤Redis.SetValue($"FNK1003051113.WRelease{ssx}", "0", $"FNK1003051113Queue");
			}
			@@ -1424,12 +1974,13 @@
			public void ThreadFNK1Over(Tag tag)
			{
			Console.WriteLine($"ThreadFNK1Over =====>");
			LogHelper.Info($" FN1 æ¶é´æ³ {RedisHelper.Get<string>("påé£ç§1ä¸çº¿#Timestamp", out string mg)}");
			LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
			//LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 å 2215=0ï¼D2217_LAST=1ï¼WRelease1005=1 RArrive1005_LAST=0");
			if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
			{
			//tag.FNK1.D2215 = 0;
			tag.FNK1.D2218 = 1;
			//tag.FNK1.D2218 = 1;
			//tag.FNK1.D2212_LAST = 1;
			RedisHelper.Add($"påé£ç§1ä¸çº¿.D2217_LAST", "1", out string msg);

			@@ -1456,7 +2007,7 @@
			LogHelper.Info($" FN1 D2212>{tag.FNK1.D2212} D2212LAST>{tag.FNK1.D2212_LAST} D2210>{tag.FNK1.D2210} D2211>{tag.FNK1.D2211} D2213>{tag.FNK1.D2213}");
			if (tag.FNK1.D2212 == 1 && tag.FNK1.D2212_LAST == 0)
			{
			tag.FNK1.D2213 = 1;
			//tag.FNK1.D2213 = 1;
			//tag.FNK1.D2210 = 0;
			//tag.FNK1.D2217_LAST = 1;
			RedisHelper.Add($"påé£ç§1ä¸çº¿.D2212_LAST", "1", out string msg);
			@@ -1487,11 +2038,12 @@
			public void ThreadFNK2Over(Tag tag)
			{
			Console.WriteLine($"ThreadFNK2Over =====>");
			LogHelper.Info($" FN2 æ¶é´æ³ {RedisHelper.Get<string>("påé£ç§2ä¸çº¿#Timestamp", out string mg)}");
			LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2218>{tag.FNK2.D2218}");
			if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
			{
			//tag.FNK2.D2215 = 0;
			tag.FNK2.D2218 = 1;
			//tag.FNK2.D2218 = 1;
			//tag.FNK2.D2212_LAST = 1;
			RedisHelper.Add($"påé£ç§2ä¸çº¿.D2217_LAST", "1", out string msg);

			@@ -1520,7 +2072,7 @@
			if (tag.FNK2.D2212 == 1 && tag.FNK2.D2212_LAST == 0)
			{
			//tag.FNK2.D2210 = 0;
			tag.FNK2.D2213 = 1;
			//tag.FNK2.D2213 = 1;
			//tag.FNK2.D2217_LAST = 1;
			RedisHelper.Add($"påé£ç§2ä¸çº¿.D2212_LAST", "1", out string msg);

			@@ -1548,35 +2100,219 @@

			public void Thread1019Down(Tag tag)
			{
			Console.WriteLine($"1019ä»»å¡ç¶æï¼ =====>");
			Console.WriteLine($"1019ä»»å¡ç¶æï¼{tag.SA1019.RtaskState}- barcode:{tag.SA1019.Ræçç }- ç©ºé²{tag.SA1019.R5ç©ºé²}");
			var taggg = tag.SA1019;
			string vqu = "A1019åè´§äº¤äº";
			LogHelper.Info($"1019ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			}
			//Console.WriteLine($"1019ä»»å¡ç¶æï¼ =====>");
			//Console.WriteLine($"1019ä»»å¡ç¶æï¼{tag.SA1019.RtaskState}- barcode:{tag.SA1019.Ræçç }- ç©ºé²{tag.SA1019.R5ç©ºé²}");
			}

			private void sa2008(Tag tag)
			{
			var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
			LogHelper.Info($"2008 æçå·{tag.SA2030.Ræçç } redis Arrive{2008}BarcodeLastæçå·ï¼{rdisTcode} å¹éæ ¡éªã");
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2008.Ræçç ) && rdisTcode != tag.ssxè¾éçº¿.s2008.Ræçç )
			{
			var ntr = tag.ssxè¾éçº¿.s2008.Ræçç ;
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = ntr,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data != null)
			{
			var end = (strr.data.lineNum == 1 ? 2027
			: strr.data.lineNum == 2 ? 2020 : 2013);
			tag.ssxè¾éçº¿.s2008.wTaskNo = (uint)(20080000 + end);
			tag.ssxè¾éçº¿.s2008.wEbit = 2027;
			tag.ssxè¾éçº¿.s2008.Ræçç = ntr;
			RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
			}
			}
			}

			private void sa2030(Tag tag)
			{
			var taggg = tag.SA2030;
			string vqu = "A2030åè´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa2001(Tag tag)
			{
			var taggg = tag.SA2001;
			string vqu = "A2001æ¾è´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa1030(Tag tag)
			{
			var taggg = tag.SA1030;
			string vqu = "A1030åè´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "åAGVç³è¯·");
			}
			}

			private void sa1025(Tag tag)
			{
			var taggg = tag.SA1025;
			string vqu = "A1025æ¾è´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa1022(Tag tag)
			{
			var taggg = tag.SA1022;
			string vqu = "A1022æ¾è´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa3010(Tag tag)
			{
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3010åè´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa3006(Tag tag)
			{
			var taggg = tag.ssxè¾éçº¿.s3006;
			string vqu = "A3006æ¾è´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa3005(Tag tag)
			{
			var taggg = tag.ssxè¾éçº¿.s3005;
			string vqu = "A3005åè´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			private void sa3001(Tag tag)
			{
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3001æ¾è´§äº¤äº";
			LogHelper.Info($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			public void Thread1025Up(Tag tag)
			{
			Console.WriteLine($"SA1025 ä»»å¡ç¶æï¼ =====>");
			Console.WriteLine($"SA1025 ä»»å¡ç¶æï¼{tag.SA1025.RtaskState}- ç©ºé²{tag.SA1025.R5ç©ºé²}");
			//if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			//{
			// SetRedistoPlc("A1019åè´§äº¤äº.Ssetreq", "false", "A1019åè´§äº¤äºQueue", "åAGVç³è¯·");
			// SetRedistoPlc("A1019åè´§äº¤äº.SOver", "false", "A1019åè´§äº¤äºQueue", "åAGVç³è¯·");
			//}
			//Console.WriteLine($"SA1025 ä»»å¡ç¶æï¼ =====>");
			//Console.WriteLine($"SA1025 ä»»å¡ç¶æï¼{tag.SA1025.RtaskState}- ç©ºé²{tag.SA1025.R5ç©ºé²}");
			}
			public void Thread1022Up(Tag tag)
			{
			Console.WriteLine($"SA1022 =====>");
			Console.WriteLine($"SA1022 ä»»å¡ç¶æï¼{tag.SA1022.RtaskState}- ç©ºé²{tag.SA1022.R5ç©ºé²}");
			//if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			//{
			// SetRedistoPlc("A1019åè´§äº¤äº.Ssetreq", "false", "A1019åè´§äº¤äºQueue", "æ¸ç");
			// SetRedistoPlc("A1019åè´§äº¤äº.SOver", "false", "A1019åè´§äº¤äºQueue", "æ¸ç");
			//}
			//Console.WriteLine($"SA1022 =====>");
			//Console.WriteLine($"SA1022 ä»»å¡ç¶æï¼{tag.SA1022.RtaskState}- ç©ºé²{tag.SA1022.R5ç©ºé²}");
			}
			public void Thread1030Down(Tag tag)
			{
			Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼ =====>");
			Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼{tag.SA1030.RtaskState}- ç©ºé²{tag.SA1030.R5ç©ºé²}-->å¯¹åºç»ç¹2001>ç©ºé²5ï¼{tag.SA2001.R5ç©ºé²}");
			if (tag.SA1030.RtaskState == 4 && tag.SA1030.RtaskState_LAST == 0 && tag.SA2001.R5ç©ºé² == 5)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			{
			requestType = 10,
			startBit = "1030",
			endBit = "2001",
			}));
			RedisHelper.Add($"S1030Read.RtaskState_LAST", "1", out string msg);
			}
			else if (tag.SA1030.RtaskState != 4 && tag.SA1030.RtaskState_LAST == 1)
			RedisHelper.Add($"S1030Read.RtaskState_LAST", "0", out string msg);
			//if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			//{
			// SetRedistoPlc("A1022æ¾è´§äº¤äº.Ssetreq", "false", "A1022æ¾è´§äº¤äºQueue", "æ¸ç");
			// SetRedistoPlc("A1022æ¾è´§äº¤äº.SOver", "false", "A1022æ¾è´§äº¤äºQueue", "æ¸ç");
			//}
			//Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼{tag.SA1030.RtaskState}- ç©ºé²{tag.SA1030.R5ç©ºé²}-->å¯¹åºç»ç¹2001>ç©ºé²5ï¼{tag.SA2001.R5ç©ºé²}");
			}
			static int i = 0;
			public void Thread2030Down(Tag tag)
			{
			i++;
			if (i > 2 * 3600 / 3)
			{
			Console.Clear();
			LogHelper.Info($"å¾ªç¯{i}æ¬¡>> æ¸ç©ºæ§å¶å°ã");
			i = 0;
			}

			Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼ =====>");
			Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼{tag.SA2030.RtaskState}- ç©ºé²{tag.SA2030.R5ç©ºé²} - barcode:{tag.SA2030.Ræçç }");


			//Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼ =====>");
			//Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼{tag.SA2030.RtaskState}- ç©ºé²{tag.SA2030.R5ç©ºé²} - barcode:{tag.SA2030.Ræçç }");

			}

			public void ResolveMesTask()
			public void ResolveMesTask(Tag tag)
			{
			TaskRepository taskservice = new TaskRepository();
			var tasks = taskservice.FindList(x => (x.S_B_STATE == "MES" \|\| x.S_B_STATE == "People") && x.N_PRIORITY == -88);
			@@ -1593,19 +2329,371 @@
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} {(sx == null ? "é" : "æ¯")}æ»è£æºå¨äººä»»å¡");
			if (sx == null)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç´æ¥çæå¯¹åºä»»å¡");
			//ç´æ¥çæå¯¹åºä»»å¡ã
			var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>());

			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç´æ¥çæå¯¹åºä»»å¡ ç»æï¼{res}");
			if (res)
			gotoOOOOOOOOO:
			if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ä¿®æ¹æ è¯");
			//task.N_PRIORITY = 0;
			taskservice.dbcontext.Set<TaskEntity>().Attach(task);
			taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
			taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
			taskservice.dbcontext.SaveChanges();
			// å«æä»»å¡ã æå®ç©æä¸æå®æçï¼éè¦åºåº
			var ssagv = Settings.deviceInfos.Find(x => x.deviceType == 4);
			if (ssagv.location.Contains(task.S_START_LOC))
			switch (task.S_START_LOC)
			{
			case "2030":
			if (!string.IsNullOrEmpty(tag.SA2030.Ræçç ))
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} 2030 åºå£æçå·{tag.SA2030.Ræçç } å¹éæ ¡éªã");
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.SA2030.Ræçç ,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			task.S_CNTRS = tag.SA2030.Ræçç ;
			taskservice.Update(task);
			goto gotoOOOOOOOOO;
			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 2030 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			}
			}
			else
			{
			//2027 2220 2013.. è¯å«ä¸ä¸ï¼å¼å§åº
			//1 ç27 20 13 æ¯å¦æä»»å¡ã æåä¸åºäºã çåºå£å¤æå¹éã
			//2 é½æ²¡æä»»å¡ï¼éä¸ªå¹éæ¯å¦ç¬¦åï¼ååºåºã
			//LogHelper.Info($"");
			{
			var t20132027 = tag.ssxè¾éçº¿.s2027;
			LogHelper.Info($"è¯å«2027ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) \|\| (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
			{
			LogHelper.Info($"2027ä»»å¡ ä»»å¡ç»ç¹æ¯2030 ï¼ç»æ¢");
			continue;
			}
			}
			{
			var t20132027 = tag.ssxè¾éçº¿.s2020;
			LogHelper.Info($"è¯å«2027ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) \|\| (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
			{
			LogHelper.Info($"2020ä»»å¡ ä»»å¡ç»ç¹æ¯2030 ï¼ç»æ¢");
			continue;
			}
			}
			{
			var t20132027 = tag.ssxè¾éçº¿.s2013;
			LogHelper.Info($"è¯å«2027ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) \|\| (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
			{
			LogHelper.Info($"2013ä»»å¡ ä»»å¡ç»ç¹æ¯2030 ï¼ç»æ¢");
			continue;
			}
			}
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2027.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.ssxè¾éçº¿.s2027.Ræçç ,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2027 è¯»å°æç{tag.ssxè¾éçº¿.s2027.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20272030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2027.wTaskNo = 20272030;
			tag.ssxè¾éçº¿.s2027.wEbit = 2030;
			tag.ssxè¾éçº¿.s2027.wæçç = tag.ssxè¾éçº¿.s2027.Ræçç ;
			LogHelper.Info($"2027 > 2030 SSXä»»å¡ä¸åå®æã");
			continue;
			}
			}
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2020.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.ssxè¾éçº¿.s2020.Ræçç ,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2020 è¯»å°æç{tag.ssxè¾éçº¿.s2020.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20202030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2020.wTaskNo = 20202030;
			tag.ssxè¾éçº¿.s2020.wEbit = 2030;
			tag.ssxè¾éçº¿.s2020.wæçç = tag.ssxè¾éçº¿.s2020.Ræçç ;
			LogHelper.Info($"2020 > 2030 SSXä»»å¡ä¸åå®æã");
			continue;
			}
			}
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2013.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.ssxè¾éçº¿.s2013.Ræçç ,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2013 è¯»å°æç{tag.ssxè¾éçº¿.s2013.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20132030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2013.wTaskNo = 20132030;
			tag.ssxè¾éçº¿.s2013.wEbit = 2030;
			tag.ssxè¾éçº¿.s2013.wæçç = tag.ssxè¾éçº¿.s2013.Ræçç ;
			LogHelper.Info($"2013 > 2030 SSXä»»å¡ä¸åå®æã");
			continue;
			}
			}
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} æ¥å¿è½è·å°è¿ï¼è¯´ææ²¡ç©æï¼æèé½ä¸ç¬¦å æ æ³å»2030");
			}
			break;
			case "1019":
			if (!string.IsNullOrEmpty(tag.SA1019.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.SA1019.Ræçç ,
			type = 2
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			task.S_CNTRS = tag.SA2030.Ræçç ;
			taskservice.Update(task);
			goto gotoOOOOOOOOO;
			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 1019 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			}
			}
			break;
			//case "1030":
			// {

			// }
			//break;
			case "3005":
			{
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s3005.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.ssxè¾éçº¿.s3005.Ræçç ,
			type = 2
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			task.S_CNTRS = tag.ssxè¾éçº¿.s3005.Ræçç ;
			taskservice.Update(task);
			goto gotoOOOOOOOOO;
			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 3010 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			}
			}
			}
			break;
			case "3010":
			{
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s3010.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.ssxè¾éçº¿.s3010.Ræçç ,
			type = 2
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			task.S_CNTRS = tag.ssxè¾éçº¿.s3010.Ræçç ;
			taskservice.Update(task);
			goto gotoOOOOOOOOO;
			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 3010 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			}
			}
			}
			break;
			}
			//else if (ssagv.location.Contains(task.S_END_LOC))
			// switch (task.S_END_LOC)
			// {
			// case "1022":
			// {
			// if (tag.SA1022.R5ç©ºé² != 1)
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹1022 éç©ºé²ï¼ä¸æ¨é");
			// continue;
			// }
			// }
			// break;
			// case "1025":
			// {
			// if (tag.SA1025.R5ç©ºé² != 1)
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 1025 éç©ºé²ï¼ä¸æ¨é");
			// continue;
			// }
			// }
			// break;
			// case "2001":
			// {
			// if (tag.SA2001.R5ç©ºé² != 1)
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 2001 éç©ºé²ï¼ä¸æ¨é");
			// continue;
			// }
			// }
			// break;
			// case "3001":
			// {
			// if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 1)
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3001 éç©ºé²ï¼ä¸æ¨é");
			// continue;
			// }
			// }
			// break;
			// case "3006":
			// {
			// if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 1)
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3006 éç©ºé²ï¼ä¸æ¨é");
			// continue;
			// }
			// }
			// break;
			// }
			}
			else
			{
			//if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
			//{
			//}
			//if (new List<string> { "1019"/, "1030"/, "2030", "3005", "3010" }.Contains(task.S_START_LOC)) //1030 æ¯ä¸»å¨ç³è¯·ï¼ ä¸ç¨å¤æã
			//{
			// //ç©æå¹éå¤æãå 2030å¤æ
			//}
			string type = "";
			if (new List<string> { "1019"/, "1030"/, "2030", "3005", "3010" }.Contains(task.S_START_LOC))
			switch (task.S_START_LOC)
			{
			case "1019":
			{
			type = "A009";
			if (tag.SA1019.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 1019 RtaskState>{tag.SA1019.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "2030":
			{
			type = "A007";
			if (tag.SA2030.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 2030 RtaskState>{tag.SA2030.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "3005":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3005.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3005 RtaskState>{tag.ssxè¾éçº¿.s3005.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "3010":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3010.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3010 RtaskState>{tag.ssxè¾éçº¿.s3010.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			}
			if (new List<string> { "2001", "1022", "1025", "3001", "3006" }.Contains(task.S_END_LOC))
			switch (task.S_END_LOC)
			{
			case "1022":
			{
			type = "A008";
			if (tag.SA1022.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹1022 >{tag.SA1022.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "1025":
			{
			type = "A007";
			if (tag.SA1025.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 1025 >{tag.SA1025.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "2001":
			{
			type = "A007";
			if (tag.SA2001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 2001>{tag.SA2001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "3001":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3001>{tag.ssxè¾éçº¿.s3001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "3006":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3006>{tag.ssxè¾éçº¿.s3001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			}

			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç´æ¥çæå¯¹åºä»»å¡");
			//ç´æ¥çæå¯¹åºä»»å¡ã
			var res = TaskProcess.CreateTask(task.S_TASK_NO, task.S_START_LOC, task.S_END_LOC, task.S_TYPE, 6, task.S_CNTRS?.Split(',').ToList() ?? new List<string>(), "AGV", type);

			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç´æ¥çæå¯¹åºä»»å¡ ç»æï¼{res}");
			if (res)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ä¿®æ¹æ è¯");
			//task.N_PRIORITY = 0;
			taskservice.dbcontext.Set<TaskEntity>().Attach(task);
			taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).CurrentValue = 0;
			taskservice.dbcontext.Entry(task).Property(x => x.N_PRIORITY).IsModified = true;
			taskservice.dbcontext.SaveChanges();
			}
			}
			}
			else
			@@ -1737,7 +2825,18 @@
			}
			}


			public string procNo()
			{
			return TaskProcess.GenerateTaskNo("æ¥å¿æµæ°´å·", "LOG");
			}
			public bool SetRedistoPlc(string key, string value, string queue, string desc)
			{
			var vnc = procNo();
			LogHelper.Info($"{vnc}>>Redis.SetValueåplc æè¿°ï¼{desc} tagName:{key},value:{value},queue:{queue}");
			var v = Conn.é»è®¤Redis.SetValue(key, value, queue);
			LogHelper.Info($"{vnc}>> åå¥ç»æ{v}");
			return v;
			}
			public HkReturnResult OperateHKTaskStatus(HaiKangOrderInfo model)
			{
			// æ¥è¯¢ä»»å¡ï¼æ ¹æ®ä»»å¡å·
			@@ -1806,6 +2905,16 @@
			// Conn.é»è®¤Redis.SetValue(device.deviceName + "." + V, "0", device.deviceName + "Queue");
			//});
			}
			else
			switch (device.deviceType)
			{
			case 4:
			{

			}
			break;

			}
			}
			//LocationHelper.UnLockLoc(wcsTask.S_START_LOC);
			break;
			@@ -1865,12 +2974,12 @@
			{
			if (device2.deviceName.Contains("Jsæ·é¡º"))
			{
			Task.Run(() =>
			{
			var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
			string V = inde ? "D1224" : "D1225";
			Conn.é»è®¤Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
			});
			//Task.Run(() =>
			//{
			var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
			string V = inde ? "D1224" : "D1225";
			Conn.é»è®¤Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
			//});

			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/202", JsonConvert.SerializeObject(new
			{
			@@ -1900,6 +3009,29 @@
			LogHelper.Info($"{ssloc}ç³è¯·mesä»»å¡ç»æ{str}");
			}
			}
			else
			switch (device2.deviceType)
			{
			case 4:
			{

			}
			break;
			case 5:
			{
			var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
			string V = inde ? "D2210" : "D2215";
			Conn.é»è®¤Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
			}
			break;
			case 6:
			{
			//var inde = device2.location.ToList().FindIndex(x => x == wcsTask.S_END_LOC) == 0;
			//string V = inde ? "D2210" : "D2215";
			//Conn.é»è®¤Redis.SetValue(device2.deviceName + "." + V, "1", device2.deviceName + "Queue");
			}
			break;
			}
			}

			//LocationMethod.JudgeLocation(wcsTask);
			@@ -2022,16 +3154,131 @@
			}
			}

			/// <summary>
			/// å®å1å·çº¿ã
			/// 1.å¢å ä¸çº¿é»è¾ã 2. æåçä¿¡å·å°±åï¼æ²¡ä¿¡å·å«å
			/// </summary>
			/// <param name="tag"></param>
			public void ThreadMXC3(Tag tag)
			{
			var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("1å·"));
			if (VERX == null)
			{
			LogHelper.Info("å®å1å·çº¿ deviceType 5 æ²¡æéç½®ã");
			return;
			}
			LogHelper.Info($" {VERX.deviceName} æ¶é´æ³ {RedisHelper.Get<string>("Då®å1å·æºæ¢°æ#Timestamp", out string mg)} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST} D2226>{tag.DZ1.D2226} D2226_LAST>{tag.DZ1.D2226_LAST}");
			if (tag.DZ1.D2221 == 1 && tag.DZ1.D2221_LAST == 0)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			{
			requestType = 7,
			startBit = VERX.location[0],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			var strr = JsonConvert.DeserializeObject<Messss>(str);
			if (strr != null && strr.success && strr.data?.state == 0)
			RedisHelper.Add($"Då®å1å·æºæ¢°æ.D2221_LAST", "1", out string msg);
			}
			else if (tag.DZ1.D2221 == 0 && tag.DZ1.D2221_LAST == 1)
			{
			LogHelper.Info($"éç½® Då®å1å·æºæ¢°æ.D2221_LAST > 0");
			RedisHelper.Add($"Då®å1å·æºæ¢°æ.D2221_LAST", "0", out string msg);

			string V = 0 == 0 ? "D2210" : "D2215";
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
			}


			if (tag.DZ1.D2226 == 1 && tag.DZ1.D2226_LAST == 0)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			{
			requestType = 7,
			startBit = VERX.location[1],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			var strr = JsonConvert.DeserializeObject<Messss>(str);
			if (strr != null && strr.success && strr.data?.state == 0)
			RedisHelper.Add($"Då®å1å·æºæ¢°æ.D2226_LAST", "1", out string msg);
			}
			else if (tag.DZ1.D2226 == 0 && tag.DZ1.D2226_LAST == 1)
			{
			LogHelper.Info($"éç½® Då®å1å·æºæ¢°æ.D2226_LAST > 0");
			RedisHelper.Add($"Då®å1å·æºæ¢°æ.D2226_LAST", "0", out string msg);
			string V = 1 == 0 ? "D2210" : "D2215";
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
			}


			}
			/// <summary>
			/// å®å2å·çº¿ã
			/// </summary>
			/// <param name="tag"></param>
			public void ThreadMXC4(Tag tag)
			{
			var VERX = Settings.deviceInfos.Find(x => x.deviceType == 5 && x.deviceName.Contains("2å·"));
			if (VERX == null)
			{
			LogHelper.Info("å®å2å·çº¿ deviceType 5 æ²¡æéç½®ã");
			return;
			}
			LogHelper.Info($" {VERX.deviceName} æ¶é´æ³ {RedisHelper.Get<string>("Då®å2å·æºæ¢°æ#Timestamp", out string mg)} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST} D2226>{tag.DZ2.D2226} D2226_LAST>{tag.DZ2.D2226_LAST}");
			if (tag.DZ2.D2221 == 1 && tag.DZ2.D2221_LAST == 0)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			{
			requestType = 7,
			startBit = VERX.location[0],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			var strr = JsonConvert.DeserializeObject<Messss>(str);
			if (strr != null && strr.success && strr.data?.state == 0)
			RedisHelper.Add($"Då®å2å·æºæ¢°æ.D2221_LAST", "1", out string msg);
			}
			else if (tag.DZ2.D2221 == 0 && tag.DZ2.D2221_LAST == 1)
			{
			LogHelper.Info($"éç½® Då®å2å·æºæ¢°æ.D2221_LAST > 0");
			RedisHelper.Add($"Då®å2å·æºæ¢°æ.D2221_LAST", "0", out string msg);
			string V = 0 == 0 ? "D2210" : "D2215";
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
			}


			if (tag.DZ2.D2226 == 1 && tag.DZ2.D2226_LAST == 0)
			{
			var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
			{
			requestType = 7,
			startBit = VERX.location[1],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			var strr = JsonConvert.DeserializeObject<Messss>(str);
			if (strr != null && strr.success && strr.data?.state == 0)
			RedisHelper.Add($"Då®å2å·æºæ¢°æ.D2226_LAST", "1", out string msg);
			}
			else if (tag.DZ2.D2226 == 0 && tag.DZ2.D2226_LAST == 1)
			{
			LogHelper.Info($"éç½® Då®å2å·æºæ¢°æ.D2226_LAST > 0");
			RedisHelper.Add($"Då®å2å·æºæ¢°æ.D2226_LAST", "0", out string msg);
			string V = 1 == 0 ? "D2210" : "D2215";
			Conn.é»è®¤Redis.SetValue(VERX.deviceName + "." + V, "0", VERX.deviceName + "Queue");
			}


			}

			}




			public class HttpServer
			@@ -2415,6 +3662,24 @@
			public Ddata data { get; set; }
			public object extra { get; set; }
			}
			class Mesrespone
			{
			public bool success { get; set; }
			public string msg { get; set; }
			public object extra { get; set; }
			}

			class MES2234
			{
			public bool success { get; set; }
			public ML data { get; set; }
			}

			public class ML
			{
			public string materialCode { get; set; }
			public int lineNum { get; set; }
			}

			public class Ddata
			{