#

Junjie

2023-10-13 5f685f89bf6501325b6129ecf709b988369eeedd

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

@@ -14,6 +14,11 @@
public class CrnProtocol {

    /**
     * 堆垛机号
     */
    private Integer crnNo;

    /**
     * 1 = 手动模式
     * 2 = 自动模式
     * 3 = 电脑模式
@@ -94,21 +99,11 @@
    public Short walkPos;

    /**
     * 堆垛机任务完成
     */
    public Short taskFinish;

    /**
     * 载货台有物
     */
    public Short loaded;

    /**
     * 异常码（数值显示）
     */
    private Short alarm1;

    private boolean[] temp1;
    private Short temp1;

    private CrnTemp1 crnTemp1;

@@ -175,6 +170,14 @@
     */
    private Float zSpeed;

    public void setZSpeed(Float zSpeed) {
        if (zSpeed.isNaN()) {
            this.zSpeed = 0.0F;
        } else {
            this.zSpeed = zSpeed;
        }
    }

    /**
     * 堆垛机累计走行距离km
     */
@@ -235,42 +238,12 @@
        this.status = CrnStatusType.get(type).id.shortValue();
    }

    public void setError1(boolean[] error1){
        this.error1 = error1;
        this.crnError1 = new CrnError1();
        this.crnError1.walkOverspeedErr = error1[1];
        this.crnError1.walkOverspeedRangeErr = error1[2];
        this.crnError1.walkSpeedOffsetErr = error1[3];
        this.crnError1.walkLocationOffsetErr = error1[4];
        this.crnError1.walkDiastimeterErr = error1[5];
        this.crnError1.walkOutsideErr = error1[6];
        this.crnError1.walkLimitSwitchErr = error1[7];
        this.crnError1.walkBrakeErr = error1[8];
        this.crnError1.walkDiastimeterFau = error1[9];
        this.crnError1.liftOverSpeedErr = error1[10];
        this.crnError1.liftOverspeedRangeErr = error1[11];
        this.crnError1.liftSpeedOffsetErr = error1[12];
        this.crnError1.liftLocationOffsetErr = error1[13];
        this.crnError1.liftDiastimeterErr = error1[14];
        this.crnError1.liftOutsideErr = error1[15];
    public Short getTemp1() {
        return temp1;
    }


    public void setTemp1(boolean[] temp1) {
    public void setTemp1(Short temp1) {
        this.temp1 = temp1;
        this.crnTemp1 = new CrnTemp1();
        this.crnTemp1.liftLimitSwitchErr = temp1[0];
        this.crnTemp1.liftBrakeErr = temp1[1];
        this.crnTemp1.liftDiastimeterFau = temp1[2];
        this.crnTemp1.stop = temp1[3];
        this.crnTemp1.warn = temp1[4];
        this.crnTemp1.overHighErr = temp1[5];
        this.crnTemp1.leftOverWidthErr = temp1[6];
        this.crnTemp1.rightOverWidthErr = temp1[7];
        this.crnTemp1.leftOverLenErr = temp1[8];
        this.crnTemp1.rightOverLenErr = temp1[9];
        this.crnTemp1.pakinThenLoadedErr = temp1[10];
        this.crnTemp1.pakOutThenNoneErr = temp1[11];
    }

    /**
@@ -282,7 +255,9 @@


    public BasCrnp toSqlModel(BasCrnp basCrnp){
        basCrnp.setCrnErr(alarm1.longValue());
        if (alarm!=null) {
            basCrnp.setCrnErr(alarm.longValue());
        }
        basCrnp.setWrkNo(taskNo.intValue());
        return basCrnp;
    }