From 83eb556b86fac1aae7f9d4ea3ea343e8ea9f8b0b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 06 七月 2023 08:32:14 +0800
Subject: [PATCH] RGV control
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 0e6d25b..5727e33 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -558,11 +558,11 @@
}
}else {
//灏忎簬鎴栫瓑浜�1鍙拌溅锛屽垎閰嶅叏璺緞
- List<Integer> rgvPath = new ArrayList<Integer>(){{
- add(1);add(2);add(3);add(4);add(5);add(6);
- add(7);add(8);add(9);add(10);add(11);add(12);
- add(13);add(14);add(15);add(16);add(17);add(18);
- }};
+ BasRgvPath basRgvPath = basRgvPathService.selectByRgvNo(0);//鑾峰彇榛樿璺緞
+ if (basRgvPath == null) {
+ return null;
+ }
+ List<Integer> rgvPath = JSON.parseArray(basRgvPath.getPath(), Integer.class);
if (rgvPath.contains(path)) {
//褰撳墠璺緞涓寘鍚洰鏍囩珯锛屽垯閫夊畾杩欏彴杞�
return list.get(0).getSlave().getId();
@@ -2838,6 +2838,13 @@
}
/**
+ * 鍒濆鍖朢GV鍦板浘
+ */
+ public synchronized void initRgvMap() {
+
+ }
+
+ /**
* 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
*/
public synchronized void crnDemoOfLocMove1() {
--
Gitblit v1.9.1