#

Junjie

1 天以前 74039f359e4d416031709a4a0e7aa2e5237e683d

 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();
    }