WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -78,14 +78,8 @@
			{
			#region [èæ¬][20250323111613779][ä¸å¡é»è¾.åå§åéç½®]

			//string a = "{\"success\":true,\"data\":{\"reqCode\":\"008fa3146caa446aa772e160bb3867b6\",\"state\":\"1\",\"error\":\"æ²¡æå¯ä»¥ä½¿ç¨çç¼åç¹ä½\"},\"extra\":{}}";

			//var tsret = JsonConvert.DeserializeObject<Messss>(a);
			Action myDelegate = () => SettingInit();
			/var ts = /
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", new object[] { tag, myDelegate });
			//if (ts.GetType() == typeof(HkReturnResult))
			// Console.WriteLine(ts);
			#endregion [èæ¬][20250323111613779][ä¸å¡é»è¾.åå§åéç½®]
			}
			catch (Exception ex)
			@@ -99,64 +93,6 @@
			}
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});
			//æ§è¡å¤æ¬¡
			for (int iii = 0; iii < 1; iii++)
			{
			if (IsExitApp) { break; }
			try
			{
			#region [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]
			////Conn.é»è®¤Redis.SetValue("è¥¿é¨å2.Param3","300","è¥¿é¨å2Queue");
			////return;
			//if(false){
			// List<string> locs = new List<string>() { "vxr1l", "vx1r", "vxr1c1", "vxr1c2", "vxr2l", "vxr2r", "vxr2c1", "vxr2c2" };
			// List<string> sites = new List<string>() { "196365BB283162", "193841BB283149", "198756BB287300", "198767BB286133", "206987BB282931", "204460BB282975", "209405BB287057", "209377BB285899" };

			// LocRepository locservice = new LocRepository();
			// for (int i = 0; i < locs.Count; i++)
			// {
			// string loccode = locs[i];
			// string sitesss = sites[i];
			// var loc = locservice.FindEntity(x => x.S_LOC_CODE == loccode);
			// if (loc == null)
			// {
			// locservice.Insert(new LocEntity
			// {
			// S_ID = Guid.NewGuid().ToString(),
			// S_STATE = "ç¼è¾",
			// T_CREATE = DateTime.Now,
			// T_MODIFY = DateTime.Now,
			// S_DEEP = "vxr",

			// S_LOC_CODE = loccode,
			// S_AGV_SITE = sitesss,

			// S_LOCK_STATE = "æ ",
			// N_ROW = 1,
			// N_COL = 1,
			// N_AGV_CODE = 0,
			// N_AGV_SITE_LAYER = 0,
			// N_CAPACITY = 1,
			// N_CURRENT_NUM = 0,
			// S_TYPE = "",

			// });
			// }
			// }
			// // TaskProcess.CreateTask("", locs[6], locs[7], "test", 9, new List<string> { "test" }, 1, 1, 1);
			// }

			#endregion [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]
			}
			catch (Exception ex)
			{
			Conn.é»è®¤æ¥å¿.Error(ex.ToString());
			}
			finally
			{
			System.Threading.Thread.Sleep(3000);
			}
			}
			/// <summary>
			/// ç¨åºçæ®µ:æ·ç¬æè1
			/// æè¿°:
			@@ -237,21 +173,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][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.èªæµè½¬æµç¨]
			@@ -865,6 +801,35 @@
			}
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});
			//æ§è¡å¤æ¬¡
			for (int iii = 0; iii < 1; iii++)
			{
			if (IsExitApp) { break; }
			try
			{
			#region [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]

			//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]
			}
			catch (Exception ex)
			{
			Conn.é»è®¤æ¥å¿.Error(ex.ToString());
			}
			finally
			{
			System.Threading.Thread.Sleep(3000);
			}
			}

			}
			/// <summary>
			@@ -1055,6 +1020,38 @@
			}
			#endregion

			#region View2äºä»¶
			/// <summary>
			/// View2æå¼äºä»¶
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			public void View2_LoadEvent(object sender, RoutedEventArgs e)
			{



			}
			/// <summary>
			/// View2å³éäºä»¶
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			public void View2_CloseEvent(object sender, System.ComponentModel.CancelEventArgs e)
			{


			}
			/// <summary>
			/// View2åå§å
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			public void View2_Init(object sender, RoutedEventArgs e)
			{
			}
			#endregion

			#region åæ¢tabé¡µ
			public void tab_SelectionChanged(object sender, EventArgs e)
			{