From 77401b95f2fc410ecc6d6f9f0052ca56ccc4910f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 10 八月 2023 12:49:30 +0800
Subject: [PATCH] 地图增加站点
---
src/main/java/com/zy/asrs/controller/LiftController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 0b5503b..5af0336 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -110,6 +110,7 @@
vo.setDistAddress(liftProtocol.getDistAddress());
vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
+ vo.setToken(liftProtocol.getToken());//浠ょ墝
}
return R.ok().add(list);
}
@@ -208,8 +209,9 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
public R liftUpdate(@RequestParam Integer liftNo,
- @RequestParam Short workNo,
- @RequestParam String pakMk){
+ @RequestParam Short workNo,
+ @RequestParam String pakMk,
+ @RequestParam Integer token) {
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
if (liftThread == null) {
return R.error("plc宸叉帀绾�");
@@ -224,6 +226,9 @@
if (pakMk != null) {
liftProtocol.setPakMk(pakMk.equals("Y"));
}
+ if (token != null) {
+ liftProtocol.setToken(token);
+ }
return R.ok();
}
--
Gitblit v1.9.1