From 0d6d67bd9fe82fd477d67439cb3e5d2d853561bf Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 08 七月 2025 10:50:26 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 194 +++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 75 deletions(-)
diff --git "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs" "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
index d505f02..7df8fe7 100644
--- "a/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
+++ "b/2025\345\271\2646\346\234\21012\346\227\245/AuxAllWCS/Build/Project/\344\273\243\347\240\201/\347\225\214\351\235\242\344\272\213\344\273\266.cs"
@@ -50,11 +50,11 @@
try
{
- HttpSvcHost = new System.Net.HttpListener();
- HttpSvcHost.AuthenticationSchemes = System.Net.AuthenticationSchemes.Anonymous;
- HttpSvcHost.Prefixes.Add("http://10.221.55.116: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);
}
catch (Exception ex)
{
@@ -93,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("瑗块棬瀛�.Param3","300","瑗块棬瀛�Queue");
- ////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
/// 鎻忚堪:
@@ -230,6 +172,24 @@
// if (di.deviceType == 2 || di.deviceType == 1)
// RunafterMac(di,true);
/// TODO mes 涓嬪彂銆� 鏀规垚鏈烘鑷傜洃鎺�- 鐩戞帶绌虹殑杩樻槸婊＄殑 - 鑱斿姩mes 浠诲姟銆�+
+ //LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵1锛氱淮甯屽皵鎶撹噦1.State:{Device.缁村笇灏旀姄鑷�.State} ");
+ //Device.缁村笇灏旀姄鑷�.ReadPLC("缁村笇灏旀姄鑷�.R50", out object value);
+ //LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵1锛氱淮甯屽皵鎶撹噦1.R50:{value?.ToString()} ");
+
+ //LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵2锛氱淮甯屽皵鎶撹噦2.State:{Device.缁村笇灏旀姄鑷�.State} ");
+ //Device.缁村笇灏旀姄鑷�.ReadPLC("缁村笇灏旀姄鑷�.R50", out value);
+ //LogHelper.Info($"璁惧鐘舵�锛氱淮甯屽皵2锛氱淮甯屽皵鎶撹噦2.R50:{value?.ToString()} ");
+
+ //LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬�锛欽s鎹烽『1.State:{Device.Js鎹烽『1.State} ");
+ //Device.Js鎹烽『1.ReadPLC("Js鎹烽『1.D1202", out value);
+ //LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬� Js鎹烽『1.D1202:{value?.ToString()} ");
+
+ //LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬�锛欽s鎹烽『2.State:{Device.Js鎹烽『2.State} ");
+ //Device.Js鎹烽『2.ReadPLC("Js鎹烽『2.D1202", out value);
+ //LogHelper.Info($"璁惧鐘舵�锛氭嵎鐬� Js鎹烽『2.D1202:{value?.ToString()} ");
+
+
#endregion [鑴氭湰][20250325085810885][涓氬姟閫昏緫.绗笁鏍囨.鑷祦杞祦绋媇
}
catch (Exception ex)
@@ -410,7 +370,7 @@
{
#region [鑴氭湰][20250531163716255][涓氬姟閫昏緫.澶勭悊MES浠诲姟绾跨▼.ResolveMesTask]
//mes 浠诲姟鎷嗗垎銆備竴娈典换鍔″拰 澶氭浠诲姟銆�- ToWMSMES.ResMesTask();
+ ToWMSMES.ResMesTask(tag);
#endregion [鑴氭湰][20250531163716255][涓氬姟閫昏緫.澶勭悊MES浠诲姟绾跨▼.ResolveMesTask]
}
catch (Exception ex)
@@ -427,15 +387,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)
@@ -841,6 +793,64 @@
}
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>
+ /// 绋嬪簭鐗囨:鏂扮嚎绋嬫�绾�+ /// 鎻忚堪:1
+ /// </summary>
+ System.Threading.Tasks.Task.Factory.StartNew(() =>
+ {
+ System.Threading.Thread.CurrentThread.IsBackground = true;
+ ExitJudgeStack.Push(0);
+ //涓�洿鎵ц锛岀洿鍒版弧瓒崇粨鏉熸潯浠�+ while (true)
+ {
+ if (IsExitApp) { break; }
+ try
+ {
+ #region [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
+ AutoThread.InvokeMethod(AutoThread.Instance, "ThreaTotal", new object[] { tag });
+ #endregion [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
+ }
+ catch (Exception ex)
+ {
+ Conn.榛樿鏃ュ織.Error(ex.ToString());
+ }
+ finally
+ {
+ System.Threading.Thread.Sleep(3000);
+ }
+ }
+ ExitJudgeStack.TryPop(out int exitJudgeVal);
+ });
}
/// <summary>
@@ -945,6 +955,7 @@
Device.RGV?.Stop();
Device.p鍙戦偅绉�涓嬬嚎?.Stop();
Device.p鍙戦偅绉�涓婄嚎?.Stop();
+ Device.p鍙戦偅绉�涓婄嚎?.Stop();
}
catch (Exception ex)
{
@@ -997,6 +1008,7 @@
|| (Device.RGV == null ? false : Device.RGV.State != GZ.Device.PLC.PlcRunState.Stoped)
|| (Device.p鍙戦偅绉�涓嬬嚎 == null ? false : Device.p鍙戦偅绉�涓嬬嚎.State != GZ.Device.PLC.PlcRunState.Stoped)
|| (Device.p鍙戦偅绉�涓婄嚎 == null ? false : Device.p鍙戦偅绉�涓婄嚎.State != GZ.Device.PLC.PlcRunState.Stoped)
+ || (Device.p鍙戦偅绉�涓婄嚎 == null ? false : Device.p鍙戦偅绉�涓婄嚎.State != GZ.Device.PLC.PlcRunState.Stoped)
)
{
System.Threading.Thread.Sleep(1000);
@@ -1031,6 +1043,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)
{
@@ -1050,7 +1094,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))
{
@@ -1151,7 +1195,7 @@
statusCode = System.Net.HttpStatusCode.OK;
// 澶嶅埗鍒癱ase 涓� //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);
}
}
--
Gitblit v1.9.1