From 11336f3d70bd0161b0be8f9e6dae410e046d9ebc Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 25 七月 2025 15:24:45 +0800
Subject: [PATCH] 1
---
2025年6月12日/AuxAllWCS/Build/Project/代码/界面事件.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 c49a6e7..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"
@@ -848,7 +848,7 @@
try
{
#region [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
- AutoThread.InvokeMethod(AutoThread.Instance, "ThreaTotal", new object[] { tag });
+ AutoThread.InvokeMethod(AutoThread.Instance, "ThreaTotal", new object[] { tag, Device });
#endregion [鑴氭湰][20250708095248653][涓氬姟閫昏緫.鏂扮嚎绋嬫�绾縘
}
catch (Exception ex)
@@ -983,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)
{
@@ -1052,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