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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 525972c..16f3094 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,7 +24,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- private Thread thread2;
+ private Thread armThread;
// 棰戠巼
private int i = 0;
private int k = 0;
@@ -37,8 +37,8 @@
thread = new Thread(this::crnAndDevRun);
thread.start();
- thread2 = new Thread(this::roboticArmDispatch);
-// thread2.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) {
@@ -150,12 +153,19 @@
try {
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(500);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+
+ //arm浠诲姟瀹屾垚
+ mainService.armMissionAccomplished();
+ mainService.armMissionAccomplishedScanToCheckIn();
+
+ //arm浠诲姟涓嬪彂
+ mainService.armTaskAssignment();
} catch (Exception e) {
e.printStackTrace();
@@ -166,7 +176,7 @@
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
- if (thread2 != null) thread2.interrupt();
+ if (armThread != null) armThread.interrupt();
}
}
--
Gitblit v1.9.1