From 6d611bd596f57f0079c36bdb6a7686613f1bbb13 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 04 九月 2023 12:47:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LiftController.java | 57 ++++++++++++++++++++++++---------------------------------
1 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index a45f231..5af0336 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -69,28 +69,17 @@
}
vo.setTaskNo(liftProtocol.getTaskNo()); // 浠诲姟鍙�
vo.setProtocolStatus(liftProtocol.getProtocolStatusType().id);
- vo.setLiftLock(liftProtocol.getLiftLock());
- vo.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback());
- vo.setReady(liftProtocol.getReady());
- vo.setRunning(liftProtocol.getRunning());
- vo.setMode(liftProtocol.getMode());
- vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
- vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
- vo.setReverseFeedback(liftProtocol.getReverseFeedback());
- vo.setMotorOverload(liftProtocol.getMotorOverload());
- vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
- vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
- vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
- vo.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
- vo.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
- vo.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
- vo.setNotReady(liftProtocol.getNotReady());
- vo.setServoError1(liftProtocol.getServoError1());
- vo.setServoError2(liftProtocol.getServoError2());
- vo.setServoError3(liftProtocol.getServoError3());
- vo.setServoError4(liftProtocol.getServoError4());
- vo.setLiftActualSpeed(liftProtocol.getLiftActualSpeed());
- vo.setPakMk(liftProtocol.getPakMk());
+ vo.setModel(liftProtocol.getModel());
+ vo.setBusy(liftProtocol.getBusy());
+ vo.setHasTray(liftProtocol.getHasTray());
+ vo.setHasCar(liftProtocol.getHasCar());
+ vo.setDeviceError(liftProtocol.getDeviceError());
+ vo.setFrontOverrun(liftProtocol.getFrontOverrun());
+ vo.setBackOverrun(liftProtocol.getBackOverrun());
+ vo.setLeftOverrun(liftProtocol.getLeftOverrun());
+ vo.setRightOverrun(liftProtocol.getRightOverrun());
+ vo.setOverHeight(liftProtocol.getOverHeight());
+ vo.setOverWeight(liftProtocol.getOverWeight());
}
return R.ok().add(list);
}
@@ -116,14 +105,12 @@
vo.setWorkNo(liftProtocol.getTaskNo().intValue());//浠诲姟鍙�
vo.setPakMk(liftProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
- vo.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
- vo.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
- vo.setReverseFeedback(liftProtocol.getReverseFeedback());
- vo.setMotorOverload(liftProtocol.getMotorOverload());
- vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
- vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
- vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+ vo.setLev(liftProtocol.getLev());
+ vo.setTaskAddress(liftProtocol.getTaskAddress());
+ vo.setDistAddress(liftProtocol.getDistAddress());
+ vo.setCompleteTaskNo(liftProtocol.getCompleteTaskNo());
vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
+ vo.setToken(liftProtocol.getToken());//浠ょ墝
}
return R.ok().add(list);
}
@@ -222,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宸叉帀绾�");
@@ -237,6 +225,9 @@
}
if (pakMk != null) {
liftProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ if (token != null) {
+ liftProtocol.setToken(token);
}
return R.ok();
}
@@ -276,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