#改造

cpT

2025-07-01 be8a12f3c9c5c0b9db9f8144ab644fcb20c1af5e

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

@@ -1,8 +1,10 @@
package com.zy.core.model.protocol;

import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import lombok.Data;

import java.text.SimpleDateFormat;

/**
 * 输送线plc单个站点详细信息
@@ -16,11 +18,11 @@

    // ----------------------------------------------------------------
    // 工作号
    private Short workNo = 0;
    private Integer workNo = 0;

    // ----------------------------------------------------------------
    // 目标站
    private Short staNo;
    private Integer staNo;

    // ----------------------------------------------------------------
    // 自动
@@ -46,9 +48,12 @@

    // 低
    private boolean low;
    private boolean staOk;

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

    // 入库暂存数
    private Short inQty;
@@ -56,13 +61,66 @@
    // 隔壁站点（台车位置）
    private String nearbySta;

    //指令信息
    private CommandInfo commandInfo;
    // 外形检测 ------------------------------------------------------------------------

    // 前超限
    private boolean frontErr;

    // 后超限
    private boolean backErr;

    // 高超限
    private boolean highErr;

    // 左超限
    private boolean leftErr;

    // 右超限
    private boolean rightErr;

    // 超重
    private boolean weightErr = false;

    // 扫码失败
    private boolean barcodeErr;

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

    // 光电异常
    private boolean errOther2;

    // 运行超时
    private boolean errOther3;

    // 占位超时
    private boolean errOther4;

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

    // 变频器故障
    private boolean errOther6;

    // 接触器故障
    private boolean errOther7;

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

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

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

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);
        basDevp.setWrkNo(workNo.intValue());
        basDevp.setWrkNo(workNo);
        basDevp.setAutoing(autoing?"Y":"N");
        basDevp.setLoading(loading?"Y":"N");
        basDevp.setInEnable(inEnable?"Y":"N");
@@ -85,4 +143,80 @@
        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;
    }

}