From 1983df9f47c76e3c047f386e82e89c5537f345ac Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 05 十一月 2025 12:57:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 15990c7..fd7e5fd 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -122,8 +122,6 @@
mainService.crnIoExecuteDemo();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinishedDemo();
- // 浠诲姟涓嬪彂
- mainService.taskStartDemo();
} catch (Exception e) {
e.printStackTrace();
}
@@ -138,23 +136,28 @@
// 绯荤粺婕旂ず妯″紡杩愯鐘舵�佸彉鍖�
if (SystemProperties.WCS_RUNNING_STATUS_DEMO.get()) {
if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2) {
- boolean signHpMk = mainService.crnStnDEMOStop2();
- if (signHpMk) {
+ int signHpMk = mainService.crnStnDEMOStop2();
+ if (signHpMk != 2) {
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 3;
}
} else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3) {
boolean signHpMk = mainService.crnStnDEMOStop3();
- if (signHpMk) {
+ int signHpMk2 = mainService.crnStnDEMOStop2();
+ if (signHpMk && signHpMk2==0) {
SystemProperties.WCS_RUNNING_STATUS_DEMO.set(false);
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
+ } else if (!signHpMk && signHpMk2==2) {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
}
}
} else {
if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1) {
- boolean signHpMk = mainService.crnStnDEMOOpen1();
- if (signHpMk) {
+ int signHpMk = mainService.crnStnDEMOOpen1();
+ if (signHpMk == 2) {
SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true);
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
+ } else if (signHpMk == 1) {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
} else {
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
}
--
Gitblit v1.9.1