From 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 18 十一月 2024 14:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs
---
src/main/java/com/zy/core/MainProcess.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 8e9246c..f5ea417 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,16 +37,6 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
- i++; if (i>5) i=0;
- j++; if (j>5) j=0;
- k++;
- if (k>13) {
- k=0;
- l++;
- if (l>3) l=0;
- }
-
-
// 闂撮殧
Thread.sleep(1000);
@@ -54,10 +44,19 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePositionNearby();
- // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopSteCharge();
+ mainService.updateStePosition();
+ // 浠诲姟涓嬪彂
+ mainService.DevpTaskNoRun();
+
+ // 浠诲姟瀹屾垚
+ mainService.rgvCompleteWrkMastSta();
+
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePosition();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1