#

luxiaotao1123

2021-01-11 371272c50c94b364aed0efec4871aefa85ff0a27

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -119,7 +119,11 @@
//
//            }
            vo.setStatusType(crnProtocol.modeType.desc);   //  模式状态
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            if (crnProtocol.getTaskFinish() == 1) {
                vo.setStatus("等待确认");
            } else {
                vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            }
            vo.setLoading(crnProtocol.getLoaded()==1?"有物":"无物");  //  有物
            vo.setBay(crnProtocol.getBay());    //  列
            vo.setLev(crnProtocol.getLevel());  //  层
@@ -129,11 +133,7 @@
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
//            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            if (vo.getCrnNo() == 2) {
                vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()-1000));  //  异常码
            } else {
                vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
            }
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码

        }
        return R.ok().add(list);