WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -925,9 +925,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 +1312,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1019åè´§äº¤äº.Ssetreq", "true", "A1019åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1019.StaskMode = 1;
			}
			}
			break;
			case "1030":
			@@ -1310,7 +1326,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1030åè´§äº¤äº.Ssetreq", "true", "A1030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1030.StaskMode = 1;
			}
			}
			break;
			case "2030":
			@@ -1321,7 +1340,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2030åè´§äº¤äº.Ssetreq", "true", "A2030åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2030.StaskMode = 1;
			}
			}
			break;
			case "3005":
			@@ -1332,7 +1354,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3005åè´§äº¤äº.Ssetreq", "true", "A3005åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3005.StaskMode = 1;
			}
			}
			break;
			case "3010":
			@@ -1343,7 +1368,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3010åè´§äº¤äº.Ssetreq", "true", "A3010åè´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3010.StaskMode = 1;
			}
			}
			break;
			//}
			@@ -1357,7 +1385,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1022æ¾è´§äº¤äº.Ssetreq", "true", "A1022æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1022.StaskMode = 2;
			}
			}
			break;
			case "1025":
			@@ -1368,7 +1399,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A1025æ¾è´§äº¤äº.Ssetreq", "true", "A1025æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA1025.StaskMode = 2;
			}
			}
			break;
			case "2001":
			@@ -1379,7 +1413,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A2001æ¾è´§äº¤äº.Ssetreq", "true", "A2001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.SA2001.StaskMode = 2;
			}
			}
			break;
			case "3001":
			@@ -1390,7 +1427,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3001æ¾è´§äº¤äº.Ssetreq", "true", "A3001æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3001.StaskMode = 2;
			}
			}
			break;
			case "3006":
			@@ -1401,7 +1441,10 @@
			continuuuuu = true;
			}
			else
			{
			SetRedistoPlc("A3006æ¾è´§äº¤äº.Ssetreq", "true", "A3006æ¾è´§äº¤äºQueue", "åAGVç³è¯·");
			tag.ssxè¾éçº¿.s3006.StaskMode = 2;
			}
			}
			break;
			}
			@@ -1449,7 +1492,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;
			@@ -2053,8 +2096,9 @@
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadSsxOver)
			{
			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ç³è¯·");
			}
			}

			@@ -2065,8 +2109,9 @@
			Console.WriteLine($"{vqu}ä»»å¡ç¶æï¼ =====>ä»»å¡ç³è¯·ï¼{taggg.Ssetreq},è¾éçº¿åè®¸ï¼{taggg.SreadCan} ä»»å¡å®æï¼{taggg.SOver} è¾éçº¿æ¶å°å®æï¼{taggg.SreadAgvover}");
			if (taggg.SOver && taggg.SreadSsxOver)
			{
			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ç³è¯·");
			}
			}

			@@ -2079,6 +2124,7 @@
			{
			SetRedistoPlc(vqu + ".Ssetreq", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".SOver", "false", vqu + "Queue", "åAGVç³è¯·");
			SetRedistoPlc(vqu + ".StaskMode", "0", vqu + "Queue", "åAGVç³è¯·");
			}
			}

			@@ -2089,8 +2135,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2101,8 +2148,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2113,8 +2161,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2125,8 +2174,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2137,8 +2187,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2149,8 +2200,9 @@
			Console.WriteLine($"{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ç³è¯·");
			}
			}

			@@ -2177,7 +2229,7 @@
			public void Thread1030Down(Tag tag)
			{
			Console.WriteLine($"SA1030 ä»»å¡ç¶æï¼ =====>");
			if (tag.SA1030.RtaskState == 4 && tag.SA1030.RtaskState_LAST == 0 && tag.SA2001.R5ç©ºé² == 1)
			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
			{
			@@ -2523,7 +2575,7 @@
			case "1022":
			{
			type = "A008";
			if (tag.SA1022.R5ç©ºé² != 1)
			if (tag.SA1022.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹1022 éç©ºé²ï¼ä¸æ¨é");
			continue;
			@@ -2533,7 +2585,7 @@
			case "1025":
			{
			type = "A007";
			if (tag.SA1025.R5ç©ºé² != 1)
			if (tag.SA1025.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 1025 éç©ºé²ï¼ä¸æ¨é");
			continue;
			@@ -2543,7 +2595,7 @@
			case "2001":
			{
			type = "A007";
			if (tag.SA2001.R5ç©ºé² != 1)
			if (tag.SA2001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 2001 éç©ºé²ï¼ä¸æ¨é");
			continue;
			@@ -2553,7 +2605,7 @@
			case "3001":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 1)
			if (tag.ssxè¾éçº¿.s3001.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3001 éç©ºé²ï¼ä¸æ¨é");
			continue;
			@@ -2563,7 +2615,7 @@
			case "3006":
			{
			type = "A010";
			if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 1)
			if (tag.ssxè¾éçº¿.s3006.R5ç©ºé² != 5)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç»ç¹ 3006 éç©ºé²ï¼ä¸æ¨é");
			continue;

	2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs	100 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	2025年6月12日/AuxAllWCS/Build/Project/代码/自定义类.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -571,16 +571,16 @@
			var fromLoc = locc.FindEntity(x => x.S_LOC_CODE == from);
			var endLoc = locc.FindEntity(x => x.S_LOC_CODE == to);

			string t = "";
			//string t = "";
			if (workMode == "AGV" && string.IsNullOrEmpty(S_INDEX))
			{
			var s = Settings.deviceInfos.Find(x => x.location.Contains(from)) != null;
			var e = Settings.deviceInfos.Find(x => x.location.Contains(to)) != null;

			t = "F01";
			if (s && !e) t = "A002";
			if (!s && e) t = "A003";
			if (s && e) t = "A004";
			S_INDEX = "F01";
			if (s && !e) S_INDEX = "A002";
			if (!s && e) S_INDEX = "A003";
			if (s && e) S_INDEX = "A004";
			}
			try
			{
			@@ -607,7 +607,7 @@
			N_START_LAYER = startLayer,
			N_END_LAYER = endLayer,
			N_CNTR_COUNT = cntrCount,
			S_INDEX = t,
			S_INDEX = S_INDEX,
			};
			ITaskRepository taskserice = new TaskRepository();
			taskserice.Insert(wmsTask);