From 22d9b27f913cc47d54b361870f62aa81b4c8fd85 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index fb88e02..9b3e677 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -63,7 +63,7 @@
continue;
}
ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
+ if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
continue;
}
vo.setTaskNo(shuttleProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
@@ -114,7 +114,7 @@
}
}
vo.setSpeed(shuttleProtocol.getCurrentMoveServoSpeed()); // 閫熷害
- vo.setPakMk(shuttleProtocol.getPakMk().toString()); // 浣滀笟鏍囪
+ vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
--
Gitblit v1.9.1