WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -477,7 +477,7 @@
			if (VERX != null)
			{
			if (tag.wxr1.R46)
			LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr1.R46} R44LAST>{tag.wxr1.R46_LAST} R10>{tag.wxr1.R11}");
			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()))
			@@ -642,7 +642,7 @@
			if (VERX != null)
			{
			if (tag.wxr2.R46)
			LogHelper.Info($"{VERX.deviceName} R44>{tag.wxr2.R46} R44LAST>{tag.wxr2.R46_LAST} R10>{tag.wxr2.R11}");
			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()))
			@@ -664,7 +664,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
			@@ -777,15 +777,25 @@

			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å½ä»¤æ¥ç ä»»å¡æ°æ® workmode:{tag.RGV.workMod}\n taskmod{tag.RGV.taskmod} \n t1No:{tag.RGV.taskno1}\n t1do:{tag.RGV.task1do} \n t2No:{tag.RGV.taskno2}\n t2do:{tag.RGV.task2do}\n taskend:{tag.RGV.taskend} ");
			if (tag.RGV.taskend == 125)
			{
			LogHelper.Info($"RGV æ125å½ä»¤æªæ§è¡ã ");
			LogHelper.Info($"RGV125å½ä»¤æªæ§è¡ ä»»å¡æ°æ® workmode:{tag.RGV.workMod}\n taskmod{tag.RGV.taskmod} \n t1No:{tag.RGV.taskno1}\n t1do:{tag.RGV.task1do} \n t2No:{tag.RGV.taskno2}\n t2do:{tag.RGV.task2do}\n taskend:{tag.RGV.taskend} ");

			if (tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No)
			{
			@@ -925,9 +935,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 æä»»å¡ã
			@@ -1299,7 +1322,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1019åè´§äº¤äº.Ssetreq", "true", "A1019åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1019.StaskMode = 1;
			}
			}
			break;
			case "1030":
			@@ -1310,7 +1336,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1030åè´§äº¤äº.Ssetreq", "true", "A1030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1030.StaskMode = 1;
			}
			}
			break;
			case "2030":
			@@ -1321,7 +1350,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2030åè´§äº¤äº.Ssetreq", "true", "A2030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2030.StaskMode = 1;
			}
			}
			break;
			case "3005":
			@@ -1332,7 +1364,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3005åè´§äº¤äº.Ssetreq", "true", "A3005åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3005.StaskMode = 1;
			}
			}
			break;
			case "3010":
			@@ -1343,7 +1378,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3010åè´§äº¤äº.Ssetreq", "true", "A3010åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3010.StaskMode = 1;
			}
			}
			break;
			//}
			@@ -1357,7 +1395,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1022æ¾è´§äº¤äº.Ssetreq", "true", "A1022æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1022.StaskMode = 2;
			}
			}
			break;
			case "1025":
			@@ -1368,7 +1409,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1025æ¾è´§äº¤äº.Ssetreq", "true", "A1025æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1025.StaskMode = 2;
			}
			}
			break;
			case "2001":
			@@ -1379,7 +1423,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2001æ¾è´§äº¤äº.Ssetreq", "true", "A2001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2001.StaskMode = 2;
			}
			}
			break;
			case "3001":
			@@ -1390,7 +1437,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3001æ¾è´§äº¤äº.Ssetreq", "true", "A3001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3001.StaskMode = 2;
			}
			}
			break;
			case "3006":
			@@ -1401,7 +1451,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3006æ¾è´§äº¤äº.Ssetreq", "true", "A3006æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3006.StaskMode = 2;
			}
			}
			break;
			}
			@@ -1449,7 +1502,7 @@
			{

			var close = (System.UInt16)System.Convert.ChangeType(Conn.é»è®¤Redis.GetValue(dev.deviceName + "." + (V ? "D2220" : "D2225")), typeof(System.UInt16));
			if (close == 1)
			if (close == 0)
			{
			LogHelper.Info($"{dev.deviceName}{(V ? "å·¦" : "å³")} åæ {(goin ? "å³é" : "å¼å¯")} ç³è¯·ã å·²ç»å³éï¼");
			continuuuuu = true;
			@@ -1519,18 +1572,22 @@
			//ä¸çº¿å°åï¼10.221.55.181 ç«¯å£ï¼6000
			//if (IsMachineOnline("10.221.55.181"))
			{
			//if (tag.DZ1.D2211 == 1 && tag.DZ1.D2220 == 1)
			// tag.DZ1.D2211 = 0;
			//if (tag.DZ1.D2216 == 1 && tag.DZ1.D2225 == 1)
			// tag.DZ1.D2216 = 0;
			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;
			//if (tag.DZ2.D2216 == 1 && tag.DZ2.D2225 == 1)
			// tag.DZ2.D2216 = 0;
			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åæ åå¥ä½éç½®å®æã =================> ");
			@@ -1804,6 +1861,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":
			@@ -1844,33 +1902,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");
			}
			@@ -2007,8 +2065,8 @@
			{
			var taggg = tag.SA1019;
			string vqu = "A1019åè´§äº¤äº";
			Console.WriteLine($"1019ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadSsxOver)
			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ç³è¯·");
			@@ -2046,11 +2104,12 @@
			{
			var taggg = tag.SA2030;
			string vqu = "A2030åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadSsxOver)
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2058,11 +2117,12 @@
			{
			var taggg = tag.SA2001;
			string vqu = "A2001æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadSsxOver)
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2070,11 +2130,12 @@
			{
			var taggg = tag.SA1030;
			string vqu = "A1030åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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ç³è¯·");
			}
			}

			@@ -2082,11 +2143,12 @@
			{
			var taggg = tag.SA1025;
			string vqu = "A1025æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2094,11 +2156,12 @@
			{
			var taggg = tag.SA1022;
			string vqu = "A1022æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2106,11 +2169,12 @@
			{
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3010åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2118,11 +2182,12 @@
			{
			var taggg = tag.ssxè¾éçº¿.s3006;
			string vqu = "A3006æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2130,11 +2195,12 @@
			{
			var taggg = tag.ssxè¾éçº¿.s3005;
			string vqu = "A3005åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2142,11 +2208,12 @@
			{
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3001æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			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 + ".Ssetreq", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "æ¸AGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "æ¸AGVç³è¯·");
			}
			}

			@@ -2172,7 +2239,19 @@
			}
			public void Thread1030Down(Tag tag)
			{
			//Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼ =====>agvå®æSOver{tag.SA1030.SOver}");
			Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼ =====>");
			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", "æ¸ç");
			@@ -2507,9 +2586,9 @@
			case "1022":
			{
			type = "A008";
			if (tag.SA1022.R5ç©ºé² != 1)
			if (tag.SA1022.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹1022 éç©ºé²ï¼ä¸æ¨é");
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹1022 >{tag.SA1022.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2517,9 +2596,9 @@
			case "1025":
			{
			type = "A007";
			if (tag.SA1025.R5ç©ºé² != 1)
			if (tag.SA1025.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 1025 éç©ºé²ï¼ä¸æ¨é");
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 1025 >{tag.SA1025.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2527,9 +2606,9 @@
			case "2001":
			{
			type = "A007";
			if (tag.SA2001.R5ç©ºé² != 1)
			if (tag.SA2001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 2001 éç©ºé²ï¼ä¸æ¨é");
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 2001>{tag.SA2001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2537,9 +2616,9 @@
			case "3001":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 1)
			if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3001 éç©ºé²ï¼ä¸æ¨é");
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3001>{tag.ssxè¾éçº¿.s3001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2547,9 +2626,9 @@
			case "3006":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 1)
			if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3006 éç©ºé²ï¼ä¸æ¨é");
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3006>{tag.ssxè¾éçº¿.s3001.R5ç©ºé²} éç©ºé²ï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2703,7 +2782,7 @@

			public string procNo()
			{
			return TaskProcess.GenerateTaskNo("æ¥å¿æµæ°´å·");
			return TaskProcess.GenerateTaskNo("æ¥å¿æµæ°´å·", "LOG");
			}
			public bool SetRedistoPlc(string key, string value, string queue, string desc)
			{
			@@ -3050,6 +3129,7 @@
			{
			requestType = 7,
			startBit = VERX.location[0],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			@@ -3073,6 +3153,7 @@
			{
			requestType = 7,
			startBit = VERX.location[1],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");
			@@ -3102,13 +3183,14 @@
			LogHelper.Info("å®å2å·çº¿ deviceType 5 æ²¡æéç½®ã");
			return;
			}
			LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST} D2226>{tag.DZ1.D2226} D2226_LAST>{tag.DZ1.D2226_LAST}");
			LogHelper.Info($" {VERX.deviceName} 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}");
			@@ -3131,6 +3213,7 @@
			{
			requestType = 7,
			startBit = VERX.location[1],
			endBit = "1025",
			unLockStartBitOutbin = true
			}));
			LogHelper.Info($"{VERX.location[0]}ç³è¯·mesä»»å¡ç»æ{str}");