#堆垛机异常

luxiaotao1123

2021-01-16 433040dfff973bc8e502a00b2f1bee2e929fdf70

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

@@ -142,17 +142,29 @@
            if (crnProtocol.getPlatformLow()) {
                vo.setSitePos("站台高位");
            }
//            vo.setXOrigin(crnProtocol.getBay()==1?"是":"否");     //  走行原点
//            vo.setYOrigin(crnProtocol.getLevel()==1?"是":"否");     // 升降原点
            vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 货叉位置
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
//            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
            vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
            vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
            vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
//            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
            if (crnProtocol.getAlarm1() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                vo.setAlarm1(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm2() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2());
                vo.setAlarm2(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm3() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3());
                vo.setAlarm3(crnError==null?"未知异常":crnError.getErrName());
            }
            if (crnProtocol.getAlarm4() > 0) {
                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4());
                vo.setAlarm4(crnError==null?"未知异常":crnError.getErrName());
            }
//            vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
//            vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
//            vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
//            vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));

        }
        return R.ok().add(list);
@@ -179,10 +191,6 @@
            }

            vo.setWorkNo(crnProtocol.getTaskNo());  //  任务号
            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
            if (null != crnError) {
                vo.setError(crnError.getErrName());
            }
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {