WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -782,11 +782,11 @@
			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)
			{
			LogHelper.Info($"RGV125å½ä»¤æªæ§è¡ tag.RGV.workMod == 0 && tag.RGV.taskmod == 0 && tag.RGV.taskno1 == tag.RGV.ReadTask1No && tag.RGV.taskno2 == tag.RGV.ReadTask2No èªå¨æ¸é¤125");
			@@ -1851,6 +1851,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":
			@@ -1891,33 +1892,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");
			}
			@@ -2054,8 +2055,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ç³è¯·");
			@@ -2093,8 +2094,8 @@
			{
			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ç³è¯·");
			@@ -2106,8 +2107,8 @@
			{
			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ç³è¯·");
			@@ -2119,7 +2120,7 @@
			{
			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ç³è¯·");
			@@ -2132,7 +2133,7 @@
			{
			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ç³è¯·");
			@@ -2145,7 +2146,7 @@
			{
			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ç³è¯·");
			@@ -2158,7 +2159,7 @@
			{
			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ç³è¯·");
			@@ -2171,7 +2172,7 @@
			{
			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ç³è¯·");
			@@ -2184,7 +2185,7 @@
			{
			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ç³è¯·");
			@@ -2197,7 +2198,7 @@
			{
			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ç³è¯·");
			@@ -2577,7 +2578,7 @@
			type = "A008";
			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;
			}
			}
			@@ -2587,7 +2588,7 @@
			type = "A007";
			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;
			}
			}
			@@ -2597,7 +2598,7 @@
			type = "A007";
			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;
			}
			}
			@@ -2607,7 +2608,7 @@
			type = "A010";
			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;
			}
			}
			@@ -2617,7 +2618,7 @@
			type = "A010";
			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;
			}
			}