#

luxiaotao1123

2020-12-28 bb7ce41d7525f369a93c8b6f76a05fb90d1031b2

#

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

@@ -129,7 +129,12 @@
            vo.setXLocation(crnProtocol.getWalkPos() == 1?"是":"否");      // 走行定位
            vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"否":"是");      // 升降定位
//            vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"是":"否");       //  急停
            vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
            if (vo.getCrnNo() == 2) {
                vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()-1000));  //  异常码
            } else {
                vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));  //  异常码
            }

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

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -728,6 +728,9 @@
                    if (latest == null) {
                        if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
                            WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
                            if (wrkMast == null) {
                                continue;
                            }
                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                            BasErrLog basErrLog = new BasErrLog(
                                    null,    // 编号

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -147,8 +147,7 @@
        melsecMcNet.ConnectClose();
        try {
            Thread.sleep(1000);
        } catch (InterruptedException e) {
        }
        } catch (InterruptedException ignore) {}
        return result;
    }