WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -1676,6 +1676,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;
			@@ -1733,6 +1746,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;
			@@ -1979,7 +1999,7 @@
			var taggg = tag.SA1019;
			string vqu = "A1019åè´§äº¤äº";
			Console.WriteLine($"1019ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadSsxOver)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -1991,7 +2011,26 @@
			private void sa2008(Tag tag)
			{
			var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
			//if(tag.ssxè¾éçº¿.s2008)
			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)
			@@ -1999,7 +2038,7 @@
			var taggg = tag.SA2030;
			string vqu = "A2030åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadSsxOver)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2011,7 +2050,7 @@
			var taggg = tag.SA2001;
			string vqu = "A2001æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadSsxOver)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2023,7 +2062,7 @@
			var taggg = tag.SA1030;
			string vqu = "A1030åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2035,7 +2074,7 @@
			var taggg = tag.SA1025;
			string vqu = "A1025æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2047,7 +2086,7 @@
			var taggg = tag.SA1022;
			string vqu = "A1022æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2059,7 +2098,7 @@
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3010åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2071,7 +2110,7 @@
			var taggg = tag.ssxè¾éçº¿.s3006;
			string vqu = "A3006æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2083,7 +2122,7 @@
			var taggg = tag.ssxè¾éçº¿.s3005;
			string vqu = "A3005åè´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			@@ -2095,7 +2134,7 @@
			var taggg = tag.ssxè¾éçº¿.s3010;
			string vqu = "A3001æ¾è´§äº¤äº";
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (tag.SA1019.SOver && tag.SA1019.SreadSsxOver)
			if (taggg.SOver && taggg.SreadAgvover)
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");