WMSPrjInstance/HH-0167_WuHuAoKeSi.git

			@@ -30,6 +30,9 @@
			using System.Net.NetworkInformation;
			using System.Windows.Documents;
			using System.Text.RegularExpressions;
			using GZ.Device.PLC;
			using System.Runtime.CompilerServices;
			using ServiceStack.Text;

			namespace GZ.Projects.AuxAllWCS
			{
			@@ -58,6 +61,18 @@
			}
			public partial class AutoThread
			{
			/// <summary>
			/// 1 åªå¼çº¿ç¨ Device Client
			/// 2 åªå¼è®¾å¤ Device Server
			/// 3 å¨å¼
			/// </summary>
			public static readonly int _type = 1;
			/// <summary>
			/// 1 modbus
			/// 2 -24 vxr 25 S7
			/// 3 MC
			/// </summary>
			public static readonly string tys = "1 2 24 25 3";

			private static AutoThread _instance;

			@@ -83,6 +98,12 @@
			public static object InvokeMethod(object instance, string methodName, params object[] args)
			{
			var cacheKey = $"{instance.GetType().FullName}_{methodName}";

			if (AutoThread._type % 2 == 0)
			{
			Console.WriteLine($"{AutoThread._type}> å½åæ¯ Device Server æ¨¡å¼ã");
			return null;
			}

			try
			{
			@@ -113,7 +134,7 @@
			}
			catch (Exception ex)
			{
			LogHelper.Error($"InvokeMethod > cacheKey-{ex.Message}", ex);
			LogHelper.Error($"InvokeMethod > cacheKey:{cacheKey}-{ex.Message}", ex);
			throw ex;
			}
			}
			@@ -149,6 +170,7 @@
			// return _repository;
			// }
			//}

			/// <summary>
			/// éç½®åå§åã
			/// </summary>
			@@ -173,6 +195,7 @@
			Console.Clear();
			}
			}



			public void ThreaTotal(Tag tag, Device device)
			@@ -226,6 +249,7 @@
			tasks.Add(GetTask(taskssss1, tag, 3000));
			tasks.Add(GetTask(taskssss2, tag, 3000));
			tasks.Add(GetTask(taskssss3, tag, 3000));
			tasks.Add(GetTask(task20132027, tag, 3000));
			//tasks.Add(GetTask(sa1022, tag, 3000));
			//tasks.Add(GetTask(sa1025, tag, 3000));
			//tasks.Add(GetTask(sa1030, tag, 3000));
			@@ -240,10 +264,46 @@

			tasks.Add(GetTask(ThreadMXC5, tag, 3000));
			tasks.Add(GetTask(ThreadMXC6, tag, 3000));
			tasks.Add(GetTask(ThreadS7helper, tag, 3000));

			LogHelper.Info("ThreaTotal çº¿ç¨æ»çº¿runing");
			Task.WaitAll(tasks.ToArray());
			LogHelper.Info("ThreaTotal çº¿ç¨æ»çº¿over");
			}


			private void ThreadS7helper(Tag tag)
			{
			//var plc = new Plc(CpuType.S71500,);

			//foreach (var item in collection)
			//{
			// S7.Net.Plc plc = new Plc(CpuType.S71500, item.address, 0, 1);
			// Link(plc);
			// PLCS.Add(item.deviceName, plc);
			//}
			}

			void task20132027(Tag tag)
			{
			if (tag.ssxè¾éçº¿.s2027.wTaskNo > 0 && tag.ssxè¾éçº¿.s2020.wæçç != tag.ssxè¾éçº¿.s2027.Ræçç )
			{
			tag.ssxè¾éçº¿.s2027.wEbit = 0;
			tag.ssxè¾éçº¿.s2027.wæçç = "";
			tag.ssxè¾éçº¿.s2027.wTaskNo = 0;
			}
			if (tag.ssxè¾éçº¿.s2020.wTaskNo > 0 && tag.ssxè¾éçº¿.s2020.wæçç != tag.ssxè¾éçº¿.s2020.Ræçç )
			{
			tag.ssxè¾éçº¿.s2020.wEbit = 0;
			tag.ssxè¾éçº¿.s2020.wæçç = "";
			tag.ssxè¾éçº¿.s2020.wTaskNo = 0;
			}
			if (tag.ssxè¾éçº¿.s2013.wTaskNo > 0 && tag.ssxè¾éçº¿.s2013.wæçç != tag.ssxè¾éçº¿.s2013.Ræçç )
			{
			tag.ssxè¾éçº¿.s2013.wEbit = 0;
			tag.ssxè¾éçº¿.s2013.wæçç = "";
			tag.ssxè¾éçº¿.s2013.wTaskNo = 0;
			}
			}
			void taskssss1(Tag tag)
			{
			@@ -264,7 +324,7 @@
			sa3010(tag);
			}

			public static ConcurrentDictionary<string, bool> Iponlines = new ConcurrentDictionary<string, bool>();
			//public static ConcurrentDictionary<string, bool> Iponlines = new ConcurrentDictionary<string, bool>();
			public bool IsMachineOnline(string hostNameOrIp, int timeout = 1000)
			{
			//device.påé£ç§1ä¸çº¿.Config.IP
			@@ -2450,27 +2510,45 @@

			private void sa2008(Tag tag)
			{
			string tno = "sa2008";// TaskProcess.GenerateTaskNo("æ¥å¿æµæ°´å·", "LOG");
			var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
			LogHelper.Info($"2008 æçå·{tag.SA2030.Ræçç } redis Arrive{2008}BarcodeLastæçå·ï¼{rdisTcode} å¹éæ ¡éªã");
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2008.Ræçç ) && rdisTcode != tag.ssxè¾éçº¿.s2008.Ræçç )
			var ntr = tag.ssxè¾éçº¿.s2008.Ræçç ;
			LogHelper.Info($"[{tno}]2008 æçå·{ntr} redis Arrive{2008}BarcodeLastæçå·ï¼{rdisTcode},ä»»å¡ç³è¯·ï¼{tag.ssxè¾éçº¿.s2008.RtaskState} å¹éæ ¡éªã");
			if (ntr == "123")
			ntr = "";
			if (rdisTcode != ntr && (tag.ssxè¾éçº¿.s2008.wTaskNo > 0 \|\| !string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2008.wæçç )))
			{
			var ntr = tag.ssxè¾éçº¿.s2008.Ræçç ;
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = ntr,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data != null)
			{
			var end = (strr.data.lineNum == 1 ? 2027
			: strr.data.lineNum == 2 ? 2020 : 2013);
			tag.ssxè¾éçº¿.s2008.wTaskNo = (uint)(20080000 + end);
			tag.ssxè¾éçº¿.s2008.wEbit = 2027;
			tag.ssxè¾éçº¿.s2008.Ræçç = ntr;
			LogHelper.Info($"[{tno}]2008 æçå·{ntr} åæ¢æçå·ï¼ä¹å¯è½æ¸ç©ºäºï¼ï¼æ¸é¤ä»»å¡æ°æ®ãwTaskNoï¼wEbit=0ï¼wæçç =ç©º");
			tag.ssxè¾éçº¿.s2008.wEbit = 0;
			LogHelper.Info($"[{tno}] wEbit 0");
			tag.ssxè¾éçº¿.s2008.wæçç = "";
			LogHelper.Info($"[{tno}] wæçç ''");
			tag.ssxè¾éçº¿.s2008.wTaskNo = 0;
			LogHelper.Info($"[{tno}] wTaskNo 0");
			if (string.IsNullOrEmpty(ntr))
			RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
			}
			}
			if (tag.ssxè¾éçº¿.s2008.RtaskState == 1)
			if (!string.IsNullOrEmpty(ntr) && rdisTcode != ntr)
			{
			LogHelper.Info($"[{tno}]2008 æçå·{ntr} ç³è¯·WMS åé");
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = ntr,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data != null)
			{
			tag.ssxè¾éçº¿.s2008.wæçç = ntr;
			var end = (ushort)(strr.data.lineNum == 1 ? 2027
			: strr.data.lineNum == 2 ? 2020 : 2013);
			tag.ssxè¾éçº¿.s2008.wTaskNo = (uint)(20080000 + end);
			tag.ssxè¾éçº¿.s2008.wEbit = end;
			LogHelper.Info($"[{tno}]2008 æçå·{ntr} åä»»å¡ï¼wTaskNo={(uint)(20080000 + end)} wEbit={end} wæçç ={ntr} Arrive{2008}BarcodeLast={ntr} ");
			RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
			}
			}
			}

			private void sa2030(Tag tag)
			@@ -2643,6 +2721,8 @@
			i = 0;
			}

			//LogHelper.Info($"_methodCache>>>>" + _methodCache.Count + ">>>>" + JsonConvert.SerializeObject(_methodCache.Keys));

			//Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼ =====>");
			//Console.WriteLine($"SA2030 ä»»å¡ç¶æï¼{tag.SA2030.RtaskState}- ç©ºé²{tag.SA2030.R5ç©ºé²} - barcode:{tag.SA2030.Ræçç }");

			@@ -2666,7 +2746,7 @@
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} {(sx == null ? "é" : "æ¯")}æ»è£æºå¨äººä»»å¡");
			if (sx == null)
			{
			gotoOOOOOOOOO:
			gotoOOOOOOOOO:
			if (string.IsNullOrEmpty(task.S_CNTRS) && !string.IsNullOrEmpty(task.S_INDEX))
			{
			// å«æä»»å¡ã æå®ç©æä¸æå®æçï¼éè¦åºåº
			@@ -2675,28 +2755,32 @@
			switch (task.S_START_LOC)
			{
			case "2030":
			if (!string.IsNullOrEmpty(tag.SA2030.Ræçç ))
			//if (!string.IsNullOrEmpty(tag.SA2030.Ræçç ))
			//{
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} 2030 åºå£æçå·{tag.SA2030.Ræçç } å¹éæ ¡éªã");
			// var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			// {
			// cntrCode = tag.SA2030.Ræçç ,
			// type = 1
			// }));
			// var strr = JsonConvert.DeserializeObject<MES2234>(str);
			// if (strr.success && strr.data.materialCode == task.S_INDEX)
			// {
			// task.S_CNTRS = tag.SA2030.Ræçç ;
			// taskservice.Update(task);
			// goto gotoOOOOOOOOO;
			// }
			// else
			// {
			// LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 2030 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			// }
			//}
			//else
			if (string.IsNullOrEmpty(tag.SA2030.Ræçç ))
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} 2030 åºå£æçå·{tag.SA2030.Ræçç } å¹éæ ¡éªã");
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			{
			cntrCode = tag.SA2030.Ræçç ,
			type = 1
			}));
			var strr = JsonConvert.DeserializeObject<MES2234>(str);
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			task.S_CNTRS = tag.SA2030.Ræçç ;
			taskservice.Update(task);
			goto gotoOOOOOOOOO;
			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} ç©æ{task.S_INDEX} ä¸ 2030 åºå£çæçç©æ{strr.data.materialCode}ä¸ç¬¦å");
			}
			}
			else
			{
			//åå»ºåºåºç´æ¥èµå¼ç»mesä»»å¡ãé²æ¢åºåºæ¢ï¼å¤æ¬¡åºåºã


			//2027 2220 2013.. è¯å«ä¸ä¸ï¼å¼å§åº
			//1 ç27 20 13 æ¯å¦æä»»å¡ã æåä¸åºäºã çåºå£å¤æå¹éã
			//2 é½æ²¡æä»»å¡ï¼éä¸ªå¹éæ¯å¦ç¬¦åï¼ååºåºã
			@@ -2712,7 +2796,7 @@
			}
			{
			var t20132027 = tag.ssxè¾éçº¿.s2020;
			LogHelper.Info($"è¯å«2027ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			LogHelper.Info($"è¯å«2020ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) \|\| (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
			{
			LogHelper.Info($"2020ä»»å¡ ä»»å¡ç»ç¹æ¯2030 ï¼ç»æ¢");
			@@ -2721,13 +2805,14 @@
			}
			{
			var t20132027 = tag.ssxè¾éçº¿.s2013;
			LogHelper.Info($"è¯å«2027ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			LogHelper.Info($"è¯å«2013ä»»å¡ æçå·ï¼{t20132027.Ræçç } RTaskNo>{t20132027.RTaskNo} REbit>{t20132027.REbit} wTaskNo>{t20132027.wTaskNo} wEbit>{t20132027.wEbit}");
			if ((t20132027.RTaskNo > 0 && t20132027.REbit == 2030) \|\| (t20132027.wTaskNo > 0 && t20132027.wEbit == 2030))
			{
			LogHelper.Info($"2013ä»»å¡ ä»»å¡ç»ç¹æ¯2030 ï¼ç»æ¢");
			continue;
			}
			}

			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2027.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			@@ -2739,10 +2824,12 @@
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2027 è¯»å°æç{tag.ssxè¾éçº¿.s2027.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20272030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2027.wæçç = tag.ssxè¾éçº¿.s2027.Ræçç ;
			tag.ssxè¾éçº¿.s2027.wTaskNo = 20272030;
			tag.ssxè¾éçº¿.s2027.wEbit = 2030;
			tag.ssxè¾éçº¿.s2027.wæçç = tag.ssxè¾éçº¿.s2027.Ræçç ;
			LogHelper.Info($"2027 > 2030 SSXä»»å¡ä¸åå®æã");
			task.S_CNTRS = tag.ssxè¾éçº¿.s2027.Ræçç ;
			taskservice.Update(task);
			continue;
			}
			}
			@@ -2757,13 +2844,16 @@
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2020 è¯»å°æç{tag.ssxè¾éçº¿.s2020.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20202030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2020.wæçç = tag.ssxè¾éçº¿.s2020.Ræçç ;
			tag.ssxè¾éçº¿.s2020.wTaskNo = 20202030;
			tag.ssxè¾éçº¿.s2020.wEbit = 2030;
			tag.ssxè¾éçº¿.s2020.wæçç = tag.ssxè¾éçº¿.s2020.Ræçç ;
			LogHelper.Info($"2020 > 2030 SSXä»»å¡ä¸åå®æã");
			task.S_CNTRS = tag.ssxè¾éçº¿.s2020.Ræçç ;
			taskservice.Update(task);
			continue;
			}
			}

			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s2013.Ræçç ))
			{
			var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
			@@ -2775,10 +2865,12 @@
			if (strr.success && strr.data.materialCode == task.S_INDEX)
			{
			LogHelper.Info($"2013 è¯»å°æç{tag.ssxè¾éçº¿.s2013.Ræçç } å¹éæåï¼åä»»å¡å·ï¼20132030ï¼ç»ç¹ï¼2030 åæçç åè¯»");
			tag.ssxè¾éçº¿.s2013.wæçç = tag.ssxè¾éçº¿.s2013.Ræçç ;
			tag.ssxè¾éçº¿.s2013.wTaskNo = 20132030;
			tag.ssxè¾éçº¿.s2013.wEbit = 2030;
			tag.ssxè¾éçº¿.s2013.wæçç = tag.ssxè¾éçº¿.s2013.Ræçç ;
			LogHelper.Info($"2013 > 2030 SSXä»»å¡ä¸åå®æã");
			task.S_CNTRS = tag.ssxè¾éçº¿.s2013.Ræçç ;
			taskservice.Update(task);
			continue;
			}
			}
			@@ -2929,6 +3021,15 @@
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 1019 RtaskState>{tag.SA1019.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			if (!string.IsNullOrEmpty(tag.SA1019.Ræçç ) && tag.SA1019.Ræçç == task.S_CNTRS)
			{

			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 1019 æçå·ä¸ä»»å¡ä¸å¹éï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "2030":
			@@ -2937,6 +3038,15 @@
			if (tag.SA2030.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 2030 RtaskState>{tag.SA2030.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			if (!string.IsNullOrEmpty(tag.SA2030.Ræçç ) && tag.SA2030.Ræçç == task.S_CNTRS)
			{

			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 2030 æçå·ä¸ä»»å¡ä¸å¹éï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -2949,6 +3059,15 @@
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3005 RtaskState>{tag.ssxè¾éçº¿.s3005.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s3005.Ræçç ) && tag.ssxè¾éçº¿.s3005.Ræçç == task.S_CNTRS)
			{

			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3005 æçå·ä¸ä»»å¡ä¸å¹éï¼ä¸æ¨é");
			continue;
			}
			}
			break;
			case "3010":
			@@ -2957,6 +3076,15 @@
			if (tag.ssxè¾éçº¿.s3010.RtaskState != 4)
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3010 RtaskState>{tag.ssxè¾éçº¿.s3010.RtaskState} æªç³è¯·RGVä»»å¡ï¼ä¸æ¨é");
			continue;
			}
			if (!string.IsNullOrEmpty(tag.ssxè¾éçº¿.s3010.Ræçç ) && tag.ssxè¾éçº¿.s3010.Ræçç == task.S_CNTRS)
			{

			}
			else
			{
			LogHelper.Info($"è§£éMESä»»å¡ ->{task.S_TASK_NO} èµ·ç¹ 3010 æçå·ä¸ä»»å¡ä¸å¹éï¼ä¸æ¨é");
			continue;
			}
			}
			@@ -3519,7 +3647,7 @@
			Console.WriteLine($"ip= {ip.ToString()}");
			new HttpServer(ip.ToString()).HttpServerRun();
			new TcpServer(ip.ToString());
			var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync();
			//var server = new EnhancedWebSocketServer($"http://{ip.ToString()}:8809/").StartAsync();
			//var client = new WebSocketClient($"http://{ip.ToString()}:8809/").ConnectAsync();
			break;
			}