From 16b12d978e1055e5800e2a4a0da897e057987ec0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 10:09:34 +0800
Subject: [PATCH] 捡料
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 4240bdd..035c9f6 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -376,26 +376,24 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼鏁版嵁")
- public R liftUpdate(@RequestParam Integer shuttleNo,
+ public R shuttleUpdate(@RequestParam Integer shuttleNo,
@RequestParam Short workNo,
@RequestParam String pakMk){
- for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
- if (shuttleThread == null) {
- return R.error("plc宸叉帀绾�");
- }
- ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
- return R.error("plc宸叉帀绾�");
- }
- if (workNo != null) {
- shuttleProtocol.setTaskNo(workNo);
- }
- if (pakMk != null) {
- shuttleProtocol.setPakMk(pakMk.equals("Y"));
- }
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
+ if (shuttleThread == null) {
+ return R.error("plc宸叉帀绾�");
}
- return R.error("plc宸叉帀绾�");
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ if (workNo != null) {
+ shuttleProtocol.setTaskNo(workNo);
+ }
+ if (pakMk != null) {
+ shuttleProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ return R.ok();
}
@PostMapping("/runSpeed/{shuttleNo}")
--
Gitblit v1.9.1