WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -28,9 +28,6 @@
			using GZ.DB.Repository.OIDATABASE;
			using GZ.DB.IRepository.OIDATABASE;
			using GZ.DB.Entity.OIDATABASE;
			using GZ.Modular.Redis;
			using System.Security.Cryptography;
			using System.Windows.Interop;
			namespace GZ.Projects.AuxAllWCS
			{
			/// <summary>
			@@ -55,7 +52,7 @@
			{
			HttpSvcHost = new System.Net.HttpListener();
			HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
			HttpSvcHost.Prefixes.Add("http://10.221.55.116:8808/");
			HttpSvcHost.Prefixes.Add("http://10.221.55.117:8808/");
			HttpSvcHost.Start();
			HttpSvcHost.BeginGetContext(HttpSvcListenerCallback, null);
			}
			@@ -80,29 +77,9 @@
			try
			{
			#region [èæ¬][20250323111613779][ä¸å¡é»è¾.åå§åéç½®]
			//LogHelper.Info("1111 +" + DateTime.Now);
			//((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), null);
			//LogHelper.Info("2222 +" + DateTime.Now);
			//((Type)typeof(Utils)).GetMethod("ThreadSettingInit").Invoke(new Utils(), new object[] { });
			//LogHelper.Info("3333 +" + DateTime.Now);

			Action myDelegate = () => SettingInit();
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", new object[] { tag, myDelegate });
			//LogHelper.Info("4444 +" + DateTime.Now);
			//AutoThread.InvokeMethod(AutoThread.Instance, "ThreadSettingInit", null);
			//LogHelper.Info("4444 +" + DateTime.Now);

			//if (Tag.Global.SettingsOver == 0)
			//{
			// SettingInit();
			// Tag.Global.SettingsOver = 1;
			//}
			//else if (Settings.deviceInfos.Count == 0)
			//{
			// Tag.Global.SettingsOver = 0;
			//}
			//var _=tag.wxr1.R46_LAST;
			//RedisHelper.Add($"ç»´å¸å°æè1.R46_LAST", "true", out string msg);

			#endregion [èæ¬][20250323111613779][ä¸å¡é»è¾.åå§åéç½®]
			}
			catch (Exception ex)
			@@ -123,46 +100,45 @@
			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" };
			////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",
			// 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_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 = "",
			// 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);
			}
			// });
			// }
			// }
			// // TaskProcess.CreateTask("", locs[6], locs[7], "test", 9, new List<string> { "test" }, 1, 1, 1);
			// }

			#endregion [èæ¬][20250323151832119][ä¸å¡é»è¾.Program4]
			}
			@@ -220,10 +196,8 @@
			try
			{
			#region [èæ¬][20250325083326611][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.æ·ç¬æè2]
			//jsz2æ·ç¬æè2

			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadJS2", new object[] { tag });

			#endregion [èæ¬][20250325083326611][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.æ·ç¬æè2]
			}
			catch (Exception ex)
			@@ -256,6 +230,24 @@
			// if (di.deviceType == 2 \|\| di.deviceType == 1)
			// 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($"è®¾å¤ç¶æï¼ç»´å¸å°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($"è®¾å¤ç¶æï¼æ·ç¬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][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.èªæµè½¬æµç¨]
			}
			catch (Exception ex)
			@@ -314,6 +306,7 @@
			try
			{
			#region [èæ¬][20250610002047005][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°1å·.ç»´å¸å°æè1R]

			AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr1R", new object[] { tag });
			#endregion [èæ¬][20250610002047005][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°1å·.ç»´å¸å°æè1R]
			}
			@@ -343,6 +336,7 @@
			try
			{
			#region [èæ¬][20250325083315503][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°2å·.ç»´å¸å°æè2L]

			AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr2L", new object[] { tag });
			#endregion [èæ¬][20250325083315503][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°2å·.ç»´å¸å°æè2L]
			}
			@@ -372,6 +366,7 @@
			try
			{
			#region [èæ¬][20250610002647095][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°2å·.ç»´å¸å°æè2R]

			AutoThread.InvokeMethod(AutoThread.Instance, "Threadwxr2R", new object[] { tag });
			#endregion [èæ¬][20250610002647095][ä¸å¡é»è¾.ç¬¬ä¸æ æ®µ.ç»´ç³»å°2å·.ç»´å¸å°æè2R]
			}
			@@ -386,7 +381,6 @@
			}
			ExitJudgeStack.TryPop(out int exitJudgeVal);
			});

			/// <summary>
			/// ç¨åºçæ®µ:ä»»å¡ä¸å
			/// æè¿°:
			@@ -487,6 +481,7 @@
			// - åæ äº¤äºå¤çãã
			Action<HaiKangOrderInfo> myDelegate = (t) => continueTask(t);
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadGrats", new object[] { tag, myDelegate });

			// åé£ç§ä¸æåæ ã
			#endregion [èæ¬][20250611223832523][ä¸å¡é»è¾.åæ å¤ç]
			}
			@@ -516,6 +511,7 @@
			try
			{
			#region [èæ¬][20250616094224396][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1020ç©ºæ¡ä¸çº¿]

			//1020 1023 ç©ºæ¡ä¸çº¿
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadEdown", new object[] { tag });
			#endregion [èæ¬][20250616094224396][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1020ç©ºæ¡ä¸çº¿]
			@@ -575,6 +571,7 @@
			try
			{
			#region [èæ¬][20250616094632985][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.å®åæ»¡ä¸çº¿]

			//å®åæ»¡ä¸çº¿ 1008 1016 -> 1026
			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadDdown", new object[] { tag });
			#endregion [èæ¬][20250616094632985][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.å®åæ»¡ä¸çº¿]
			@@ -605,6 +602,7 @@
			try
			{
			#region [èæ¬][20250616094511322][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.è½¬åæ»¡ä¸çº¿]

			//è½¬åæ»¡ä¸çº¿ 1002 1010 - RGV2å·¥ä½ä¸å¯å° 1017 ä¸å¯ä¸å2å·¥ä½ä»»å¡ã
			AutoThread.InvokeMethod(AutoThread.Instance, "Thread0210Down", new object[] { tag });
			#endregion [èæ¬][20250616094511322][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.è½¬åæ»¡ä¸çº¿]
			@@ -635,6 +633,7 @@
			try
			{
			#region [èæ¬][20250616095605911][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.ä¸æä½æ£æµ]

			//ä¸æä½æ£æµã 1003 å°ä½æ¶ å æ è¯ä¿¡å· å¹¶ ç»æºæ¢°æä¿¡å·ã
			AutoThread.InvokeMethod(AutoThread.Instance, "Threadä¸æä½æ£æµ", new object[] { tag });
			#endregion [èæ¬][20250616095605911][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.ä¸æä½æ£æµ]
			@@ -664,9 +663,8 @@
			if (IsExitApp) { break; }
			try
			{

			////2217 - 1003
			#region [èæ¬][20250616095709155][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1å·FNKæºæ¢°æå®æ]

			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadFNK1Over", new object[] { tag });
			#endregion [èæ¬][20250616095709155][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1å·FNKæºæ¢°æå®æ]
			}
			@@ -696,6 +694,7 @@
			try
			{
			#region [èæ¬][20250616095733680][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.2å·FNKæºæ¢°æå®æ]

			AutoThread.InvokeMethod(AutoThread.Instance, "ThreadFNK2Over", new object[] { tag });
			#endregion [èæ¬][20250616095733680][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.2å·FNKæºæ¢°æå®æ]
			}
			@@ -785,6 +784,7 @@
			try
			{
			#region [èæ¬][20250617085750712][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1022agvä¸ç©º.Program1]

			AutoThread.InvokeMethod(AutoThread.Instance, "Thread1022Up", new object[] { tag });
			#endregion [èæ¬][20250617085750712][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1022agvä¸ç©º.Program1]
			}
			@@ -814,6 +814,7 @@
			try
			{
			#region [èæ¬][20250617085800942][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1030ä¸æ¯æ.Program1]

			AutoThread.InvokeMethod(AutoThread.Instance, "Thread1030Down", new object[] { tag });
			#endregion [èæ¬][20250617085800942][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.1030ä¸æ¯æ.Program1]
			}
			@@ -843,6 +844,7 @@
			try
			{
			#region [èæ¬][20250617085809982][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.2030è¾éçº¿ä¸å®å.Program1]

			AutoThread.InvokeMethod(AutoThread.Instance, "Thread2030Down", new object[] { tag });
			#endregion [èæ¬][20250617085809982][ä¸å¡é»è¾.æµç¨2çå¤ççè¿åº.2030è¾éçº¿ä¸å®å.Program1]
			}
			@@ -1066,7 +1068,7 @@
			System.Net.HttpListenerResponse response = context.Response;
			switch (request.LocalEndPoint.ToString())
			{
			case "10.221.55.116:8808":
			case "10.221.55.117:8808":
			{
			using (var reader = new System.IO.StreamReader(request.InputStream, System.Text.Encoding.UTF8))
			{