#

lsh

2024-06-21 ab5ade946040dc4796deaa82c903b52d81f7dabf

#

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

@@ -126,7 +126,7 @@


    @PostMapping("/table/jar/state")
//    @ManagerAuth(memo = "RGV信息表")
//    @ManagerAuth(memo = "JAR信息表")
    public R rgvStateTable(){
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
@@ -136,12 +136,12 @@
            vo.setJarNo(basJar.getJarNo());   //  RGV号
            list.add(vo);

            vo.setJarMode(basJar.getJarMode() == 1?"联机":"脱机" );   //  模式状态
            vo.setJarMode(basJar.getJarMode$());   //  模式状态
            vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc);     //  状态
            vo.setJarNo(basJar.getJarNo());  //  工位1任务号
            vo.setRegion(basJar.getRegion());
            vo.setJarCode(basJar.getJarCode());
            vo.setJarErr(basJar.getJarErr());
            vo.setJarErr(basJar.getJarErr$());

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

 src/main/java/com/zy/asrs/entity/BasJar.java

@@ -157,5 +157,72 @@
//            null    // 右门可关(checkBox)
//    );

    public String getJarMode$(){
        if (null == this.jarMode){ return null; }
        switch (this.jarMode){
            case 0:
                return "离线";
            case 1:
                return "手动";
            case 2:
                return "自动";
            case 3:
                return "其他";
            default:
                return String.valueOf(this.jarMode);
        }
    }

    public String getJarErr$(){
        if (null == this.jarErr){ return null; }
        switch (this.jarErr){
            case 0:
                return "无异常";
            case 1:
                return "运行时左门未关好";
            case 2:
                return "运行时右门未关好";
            case 3:
                return "运行时未选择工艺";
            case 4:
                return "设备运行中超高温";
            case 5:
                return "设备运行中超高压";
            case 6:
                return "急停被按下";
            case 7:
                return "左门关门超时";
            case 8:
                return "右门关门超时";
            default:
                return String.valueOf(this.jarErr);
        }
    }

    public String getJarStatus$(){
        if (null == this.jarStatus){ return null; }
        switch (this.jarStatus){
            case 0:
                return "空闲";
            case 1:
                return "入料中";
            case 2:
                return "硫化中";
            case 3:
                return "出料中";
            case 4:
                return "停止";
            case 5:
                return "左门打开中";
            case 6:
                return "右门打开中";
            case 7:
                return "左门关闭中";
            case 8:
                return "右门关闭中";
            default:
                return String.valueOf(this.jarStatus);
        }
    }

}

 src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java

@@ -26,5 +26,5 @@
    private String alarm = "-";

    //异常代码
    private Integer jarErr = 0;
    private String jarErr = "-";
}

 src/main/java/com/zy/common/model/enums/JarStatusType.java

@@ -3,10 +3,14 @@
public enum JarStatusType {

    IDLE(0, "空闲"),
    MOVING(1, "作业中"),
    SOS(2, "报警"),
    WAITING(10, "等待确认"),
    OFF_LINE(-1, "未知"),
    MOVING(1, "入料中"),
    SOS(2, "硫化中"),
    WAITING1(3, "出料中"),
    WAITING2(4, "停止"),
    WAITING3(5, "左门打开中"),
    WAITING4(6, "右门打开中"),
    WAITING5(7, "左门关闭中"),
    OFF_LINE(8, "右门关闭中"),
    OTHER(100, "其它"),
    ;