From a036defc13533bd0a5c3364598cc8e2adbc1e28c Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期三, 23 七月 2025 17:23:27 +0800
Subject: [PATCH] 1

---
 2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 277fb05..910d336 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"
@@ -63,7 +63,6 @@
             }
             View1_Init(sender, e);
 
-
             /// <summary>
             /// 绋嬪簭鐗囨:鍒濆鍖栭厤缃�             /// 鎻忚堪:
@@ -811,8 +810,16 @@
                     {
                         #region    [鑴氭湰][20250323151832119][涓氬姟閫昏緫.Ipping]
 
-                        //var hkr = AutoThread.InvokeMethod(AutoThread.Instance, "IsMachineOnline", new object[] { "192.168.1.103", 1000 });
-                        //Console.WriteLine("192.168.1.103 > " + hkr.ToString());
+                        //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][涓氬姟閫昏緫.Ipping]
                     }
                     catch (Exception ex)
@@ -976,6 +983,9 @@
                     Device.A3005鍙栬揣浜や簰?.Stop();
                     Device.A3006鏀捐揣浜や簰?.Stop();
                     Device.A3010鍙栬揣浜や簰?.Stop();
+                    Device.S2008Read?.Stop();
+                    Device.Z杞瓙1鍙锋満姊版墜?.Stop();
+                    Device.Z杞瓙2鍙锋満姊版墜?.Stop();
                 }
                 catch (Exception ex)
                 {
@@ -1045,6 +1055,9 @@
                         || (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)
+                        || (Device.S2008Read == null ? false : Device.S2008Read.State != GZ.Device.PLC.PlcRunState.Stoped)
+                        || (Device.Z杞瓙1鍙锋満姊版墜 == null ? false : Device.Z杞瓙1鍙锋満姊版墜.State != GZ.Device.PLC.PlcRunState.Stoped)
+                        || (Device.Z杞瓙2鍙锋満姊版墜 == null ? false : Device.Z杞瓙2鍙锋満姊版墜.State != GZ.Device.PLC.PlcRunState.Stoped)
                     )
                     {
                         System.Threading.Thread.Sleep(1000);

--
Gitblit v1.9.1