WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -1,4 +1,5 @@
			ï»¿using Newtonsoft.Json;
			#region [èªå®ä¹ç±»-VS][20250623083459471][AutoThread]
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.Collections.Concurrent;
			@@ -236,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
			@@ -251,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))
			@@ -267,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
			{
			@@ -305,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
			@@ -319,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))
			@@ -335,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
			{
			@@ -373,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
			@@ -387,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))
			@@ -403,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
			{
			@@ -442,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
			@@ -456,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))
			@@ -472,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
			{
			@@ -535,21 +548,44 @@
			}
			try
			{
			LogHelper.Info("ä»»å¡ä¸å Rgv ä»»å¡ è¿å¥");
			#region Rgv

			LogHelper.Info($"æ¥çRGV çµéï¼ã{tag.RGV.Rå½åçµé}ã åçµç¶æï¼ã{tag.RGV.Råçµç¶æ}ã æéä»£ç ï¼ã{tag.RGV.RgvrunError}ã");
			LogHelper.Info($"æ¥çRGV çµéï¼ã{tag.RGV.Rå½åçµé}ã åçµç¶æï¼ã{tag.RGV.Råçµç¶æ}ã æéä»£ç ï¼ã{tag.RGV.RgvrunError}ã æå¨1èªå¨2ã{tag.RGV.Ræå¨1èªå¨2}ã");

			if (tag.RGV.Ræå¨1èªå¨2 == 1)
			{
			LogHelper.Info($"RGV æå¨æ¨¡å¼ï¼ä¸ç¨ç®¡ã");
			return;
			}
			if (tag.RGV.taskend == 125)
			{
			LogHelper.Info($"RGV æ125å½ä»¤æªæ§è¡ã");
			System.Threading.Thread.Sleep(3000);
			return;
			}
			LogHelper.Info("ä»»å¡ä¸å Rgv ä»»å¡ è¿å¥");

			TaskEntity task1 = null;
			TaskEntity task2 = null;
			var task1Isrun = false;
			if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver != 1)
			{
			task1Isrun = true;
			var taskno = tag.RGV.ReadTask1No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task1 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task1 != null && task1.S_B_STATE != "å®æ")
			task1Isrun = true;
			//if (tag.RGV.bit1taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit1taskOver_LAST", "0", out string msg);
			}
			var task2Isrun = false;
			if (tag.RGV.ReadTask2No > 0 && tag.RGV.bit2taskOver != 1)
			{
			task2Isrun = true;
			var taskno = tag.RGV.ReadTask2No;
			string tno = "TN" + (DateTime.Now.ToString("yy")) + ((taskno.ToString()).PadLeft(8, '0'));
			task2 = taskservice.FindEntity(x => x.S_TASK_NO == tno);
			if (task2 != null && task2.S_B_STATE != "å®æ")
			task2Isrun = true;
			//if (tag.RGV.bit2taskOver_LAST == 1)
			// RedisHelper.Add($"RGV.bit2taskOver_LAST", "0", out string msg);
			}
			@@ -561,12 +597,10 @@
			if (task2Isrun)
			mes += tag.RGV.ReadTask2No + "æ§è¡ä¸...";
			LogHelper.Info($"{mes} ä¸è½ä¸åæ°ä»»å¡ã");
			throw new Exception($"{mes} ä¸è½ä¸åæ°ä»»å¡ã");
			System.Threading.Thread.Sleep(3000);
			return;
			}
			var thisOver = 0;
			TaskEntity task1 = null;
			TaskEntity task2 = null;

			LogHelper.Info($"æ¥çRGV 1å·¥ä½ä»»å¡ã");
			if (tag.RGV.ReadTask1No > 0 && tag.RGV.bit1taskOver == 1)
			{
			@@ -575,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 != "å®æ")
			@@ -584,11 +618,13 @@
			if (task1.S_B_STATE == "åè´§å®æ")
			{
			task1.S_B_STATE = "å®æ";
			//tag.RGV.ReadTask1No = 0;
			}
			else
			{
			task1.S_B_STATE = "åè´§å®æ";
			}
			//tag.RGV.bit1taskOver = 0;
			LogHelper.Info($"RGV 1å·¥ä½ä»»å¡{task1.S_TASK_NO} ç¶æåæ¢ä¸º{task1.S_B_STATE}");
			//tag.RGV.bit1taskOver_LAST = 1;
			RedisHelper.Add($"RGV.bit1taskOver_LAST", "1", out string msg);
			@@ -624,11 +660,13 @@
			if (task2.S_B_STATE == "åè´§å®æ")
			{
			task2.S_B_STATE = "å®æ";
			//tag.RGV.ReadTask2No = 0;
			}
			else
			{
			task2.S_B_STATE = "åè´§å®æ";
			}
			//tag.RGV.bit2taskOver = 0;
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡{task2.S_TASK_NO} ç¶æåæ¢ä¸º{task2.S_B_STATE}");
			RedisHelper.Add($"RGV.bit2taskOver_LAST", "1", out string msg);
			LogHelper.Info($"RGV 2å·¥ä½ä»»å¡åå¤ç");
			@@ -647,14 +685,14 @@
			}

			//if (thisOver > 0)
			{
			var v2 = RedisHelper.Get<WriteGroupEntity>("RGVQueue", out string rev);
			if (v2 != null)
			{
			LogHelper.Info($"RGVQueue è¯»å°ç»æ-{JsonConvert.SerializeObject(v2)} \n ä¸ååè¿è¡æ¸é¤ã");
			var b = RedisHelper.Remove("RGVQueue", out rev);
			}
			}
			//{
			// var v2 = RedisHelper.Get<WriteGroupEntity>("RGVQueue", out string rev);
			// if (v2 != null)
			// {
			// LogHelper.Info($"RGVQueue è¯»å°ç»æ-{JsonConvert.SerializeObject(v2)} \n ä¸ååè¿è¡æ¸é¤ã");
			// var b = RedisHelper.Remove("RGVQueue", out rev);
			// }
			//}

			///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();
			@@ -688,11 +726,13 @@

			// 2å· ä¼åç» 1020 1008 1016
			var t2 = tklist.OrderBy(x => x.T_CREATE).ToList().Find(x => x.S_START_LOC == "1020" \|\| x.S_START_LOC == "1008" \|\| x.S_START_LOC == "1016");
			if (tklist != null)
			if (t2 != null)
			{
			LogHelper.Info($"æ¥çRGV1 æä»»å¡{task1.S_TASK_NO},å·¥ä½2 æ²¡ä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			tag.RGV.workMod = 2;
			LogHelper.Info($"{task1.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{task1.S_TASK_NO}> taskmod 1 ãåè´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
			tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
			t2.S_B_STATE = "å·²æ¨é";
			@@ -753,7 +793,9 @@
			{
			LogHelper.Info($"æ¥çRGV1 æä»»å¡{task1.S_TASK_NO},å·¥ä½2 æ²¡ä»»å¡ã æ²¡æåä¾§åè´§ä»»å¡ 1å·¥ä½å¸è´§ã");
			tag.RGV.workMod = 1;
			LogHelper.Info($"{task1.S_TASK_NO}> workMod 1 ã1å·¥ä½ã");
			tag.RGV.taskmod = 2;
			LogHelper.Info($"{task1.S_TASK_NO}> taskmod 2 ãå¸è´§ã");
			tag.RGV.taskno1 = Convert.ToUInt32(task1.S_TASK_NO.Substring(4));
			tag.RGV.task1do = Convert.ToUInt16(task1.S_END_LOC);
			System.Threading.Thread.Sleep(750);
			@@ -771,7 +813,9 @@
			LogHelper.Info($"æ¥çRGV 1å·¥ä½æ²¡ä»»å¡,å·¥ä½2 æä»»å¡{task2.S_TASK_NO}ãå·¥ä½2å¸è´§ãã");
			//2 å¸è´§ã
			tag.RGV.workMod = 2;
			LogHelper.Info($"{task2.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 2;
			LogHelper.Info($"{task2.S_TASK_NO}> taskmod 2 ãå¸è´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(task2.S_TASK_NO.Substring(4));
			tag.RGV.task2do = Convert.ToUInt16(task2.S_END_LOC);
			System.Threading.Thread.Sleep(750);
			@@ -793,9 +837,11 @@
			//}
			if (e1017first != null)
			{
			LogHelper.Info($"æ¥çRGV1 ä»»å¡å·¥ä½2 æ²¡ä»»å¡ã 1002 1010 1023åè´§ä»»å¡{e1017first.S_TASK_NO}ã");
			LogHelper.Info($"æ¥çRGVæ²¡ä»»å¡ï¼ ç»å·¥ä½1çéä»»å¡ã 1002 1010 1023åè´§ä»»å¡{e1017first.S_TASK_NO}ã");
			tag.RGV.workMod = 1;
			LogHelper.Info($"{e1017first.S_TASK_NO}> workMod 1 ã1å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{e1017first.S_TASK_NO}> taskmod 1 ãåè´§ã");
			uint tno = Convert.ToUInt32(e1017first.S_TASK_NO.Substring(4));
			LogHelper.Info($"{e1017first.S_TASK_NO}> è½¬æ¢åä»»å¡å·{tno} å¼å§åå¥ã");
			tag.RGV.taskno1 = tno;
			@@ -810,17 +856,19 @@
			LogHelper.Info($"{e1017first.S_TASK_NO}> taskend å125");
			//tag.RGV.taskend=125
			Conn.é»è®¤Redis.SetValue("RGV.taskend", "125", "RGVQueue", false);

			}
			else
			{
			var t2 = tklist.OrderBy(x => x.T_CREATE).ToList().Find(x => x.S_START_LOC == "1020" \|\| x.S_START_LOC == "1008" \|\| x.S_START_LOC == "1016");
			if (tklist != null)
			{
			LogHelper.Info($"æ¥çRGV1 æ²¡ä»»å¡å·¥ä½2 æ²¡ä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			LogHelper.Info($"æ¥çRGVæ²¡ä»»å¡ ç»å·¥ä½2çéä»»å¡ã æ¾1020 1008 1016åè´§ä»»å¡{t2.S_TASK_NO}ã");
			tag.RGV.workMod = 2;
			LogHelper.Info($"{t2.S_TASK_NO}> workMod 2 ã2å·¥ä½ã");
			tag.RGV.taskmod = 1;
			LogHelper.Info($"{t2.S_TASK_NO}> taskmod 1 ãåè´§ã");
			tag.RGV.taskno2 = Convert.ToUInt32(t2.S_TASK_NO.Substring(4));
			LogHelper.Info($"{t2.S_TASK_NO}> taskno2 {Convert.ToUInt32(t2.S_TASK_NO.Substring(4))}ãä»»å¡å·ã");
			tag.RGV.task2do = Convert.ToUInt16(t2.S_START_LOC);
			t2.S_B_STATE = "å·²æ¨é";
			taskservice.Update(t2);
			@@ -846,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();
			@@ -859,7 +908,13 @@
			taskActRepository.Update(item);
			continue;
			}
			//var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
			var task = taskRepository.FindEntity(x => x.S_TASK_NO == item.S_TASK_NO);
			if (task == null)
			{
			item.N_CREATEMETHOD = -1;
			taskActRepository.Update(item);
			continue;
			}
			string loc = "";
			if (tin < 2)
			{
			@@ -882,8 +937,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)
			{
			@@ -908,7 +962,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);
			}

			}
			@@ -1155,7 +1209,7 @@
			var R5ç©ºé²_LAST = (System.UInt16)System.Convert.ChangeType(Conn.é»è®¤Redis.GetValue($"S{item}Read.R5ç©ºé²_LAST"), typeof(System.UInt16));
			if (R5 == 5 && R5ç©ºé²_LAST == 0)
			{
			task = taskRepository.FindEntity(x => x.S_END_LOC == Bssx && x.S_B_STATE != "å®æ" && x.S_B_STATE != "åæ¶");
			task = taskRepository.FindEntity(x => x.S_END_LOC == item && x.S_B_STATE != "å®æ" && x.S_B_STATE != "åæ¶");
			msg = "";
			if (task != null)
			{
			@@ -1354,3 +1408,5 @@

			}
			}

			#endregion [èªå®ä¹ç±»-VS][20250623083459471][AutoThread]