From 27836d1b0bc74a5aa22a8b6c7cf40f2d0068db8a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 13:40:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/DualCrnController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DualCrnController.java b/src/main/java/com/zy/asrs/controller/DualCrnController.java
index 1d9123d..6fffffa 100644
--- a/src/main/java/com/zy/asrs/controller/DualCrnController.java
+++ b/src/main/java/com/zy/asrs/controller/DualCrnController.java
@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -61,15 +62,18 @@
vo.setForkOffsetTwo(p.getForkPosTypeTwo() == null ? "-" : p.getForkPosTypeTwo().desc);
vo.setLiftPos(p.getLiftPosType() == null ? "-" : p.getLiftPosType().desc);
vo.setWalkPos(p.getWalkPos() != null && p.getWalkPos() == 0 ? "鍦ㄥ畾浣�" : "涓嶅湪瀹氫綅");
- vo.setTaskReceive(p.getTaskReceive() != null && p.getTaskReceive() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
- vo.setTaskReceiveTwo(p.getTaskReceiveTwo() != null && p.getTaskReceiveTwo() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
- vo.setXspeed(p.getXSpeed());
- vo.setYspeed(p.getYSpeed());
- vo.setZspeed(p.getZSpeed());
- vo.setXdistance(p.getXDistance());
- vo.setYdistance(p.getYDistance());
- vo.setXduration(p.getXDuration());
- vo.setYduration(p.getYDuration());
+ vo.setTaskReceive(String.valueOf(p.getTaskReceive()));
+ vo.setTaskReceiveTwo(String.valueOf(p.getTaskReceiveTwo()));
+ vo.setTaskSend(String.valueOf(p.getTaskSend()));
+ vo.setTaskSendTwo(String.valueOf(p.getTaskSendTwo()));
+
+ vo.setXspeed(String.format("%.2f", p.getXSpeed()));
+ vo.setYspeed(String.format("%.2f", p.getYSpeed()));
+ vo.setZspeed(String.format("%.2f", p.getZSpeed()));
+ vo.setXdistance(String.format("%.2f", p.getXDistance()));
+ vo.setYdistance(String.format("%.2f", p.getYDistance()));
+ vo.setXduration(String.format("%.2f", p.getXDuration()));
+ vo.setYduration(String.format("%.2f", p.getYDuration()));
vo.setWarnCode(p.getAlarm() == null ? "-" : String.valueOf(p.getAlarm()));
if (p.getAlarm() != null && p.getAlarm() > 0) {
vo.setDeviceStatus("ERROR");
@@ -173,7 +177,7 @@
if (crnThread == null) {
return R.error("绾跨▼涓嶅瓨鍦�");
}
- DualCrnCommand command = crnThread.getResetCommand(crnNo, station);
+ DualCrnCommand command = crnThread.getResetCommand(9999, crnNo, station);
MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
return R.ok();
}
--
Gitblit v1.9.1