#
luxiaotao1123
2021-01-11 16787b096c6aec16195a85f0a1c4666679e8f32f
src/main/java/com/zy/asrs/controller/CrnController.java
@@ -129,11 +129,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);