From 1983e747ee2368186cef348fd31e9e5163f56634 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 13:53:29 +0800
Subject: [PATCH] liftUpdate
---
src/main/java/com/zy/asrs/controller/LiftController.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 147e6fd..2226d09 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -226,23 +226,21 @@
public R liftUpdate(@RequestParam Integer liftNo,
@RequestParam Short workNo,
@RequestParam String pakMk){
- for (LiftSlave liftSlave : slaveProperties.getLift()) {
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
- if (liftThread == null) {
- return R.error("plc宸叉帀绾�");
- }
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- return R.error("plc宸叉帀绾�");
- }
- if (workNo != null) {
- liftProtocol.setTaskNo(workNo);
- }
- if (pakMk != null) {
- liftProtocol.setPakMk(pakMk.equals("Y"));
- }
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
+ if (liftThread == null) {
+ return R.error("plc宸叉帀绾�");
}
- return R.error("plc宸叉帀绾�");
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ if (workNo != null) {
+ liftProtocol.setTaskNo(workNo);
+ }
+ if (pakMk != null) {
+ liftProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ return R.ok();
}
@RequestMapping(value = "/command/query")
--
Gitblit v1.9.1