From d3cc456ffe53a2423c80377d4d96b79459405e29 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 16:21:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LiftController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index c7caa1f..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宸叉帀绾�");
@@ -223,6 +225,9 @@
}
if (pakMk != null) {
liftProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ if (token != null) {
+ liftProtocol.setToken(token);
}
return R.ok();
}
@@ -262,8 +267,8 @@
}
LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
- List<LiftCommand> commands = assignCommand.getCommands();
- LiftCommand command = commands.get(commandStep);
+ List<NyLiftCommand> commands = assignCommand.getCommands();
+ NyLiftCommand command = commands.get(commandStep);
command.setComplete(complete != 0);
redisUtil.set("lift_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
return R.ok();
--
Gitblit v1.9.1