*

lsh

2025-11-25 6e96e802901984581875ed6a16957cefc7007e5e

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -54,6 +54,9 @@

    // 锁定标记
    private boolean pakMk = true;
    private boolean pakMkRun = true;
    private boolean pakMkTask = true;
    private boolean pakMkWalk = true;

    // 入库暂存数
    private Short inQty;
@@ -108,6 +111,30 @@

    private Boolean upcontactErr = false; //顶升电机接触器故障

    // 电路保护器断开
    private boolean errOther1;

    // 光电异常
    private boolean errOther2;

    // 运行超时
    private boolean errOther3;

    // 占位超时
    private boolean errOther4;

    // 有任务无货故障
    private boolean errOther5;

    // 变频器故障
    private boolean errOther6;

    // 接触器故障
    private boolean errOther7;

    // 顶升电机接触器故障
    private boolean errOther8;

    //故障信号--------------------------------------------------------

    // 故障读取锁定标记
@@ -157,6 +184,15 @@
    private Boolean sensorArriveR = false; //右移方向到位
    private Boolean sensorDecR = false; //右移方向减速


    // Super有无信息
    private boolean loadingSuper = true;

    //指令ID
    private Integer commandId;
    private Double grossWt = 0D;
    private String errorDev = "-";
    private String barcodeNow = "-";

    public BasDevpErrorLog toSqlModelError(){
        BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog();
@@ -244,6 +280,83 @@
        }
        return null;
    }


    public String getErrorDev$(){
        if (errorDev.equals("-")){
            boolean back = false;
            String errMsg = "-";
            if (this.isErrOther1()) {
                if (!back){
                    errMsg = "电路保护器断开";
                } else {
                    errMsg = errMsg+"---"+"电路保护器断开";
                }
                back = true;
            }
            if (this.isErrOther2()) {
                if (!back){
                    errMsg = "光电异常";
                } else {
                    errMsg = errMsg+"---"+"光电异常";
                }
                back = true;
            }
            if (this.isErrOther3()) {
                if (!back){
                    errMsg = "运行超时";
                } else {
                    errMsg = errMsg+"---"+"运行超时";
                }
                back = true;
            }
            if (this.isErrOther4()) {
                if (!back){
                    errMsg = "占位超时";
                } else {
                    errMsg = errMsg+"---"+"占位超时";
                }
                back = true;
            }
            if (this.isErrOther5()) {
                if (!back){
                    errMsg = "有任务无货故障";
                } else {
                    errMsg = errMsg+"---"+"有任务无货故障";
                }
                back = true;
            }
            if (this.isErrOther6()) {
                if (!back){
                    errMsg = "变频器故障";
                } else {
                    errMsg = errMsg+"---"+"变频器故障";
                }
                back = true;
            }
            if (this.isErrOther7()) {
                if (!back){
                    errMsg = "接触器故障";
                } else {
                    errMsg = errMsg+"---"+"接触器故障";
                }
                back = true;
            }
            if (this.isErrOther8()) {
                if (!back){
                    errMsg = "顶升电机接触器故障";
                } else {
                    errMsg = errMsg+"---"+"顶升电机接触器故障";
                }
                back = true;
            }
            if (back){
                return errMsg;
            }
        }

        return errorDev;
    }
//    public Integer getNearbySta() {
//        if (getNearbySta == null) return 0;
//