#

luxiaotao1123

2020-08-20 5b17b77e1eec4980eeb06d6b3bdbde4d1ce190ca

#

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

@@ -126,10 +126,10 @@
            if (crnProtocol.getTaskNo()>0) {
                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                if (wrkMast != null) {
                    vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
                    vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
                }
            } else {
                vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
                vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
            }
            vos.add(vo);


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

@@ -99,7 +99,7 @@
                    vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  模式状态
                }
            } else {
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
                vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
            }
            vo.setStatus(crnProtocol.getStatusType().desc);     //  状态
            vo.setWarn(""); //  报警 todo
@@ -141,7 +141,7 @@
                    vo.setLocNo(wrkMast.getLocNo());    //  目标库位
                }
            } else {
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc());   //  模式状态
                vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  模式状态
            }
            list.add(vo);


 src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java

@@ -6,21 +6,21 @@
public enum CrnStatusType {

    // 入库
    PUT("入库"),
    MACHINE_PAKIN("入库"),
    // 出库
    TAKE("出库"),
    MACHINE_PAKOUT("出库"),
    // 库到库
    STOCK_MOVE("库到库"),
    MACHINE_STOCK_MOVE("库到库"),
    // 站到站
    SITE_MOVE("站到站"),
    MACHINE_SITE_MOVE("站到站"),
    // p to p
    P_MOVE("PToP"),
    MACHINE_P_MOVE("PToP"),
    // 异常
    ERROR("异常"),
    MACHINE_ERROR("异常"),
    // 自动
    AUTO("自动"),
    MACHINE_AUTO("自动"),
    // 非自动/手动
    UN_AUTO("非自动"),
    MACHINE_UN_AUTO("非自动"),
    ;

    private String desc;
@@ -38,15 +38,15 @@

    public static CrnStatusType process(Integer ioType){
        if (ioType>100) {
            return TAKE;
            return MACHINE_PAKIN;
        } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
            return PUT;
            return MACHINE_PAKOUT;
        } else if (ioType == 3) {
            return SITE_MOVE;
            return MACHINE_SITE_MOVE;
        } else if (ioType == 11) {
            return STOCK_MOVE;
            return MACHINE_STOCK_MOVE;
        } else {
            return ERROR;
            return MACHINE_ERROR;
        }
    }


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

@@ -16,6 +16,10 @@
    // 偏移量
    private Double offset;

    private CrnStatusType crnStatusType;
    private CrnStatusType crnStatus;

    public String getCrnStatus(){
        return crnStatus.toString().toLowerCase().replaceAll("_", "-");
    }

}

 src/main/webapp/static/css/console.css

@@ -231,6 +231,41 @@
}

/* 入库 */
.machine-pakin {
    background-image: url("../image/Crane_store.png");
}
/* 出库 */
.machine-pakout {
    background-image: url("../image/Crane_retrieve.png");
}
/* 库到库 */
.machine-stock-move {
    background-image: url("../image/Crane_loctoloc.png");
}
/* 站到站 */
.machine-site-move {
    background-image: url("../image/Crane_stntostn.png");
}
/* p to p */
.machine-p-move {
    background-image: url("../image/Crane_hptoohp.png");
}
/* 异常 */
.machine-error {
    background-image: url("../image/Crane_error.png");
}
/* 自动 */
.machine-auto {
    background-image: url("../image/Crane_auto.png");
}
/* 非自动/收到 */
.machine-un-auto {
    background-image: url("../image/Crane_manual.png");
}



/* 入库 */
.machine-put {
    background-color: #90d0f3;
}

 src/main/webapp/views/console.html

@@ -522,6 +522,8 @@
                if (res.code === 200){
                    var crns = res.data;
                    for (var i = 0; i < crns.length; i++){
                        var crnEl = $("#crn-"+crns[i].crnId);
                        crnEl.attr("class", "machine " + crns[i].crnStatus);
                        crnAnimate(crns[i].crnId, crns[i].offset);
                    }
                } else if (res.code === 403){