From 74039f359e4d416031709a4a0e7aa2e5237e683d Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 14:00:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index d3435f5..ba23d00 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -74,13 +74,14 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos() == 1 ? "涓嶅湪瀹氫綅" : "鍦ㄥ畾浣�");
- vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
- vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
- vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
- vo.setXdistance(crnProtocol.getXDistance()); // 璧拌璺濈(Km)
- vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
- vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
- vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ vo.setXspeed(String.format("%.2f", crnProtocol.getXSpeed())); // 璧拌閫熷害锛坢/min)
+ vo.setYspeed(String.format("%.2f", crnProtocol.getYSpeed())); // 鍗囬檷閫熷害锛坢/min)
+ vo.setZspeed(String.format("%.2f", crnProtocol.getZSpeed())); // 鍙夌墮閫熷害锛坢/min)
+ vo.setXdistance(String.format("%.2f", crnProtocol.getXDistance())); // 璧拌璺濈(Km)
+ vo.setYdistance(String.format("%.2f", crnProtocol.getYDistance())); // 鍗囬檷璺濈(Km)
+ vo.setXduration(String.format("%.2f", crnProtocol.getXDuration())); // 璧拌鏃堕暱(H)
+ vo.setYduration(String.format("%.2f", crnProtocol.getYDuration())); // 鍗囬檷鏃堕暱(H)
+ vo.setTaskReceive(crnProtocol.getTaskReceive());
if (crnProtocol.getModeType().equals(CrnModeType.AUTO)) {
vo.setDeviceStatus("AUTO");
@@ -172,7 +173,7 @@
return R.error("绾跨▼涓嶅瓨鍦�");
}
- CrnCommand command = crnThread.getResetCommand(crnNo);
+ CrnCommand command = crnThread.getResetCommand(9999, crnNo);
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
return R.ok();
}
--
Gitblit v1.9.1