From b82892d4b6d7ddd51d550871223036e993f76cf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 14:32:50 +0800
Subject: [PATCH] 提升机、穿梭车独占令牌页面显示与控制
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 896319a..99bf851 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -328,8 +328,9 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R shuttleUpdate(@RequestParam Integer shuttleNo,
- @RequestParam Integer workNo,
- @RequestParam String pakMk){
+ @RequestParam Integer workNo,
+ @RequestParam String pakMk,
+ @RequestParam Integer token) {
NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
if (shuttleThread == null) {
return R.error("plc宸叉帀绾�");
@@ -344,6 +345,9 @@
if (pakMk != null) {
shuttleProtocol.setPakMk(pakMk.equals("Y"));
}
+ if (token != null) {
+ shuttleProtocol.setToken(token);
+ }
return R.ok();
}
--
Gitblit v1.9.1