From cc53aa90eaf44db5f474af473285187486da8370 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 21:13:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ec52590..a505e37 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -115,11 +115,12 @@
if (!SystemProperties.WCS_RUNNING_STATUS_DEMO.get()) {
continue;
}
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄦ樉绀烘椂闂�
+ mainService.crnIoExecuteDemo();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ mainService.crnStnToOutStnDemo();
+ // 浠诲姟涓嬪彂
+ mainService.taskStartDemo();
} catch (Exception e) {
e.printStackTrace();
}
@@ -134,24 +135,34 @@
// 绯荤粺婕旂ず妯″紡杩愯鐘舵�佸彉鍖�
if (SystemProperties.WCS_RUNNING_STATUS_DEMO.get()) {
if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2){
-
+ boolean signHpMk = mainService.crnStnDEMOStop2();
+ if (signHpMk){
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 3;
+ }
} else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3){
-
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 0){
-
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1){
-
+ boolean signHpMk = mainService.crnStnDEMOStop3();
+ if (signHpMk){
+ SystemProperties.WCS_RUNNING_STATUS_DEMO.set(false);
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
+ }
}
} else {
- if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 0){
-
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1){
-
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 2){
-
- } else if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 3){
-
- }
+ if (SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE == 1){
+ boolean signHpMk = mainService.crnStnDEMOOpen1();
+ if (signHpMk){
+ SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true);
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
+ }
+ } else {
+ boolean signHpMk = mainService.crnStnDEMOOpen0();
+ if (signHpMk){
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
+ }
+ }
}
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄦ樉绀烘椂闂�
} catch (Exception e) {
--
Gitblit v1.9.1