*

lsh

1 天以前 b40ae90237b1ce741dae89aed09047d0dfbffcf1

*

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

@@ -468,6 +468,9 @@
                        if (rgvCircularShuttleParam.getStatus()==0){
                            rgvCircularShuttleParam.setStatus$(rgvProtocol.statusType.desc);
                        }
                        if (rgvCircularShuttleParam.getError()==0){
                            rgvCircularShuttleParam.setError$(rgvProtocol.getAlarm$());
                        }
                    }
                }
            }

 src/main/java/com/zy/asrs/domain/param/RgvCircularShuttleParam.java

@@ -25,7 +25,9 @@
     * 0:正常，1：禁用
     */
    private Integer status;
    private Integer error;
    private String status$ = "未知";
    private String error$ = "-";
    private Long position = 0L;

    public RgvCircularShuttleParam(){};

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

@@ -576,6 +576,9 @@
                            if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
                                //
                                log.error("RGV命令下发失败，RGV号={}，任务数据={}", rgvId, JSON.toJSON(rgvCommand));
                                wrkMast.setLogErrTime(new Date());
                                wrkMast.setLogErrMemo("RGV命令下发失败，RGV号={"+rgvId+"}===>跳过");
                                wrkMastService.updateById(wrkMast);
                                break runRgv;
                            }
                            log.info("RGV命令下发成功，RGV号={}，任务数据={}", rgvId, JSON.toJSON(rgvCommand));
@@ -617,8 +620,10 @@
                        && rgvProtocol.getTaskNo1() == 0
                        && rgvProtocol.getAlarm() == 0) {
                    if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(5,devperimeter))) {
                        log.error("RGV漫游启动命令下发失败，RGV号={}，任务数据={}", rgvNo, "漫游指令");
                        log.error("RGV漫游启动命令下发失败，RGV号={}，任务数据={}", rgvNo, "漫游指令，目的地："+devperimeter);
                        break;
                    } else {
                        log.info("RGV漫游启动命令下发成功，RGV号={}，任务数据={}", rgvNo, "漫游指令，目的地："+devperimeter);
                    }
                }
            }

 src/main/webapp/views/index.html

@@ -354,6 +354,10 @@
                            label="状态">
                    </el-table-column>
                    <el-table-column
                            prop="error$"
                            label="异常">
                    </el-table-column>
                    <el-table-column
                            label="操作"
                            type="template">
                        <template slot-scope="scope">