From 3cf23392ce90c0a99835afe2db3a81206e093819 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 25 九月 2025 10:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/core/MainProcess.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a6a86c4..16f3094 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,8 +37,8 @@
thread = new Thread(this::crnAndDevRun);
thread.start();
- armThread = new Thread(this::roboticArmDispatch);
- armThread.start();
+// armThread = new Thread(this::roboticArmDispatch);
+// armThread.start();
}
private void crnAndDevRun() {
while (!Thread.currentThread().isInterrupted()) {
@@ -137,6 +137,9 @@
}
//瀹屾垚灏忚溅浠诲姟
mainService.rgvCompleteWrkMastSta();
+
+ //宸ヤ綅绉诲姩
+// mainService.rgvStaMove();
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
} catch (Exception e) {
@@ -157,12 +160,12 @@
continue;
}
-// //arm浠诲姟瀹屾垚
-// mainService.armMissionAccomplished();
-// mainService.armMissionAccomplishedScanToCheckIn();
-//
-// //arm浠诲姟涓嬪彂
-// mainService.armTaskAssignment();
+ //arm浠诲姟瀹屾垚
+ mainService.armMissionAccomplished();
+ mainService.armMissionAccomplishedScanToCheckIn();
+
+ //arm浠诲姟涓嬪彂
+ mainService.armTaskAssignment();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1