WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -237,7 +237,8 @@
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			if (str.Contains("true"))
			{
			tag.wxr1.R44_LAST = true;
			//tag.wxr1.R44_LAST = true;
			RedisHelper.Add($"ç»´å¸å°æè1.R44_LAST", "true", out string msg);
			}
			}
			else
			@@ -252,7 +253,8 @@
			{
			if (tag.wxr1.R10)
			{
			tag.wxr1.R10_LAST = false;
			//tag.wxr1.R10_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R10_LAST", "false", out string msg);
			}
			else
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
			@@ -268,7 +270,8 @@
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr1.R10 = true;
			tag.wxr1.R44_LAST = false;
			//tag.wxr1.R44_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R44_LAST", "false", out string msg);
			}
			else
			{
			@@ -306,7 +309,8 @@
			LogHelper.Info($"{VERX.location[1]}ç³è¯·mesä»»å¡ç»æ{str}");
			if (str.Contains("true"))
			{
			tag.wxr1.R46_LAST = true;
			//tag.wxr1.R46_LAST = true;
			RedisHelper.Add($"ç»´å¸å°æè1.R46_LAST", "true", out string msg);
			}
			}
			else
			@@ -320,7 +324,8 @@
			{
			if (tag.wxr1.R11)
			{
			tag.wxr1.R11_LAST = false;
			//tag.wxr1.R11_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R11_LAST", "false", out string msg);
			}
			else
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
			@@ -336,7 +341,8 @@
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr1.R11 = true;
			tag.wxr1.R46_LAST = false;
			//tag.wxr1.R46_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè1.R46_LAST", "false", out string msg);
			}
			else
			{
			@@ -374,7 +380,8 @@
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			if (str.Contains("true"))
			{
			tag.wxr2.R44_LAST = true;
			//tag.wxr2.R44_LAST = true;
			RedisHelper.Add($"ç»´å¸å°æè2.R44_LAST", "true", out string msg);
			}
			}
			else
			@@ -388,7 +395,8 @@
			{
			if (tag.wxr2.R10)
			{
			tag.wxr2.R10_LAST = false;
			//tag.wxr2.R10_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R10_LAST", "false", out string msg);
			}
			else
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[0], out string traycode))
			@@ -404,7 +412,8 @@
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr2.R10 = true;
			tag.wxr2.R44_LAST = false;
			//tag.wxr2.R44_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R44_LAST", "false", out string msg);
			}
			else
			{
			@@ -443,7 +452,8 @@
			LogHelper.Info($"{VERX.location[1]}ç³è¯·mesä»»å¡ç»æ{str}");
			if (str.Contains("true"))
			{
			tag.wxr2.R46_LAST = true;
			//tag.wxr2.R46_LAST = true;
			RedisHelper.Add($"ç»´å¸å°æè2.R46_LAST", "true", out string msg);
			}
			}
			else
			@@ -457,7 +467,8 @@
			{
			if (tag.wxr2.R11)
			{
			tag.wxr2.R11_LAST = false;
			//tag.wxr2.R11_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R11_LAST", "false", out string msg);
			}
			else
			if (TcpServer.TrayIps.TryGetValue(VERX.deviceNo[1], out string traycode))
			@@ -473,7 +484,8 @@
			{
			//Conn.é»è®¤Redis.SetValue("ç»´å¸å°æè1.R10", "true", "ç»´å¸å°æè1Queue");
			tag.wxr2.R11 = true;
			tag.wxr2.R46_LAST = false;
			//tag.wxr2.R46_LAST = false;
			RedisHelper.Add($"ç»´å¸å°æè2.R46_LAST", "false", out string msg);
			}
			else
			{
			@@ -597,7 +609,7 @@
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);

			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{JsonConvert.SerializeObject(task1)}.bit1taskOver_LASTï¼{tag.RGV.bit1taskOver_LAST}");
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{task1?.S_TASK_NO}.bit1taskOver_LASTï¼{tag.RGV.bit1taskOver_LAST}");
			if (tag.RGV.bit1taskOver_LAST == 0 && task1 != null)
			{
			if (task1.S_B_STATE != "å®æ")
			@@ -882,6 +894,7 @@
			public void ThreadGrats(Tag tag, Action<HaiKangOrderInfo> continueTask)
			{
			Console.WriteLine($"ThreadGrats åæ å¤ç =================> ");

			var taskCOdes = new List<string> { "Sarrive", "Srelease", "Earrive", "Erelease" };
			TaskActRepository taskActRepository = new TaskActRepository();
			TaskRepository taskRepository = new TaskRepository();
			@@ -918,8 +931,7 @@
			if (dev.deviceType == 1)
			{
			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");

			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R02" : "R04"), "true", dev.deviceName + "Queue", false);
			}
			else if (dev.deviceType == 2)
			{
			@@ -944,7 +956,7 @@
			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");
			Conn.é»è®¤Redis.SetValue(dev.deviceName + "." + (V ? "R01" : "R03"), "true", dev.deviceName + "Queue", false);
			}

			}