#

zjj

2024-03-25 53cf72e8cc6c1cfa600ca5c4c31507e360eedd81

#

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

@@ -168,17 +168,12 @@
            vo.setStatusType(rgvProtocol.modeType.desc);   //  模式状态
            vo.setStatus(rgvProtocol.getStatusType().desc);     //  状态
            vo.setWorkNo1(rgvProtocol.getTaskNo1());  //  工位1任务号
//            vo.setStatus1(rgvProtocol.getStatusType1().desc);  // 工位1状态
//            vo.setLoading1(rgvProtocol.getLoaded1()==1?"有物":"无物");  // 工位1有物
            vo.setRgvPos(rgvProtocol.getRgvPos());
//            vo.setRgvPos1(rgvProtocol.getRgvPosI());
//            vo.setWalkPos(rgvProtocol.getWalkPos()==1?"在定位":"不在定位");
            vo.setPakMk(rgvThread.isPakMk()?"无锁":"锁定");
//            vo.setWorkNo2(rgvProtocol.getTaskNo2());  //  工位2任务号
//            vo.setStatus2(rgvProtocol.getStatusType2().desc);  // 工位2状态
//            vo.setLoading2(rgvProtocol.getLoaded2()==1?"有物":"无物");  // 工位2有物

            vo.setWalkPos(rgvProtocol.getAlarm() == 0?"正常":"报警");
            vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
            vo.setStaNo(rgvProtocol.getSouSta().intValue());
            vo.setSourceStaNo(rgvProtocol.getEndSta().intValue());
            if (rgvProtocol.getAlarm() > 0) {
                BasRgvErr rgvErr = basRgvErrMapper.selectById(rgvProtocol.getAlarm());
                vo.setAlarm(rgvErr==null?"未知异常":rgvErr.getErrName());

 src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java

@@ -43,6 +43,10 @@

    //异常
    private String warnCode;
    //源站
    private Integer staNo;
    //目标站
    private Integer sourceStaNo;

    // 异常码描述
    private String alarm = "-";

 src/main/webapp/views/deviceOperate/rgvOperate.html

@@ -94,16 +94,13 @@
                                <el-descriptions-item label="设备状态">
                                    <el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
                                </el-descriptions-item>
                                <el-descriptions-item label="有物">
                                    <el-tag>{{ tableData[currentIndex].loading1 }}</el-tag>
                                </el-descriptions-item>
                                <el-descriptions-item label="故障代码">{{ tableData[currentIndex].warnCode }}
                                </el-descriptions-item>
                                <el-descriptions-item label="故障描述">{{ tableData[currentIndex].alarm }}
                                </el-descriptions-item>
                                <el-descriptions-item label="源站">{{ tableData[currentIndex].sourceStaNo }}
                                <el-descriptions-item label="源站">{{ tableData[currentIndex].staNo }}
                                </el-descriptions-item>
                                <el-descriptions-item label="目标站">{{ tableData[currentIndex].staNo }}
                                <el-descriptions-item label="目标站">{{ tableData[currentIndex].sourceStaNo }}
                                </el-descriptions-item>
                            </el-descriptions>
                        </div>