From 9550fcfc2ac0c9c0e5c4aa0600361c4b4f908689 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 三月 2024 09:42:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 48 +++++++++++++-----------
src/main/java/com/zy/core/MainProcess.java | 50 ++++++++++++++++++++-----
src/main/java/com/zy/core/ServerBootstrap.java | 1
3 files changed, 67 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 508e755..d48a654 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4101,32 +4101,36 @@
//鎵弿璁惧PakMk鏍囪鏄惁瓒呮椂
public synchronized void scanDevicePakMk() {
- //鎵弿灏忚溅
- for (ShuttleSlave slave : slaveProperties.getShuttle()) {
- NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
- NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
- continue;
+ try {
+ //鎵弿灏忚溅
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+
+ if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000 * 60 * 5)) && shuttleProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ shuttleProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
}
- if ((System.currentTimeMillis() - shuttleProtocol.getSendTime() > (1000*60*5)) && shuttleProtocol.getPakMk()) {
- //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
- shuttleProtocol.setPakMk(false);//澶嶄綅鏍囪
- }
- }
+ //鎵弿鎻愬崌鏈�
+ for (LiftSlave slave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
- //鎵弿鎻愬崌鏈�
- for (LiftSlave slave : slaveProperties.getLift()) {
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- continue;
+ if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000 * 60 * 5)) && liftProtocol.getPakMk()) {
+ //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
+ liftProtocol.setPakMk(false);//澶嶄綅鏍囪
+ }
}
-
- if ((System.currentTimeMillis() - liftProtocol.getSendTime() > (1000*60*5)) && liftProtocol.getPakMk()) {
- //璁惧瓒呰繃5鍒嗛挓杩樻病澶嶄綅鏍囪
- liftProtocol.setPakMk(false);//澶嶄綅鏍囪
- }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 411b4c0..33ac14b 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -74,16 +74,16 @@
mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
- // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
- mainService.robotGenerateAgvTask();
- // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
- mainService.agvRestockByRobot();
- // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
- mainService.agvRestockInto();
- // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
- mainService.agvRestockIntoByHangingWire();
- // AGV淇℃伅鏇存柊
- mainService.agvCurrentContainerCodeInfoWire();
+// // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
+// mainService.robotGenerateAgvTask();
+// // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
+// mainService.agvRestockByRobot();
+// // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
+// mainService.agvRestockInto();
+// // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+// mainService.agvRestockIntoByHangingWire();
+// // AGV淇℃伅鏇存柊
+// mainService.agvCurrentContainerCodeInfoWire();
// 300绔欐嫞鏂�
mainService.pick300();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
@@ -107,6 +107,36 @@
thread.start();
}
+ public void agvStart(){
+ thread = new Thread(() -> {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+
+ // 闂撮殧
+ Thread.sleep(300);
+
+ // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
+ mainService.robotGenerateAgvTask();
+ // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
+ mainService.agvRestockByRobot();
+ // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
+ mainService.agvRestockInto();
+ // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+ mainService.agvRestockIntoByHangingWire();
+ // AGV淇℃伅鏇存柊
+ mainService.agvCurrentContainerCodeInfoWire();
+
+
+ // 闂撮殧
+ Thread.sleep(200);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ thread.start();
+ }
+
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 067bb30..f19854c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -41,6 +41,7 @@
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
+ mainProcess.agvStart();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
--
Gitblit v1.9.1