WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -28,6 +28,8 @@
			using GZ.DB.Repository.OIDATABASE;
			using GZ.DB.IRepository.OIDATABASE;
			using GZ.DB.Entity.OIDATABASE;
			using static GZ.Projects.AuxAllWCS.ToWMSMES.CreateTask;
			using GZ.Device.PLC;
			namespace GZ.Projects.AuxAllWCS
			{
			/// <summary>
			@@ -50,11 +52,12 @@

			try
			{
			HttpSvcHost = new System.Net.HttpListener();
			HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
			HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
			HttpSvcHost.Start();
			HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
			//HttpSvcHost = new System.Net.HttpListener();
			//HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
			//HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
			//HttpSvcHost.Start();
			//HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
			LogHelper.Info("<<<<<<<<<<<Runnnnnnnnnnnnninggggg>>>>>>>>>>");
			}
			catch (Exception ex)
			{
			@@ -62,6 +65,14 @@
			}
			View1_Init(sender, e);

			//var path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs");
			//string text = File.ReadAllText(configPath);
			//PlcConfig plcConfig = JsonConvert.DeserializeObject<PlcConfig>(text);
			//if (plcConfig != null && FactoryMap.ContainsKey((int)plcConfig.Brand) && FactoryMap[(int)plcConfig.Brand].Contains((int)plcConfig.Comm))
			//{

			//}
			//Console.Write(path);
			/// <summary>
			/// ç¨åºçæ®µ:åå§åéç½®
			/// æè¿°:
			@@ -173,21 +184,21 @@
			// RunafterMac(di,true);
			/// TODO mes ä¸åã æ¹ææºæ¢°èçæ§ - çæ§ç©ºçè¿æ¯æ»¡ç - èå¨mes ä»»å¡ã

			LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°1ï¼ç»´å¸å°æè1.State:{Device.ç»´å¸å°æè1.State} ");
			Device.ç»´å¸å°æè1.ReadPLC("ç»´å¸å°æè1.R50", out object value);
			LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°1ï¼ç»´å¸å°æè1.R50:{value?.ToString()} ");
			//LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°1ï¼ç»´å¸å°æè1.State:{Device.ç»´å¸å°æè1.State} ");
			//Device.ç»´å¸å°æè1.ReadPLC("ç»´å¸å°æè1.R50", out object value);
			//LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°1ï¼ç»´å¸å°æè1.R50:{value?.ToString()} ");

			LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°2ï¼ç»´å¸å°æè2.State:{Device.ç»´å¸å°æè2.State} ");
			Device.ç»´å¸å°æè2.ReadPLC("ç»´å¸å°æè2.R50", out value);
			LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°2ï¼ç»´å¸å°æè2.R50:{value?.ToString()} ");
			//LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°2ï¼ç»´å¸å°æè2.State:{Device.ç»´å¸å°æè2.State} ");
			//Device.ç»´å¸å°æè2.ReadPLC("ç»´å¸å°æè2.R50", out value);
			//LogHelper.Info($"è®¾å¤ç¶æï¼ç»´å¸å°2ï¼ç»´å¸å°æè2.R50:{value?.ToString()} ");

			LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬1ï¼Jsæ·é¡º1.State:{Device.Jsæ·é¡º1.State} ");
			Device.Jsæ·é¡º1.ReadPLC("Jsæ·é¡º1.D1202", out value);
			LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬1 Jsæ·é¡º1.D1202:{value?.ToString()} ");
			//LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬1ï¼Jsæ·é¡º1.State:{Device.Jsæ·é¡º1.State} ");
			//Device.Jsæ·é¡º1.ReadPLC("Jsæ·é¡º1.D1202", out value);
			//LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬1 Jsæ·é¡º1.D1202:{value?.ToString()} ");

			LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬2ï¼Jsæ·é¡º2.State:{Device.Jsæ·é¡º2.State} ");
			Device.Jsæ·é¡º2.ReadPLC("Jsæ·é¡º2.D1202", out value);
			LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬2 Jsæ·é¡º2.D1202:{value?.ToString()} ");
			//LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬2ï¼Jsæ·é¡º2.State:{Device.Jsæ·é¡º2.State} ");
			//Device.Jsæ·é¡º2.ReadPLC("Jsæ·é¡º2.D1202", out value);
			//LogHelper.Info($"è®¾å¤ç¶æï¼æ·ç¬2 Jsæ·é¡º2.D1202:{value?.ToString()} ");


			#endregion [èæ¬][20250325085810885][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.èªæµè½¬æµç¨]
			@@ -370,7 +381,7 @@
			{
			#region [èæ¬][20250531163716255][ä¸å¡é»è¾.å¤çMESä»»å¡çº¿ç¨.ResolveMesTask]
			//mes ä»»å¡æåãä¸æ®µä»»å¡å å¤æ®µä»»å¡ã
			ToWMSMES.ResMesTask();
			ToWMSMES.ResMesTask(tag);
			#endregion [èæ¬][20250531163716255][ä¸å¡é»è¾.å¤çMESä»»å¡çº¿ç¨.ResolveMesTask]
			}
			catch (Exception ex)
			@@ -387,15 +398,7 @@
			try
			{
			#region [èæ¬][20250605212104026][ä¸å¡é»è¾.SocketServer]
			var host = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName());
			foreach (var ip in host.AddressList)
			{
			if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
			{
			Console.WriteLine($"ip= {ip.ToString()}");
			new TcpServer(ip.ToString());
			}
			}
			AutoThread.InvokeMethod(AutoThread.Instance, "TaskEverythingRun");
			#endregion [èæ¬][20250605212104026][ä¸å¡é»è¾.SocketServer]
			}
			catch (Exception ex)
			@@ -801,35 +804,66 @@
			}
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});
			//æ§è¡å¤æ¬¡
			for (int iii = 0; iii < 1; iii++)
			/// <summary>
			/// ç¨åºçæ®µ:Ipping
			/// æè¿°:æ£æµIPå°åéæ
			/// </summary>
			System.Threading.Tasks.Task.Factory.StartNew(() =>
			{
			if (IsExitApp) { break; }
			try
			System.Threading.Thread.CurrentThread.IsBackground = true;
			ExitJudgeStack.Push(0);
			//ä¸ç´æ§è¡ï¼ç´å°æ»¡è¶³ç»ææ¡ä»¶
			while (true)
			{
			#region [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]
			if (IsExitApp) { break; }
			try
			{
			#region [èæ¬][20250323151832119][ä¸å¡é»è¾.Ipping]

			//LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
			//LogHelper.Info($"<<<<<<<<<<<<<<<<<ç¨åºÂ·å¯å¨>>>>>>>>>>>>>>");

			//// ä½¿ç¨æ¦æªå¨
			//var interceptor = new ConsoleInterceptor();
			//Console.SetOut(interceptor);

			//LogHelper.Info($"<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>");
			//AnsiConsole.Markup("[underline red]Hello[/] World!");
			// AnsiConsole.Markup("[underline red]Hello[/] World!");
			#endregion [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]
			//var hkr = AutoThread.InvokeMethod(AutoThread.Instance, "IsMachineOnline", new object[] { "192.168.1.103", 1000 });
			//Console.WriteLine("192.168.1.103 > " + hkr.ToString());
			#endregion [èæ¬][20250323151832119][ä¸å¡é»è¾.Ipping]
			}
			catch (Exception ex)
			{
			Conn.é»è®¤æ¥å¿.Error(ex.ToString());
			}
			finally
			{
			System.Threading.Thread.Sleep(3000);
			}
			}
			catch (Exception ex)
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});
			/// <summary>
			/// ç¨åºçæ®µ:æ°çº¿ç¨æ»çº¿
			/// æè¿°:1
			/// </summary>
			System.Threading.Tasks.Task.Factory.StartNew(() =>
			{
			System.Threading.Thread.CurrentThread.IsBackground = true;
			ExitJudgeStack.Push(0);
			//ä¸ç´æ§è¡ï¼ç´å°æ»¡è¶³ç»ææ¡ä»¶
			while (true)
			{
			Conn.é»è®¤æ¥å¿.Error(ex.ToString());
			if (IsExitApp) { break; }
			try
			{
			#region [èæ¬][20250708095248653][ä¸å¡é»è¾.æ°çº¿ç¨æ»çº¿]
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreaTotal", new object[] { tag, Device });
			#endregion [èæ¬][20250708095248653][ä¸å¡é»è¾.æ°çº¿ç¨æ»çº¿]
			}
			catch (Exception ex)
			{
			Conn.é»è®¤æ¥å¿.Error(ex.ToString());
			}
			finally
			{
			System.Threading.Thread.Sleep(3000);
			}
			}
			finally
			{
			System.Threading.Thread.Sleep(3000);
			}
			}
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});

			}
			/// <summary>
			@@ -933,7 +967,24 @@
			Device.A2030åè´§äº¤äº?.Stop();
			Device.RGV?.Stop();
			Device.påé£ç§2ä¸çº¿?.Stop();
			Device.påé£ç§3ä¸çº¿?.Stop();
			Device.Då®å1å·æºæ¢°æ?.Stop();
			Device.Då®å2å·æºæ¢°æ?.Stop();
			Device.S2027Read?.Stop();
			Device.S2020Read?.Stop();
			Device.S2013Read?.Stop();
			Device.S2027Write?.Stop();
			Device.S2020Write?.Stop();
			Device.S2013Write?.Stop();
			Device.S2001Write?.Stop();
			Device.S2008Write?.Stop();
			Device.S3001Read?.Stop();
			Device.S3006Read?.Stop();
			Device.S3005Read?.Stop();
			Device.S3010Read?.Stop();
			Device.A3001æ¾è´§äº¤äº?.Stop();
			Device.A3005åè´§äº¤äº?.Stop();
			Device.A3006æ¾è´§äº¤äº?.Stop();
			Device.A3010åè´§äº¤äº?.Stop();
			}
			catch (Exception ex)
			{
			@@ -985,7 +1036,24 @@
			\|\| (Device.A2030åè´§äº¤äº == null ? false : Device.A2030åè´§äº¤äº.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.RGV == null ? false : Device.RGV.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.påé£ç§2ä¸çº¿ == null ? false : Device.påé£ç§2ä¸çº¿.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.påé£ç§3ä¸çº¿ == null ? false : Device.påé£ç§3ä¸çº¿.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.Då®å1å·æºæ¢°æ == null ? false : Device.Då®å1å·æºæ¢°æ.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.Då®å2å·æºæ¢°æ == null ? false : Device.Då®å2å·æºæ¢°æ.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2027Read == null ? false : Device.S2027Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2020Read == null ? false : Device.S2020Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2013Read == null ? false : Device.S2013Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2027Write == null ? false : Device.S2027Write.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2020Write == null ? false : Device.S2020Write.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2013Write == null ? false : Device.S2013Write.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2001Write == null ? false : Device.S2001Write.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S2008Write == null ? false : Device.S2008Write.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S3001Read == null ? false : Device.S3001Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S3006Read == null ? false : Device.S3006Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S3005Read == null ? false : Device.S3005Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.S3010Read == null ? false : Device.S3010Read.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.A3001æ¾è´§äº¤äº == null ? false : Device.A3001æ¾è´§äº¤äº.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.A3005åè´§äº¤äº == null ? false : Device.A3005åè´§äº¤äº.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.A3006æ¾è´§äº¤äº == null ? false : Device.A3006æ¾è´§äº¤äº.State != GZ.Device.PLC.PlcRunState.Stoped)
			\|\| (Device.A3010åè´§äº¤äº == null ? false : Device.A3010åè´§äº¤äº.State != GZ.Device.PLC.PlcRunState.Stoped)
			)
			{
			System.Threading.Thread.Sleep(1000);
			@@ -1160,6 +1228,43 @@
			var res = ToWMSMES.CreateTask.CreatePointTask(model);
			return JsonConvert.SerializeObject(res);
			}
			case "/api/Wcs/initZZCache":
			{
			statusCode = System.Net.HttpStatusCode.OK;

			var rturn = new ReturnMsg
			{
			resultCode = 0,
			resultMsg = ""
			};
			try
			{
			LocRepository locRepository = new LocRepository();
			foreach (var item in Settings.deviceInfos.FindAll(x => x.deviceType == 2))
			{
			foreach (var ssloc in item.deviceNo)
			{
			var ssl = locRepository.FindEntity(x => x.S_LOC_CODE == ssloc);
			if (ssl != null && (ssl.N_CURRENT_NUM > 0 \|\| ssl.S_LOCK_STATE != "æ "))
			{
			ssl.N_CURRENT_NUM = 0;
			ssl.S_LOCK_STATE = "æ ";
			locRepository.Update(ssl);
			}
			}
			}
			}
			catch (Exception ex)
			{
			LogHelper.Error("/api/Wcs/initZZCache" + requestJson + ex.Message, ex);
			return JsonConvert.SerializeObject(new ReturnMsg
			{
			resultCode = -1,
			resultMsg = ex.Message
			});
			}
			return JsonConvert.SerializeObject(rturn);
			}
			}
			break;
			}
			@@ -1172,7 +1277,7 @@
			statusCode = System.Net.HttpStatusCode.OK;
			// å¤å¶å°case ä¸
			//var _ when System.Text.RegularExpressions.Regex.IsMatch(path, @"\.(html\|ico\|js\|css)(\?.*)?$", System.Text.RegularExpressions.RegexOptions.IgnoreCase)
			var filePath = System.IO.Path.Combine("Static", path.Substring(1));
			var filePath = /Directory.GetCurrentDirectory() + "\\Static" + "\\" + path.Substring(1);/System.IO.Path.Combine(Directory.GetCurrentDirectory() + "\\Static", path.Substring(1));
			return File.ReadAllText(filePath);
			}
			}