From 81f958af697e8d35f0755c670d6c56d69bb14551 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 28 七月 2025 10:46:59 +0800
Subject: [PATCH] 可禁用rgv,不分配任务
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++--
src/main/webapp/views/index.html | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 14 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 2185d01..643a517 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -365,9 +365,11 @@
return;
}
+ List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<BasCircularShuttle>().eq("status", 0));
+
LinkedList<RgvProtocol> rgvProtocolList = new LinkedList<>();
- for (int i = 1; i <= 5; i++) {
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, i);
+ for (BasCircularShuttle basCircularShuttle : basCircularShuttleList) {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
continue;
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index da21376..796b993 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -350,18 +350,18 @@
prop="status$"
label="鐘舵��">
</el-table-column>
-<!-- <el-table-column-->
-<!-- label="鎿嶄綔"-->
-<!-- type="template">-->
-<!-- <template slot-scope="scope">-->
-<!-- <el-button-->
-<!-- :type="scope.row.status === 0 ? 'primary' : 'danger'"-->
-<!-- size="small"-->
-<!-- @click="toggleStatus(scope.$index, scope.row)">-->
-<!-- {{ scope.row.status === 0 ? '绂佺敤' : '瑙ｉ櫎绂佺敤' }}-->
-<!-- </el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ type="template">
+ <template slot-scope="scope">
+ <el-button
+ :type="scope.row.status === 0 ? 'primary' : 'danger'"
+ size="small"
+ @click="toggleStatus(scope.$index, scope.row)">
+ {{ scope.row.status === 0 ? '绂佺敤' : '瑙ｉ櫎绂佺敤' }}
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
--
Gitblit v1.9.1