#

1

9 天以前 6fcad8a10aab91b9a0825b0465b7e21d37df2332

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

@@ -13,6 +13,8 @@
@Data
public class CrnProtocol {

    private Integer crnNo;

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

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

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

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

    private boolean[] temp1;
    private Short temp1;

    private CrnTemp1 crnTemp1;

@@ -235,21 +227,12 @@
        this.status = CrnStatusType.get(type).id.shortValue();
    }

    public void setTemp1(boolean[] temp1) {
    public Short getTemp1() {
        return 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];
    }

    /**
@@ -267,4 +250,33 @@
        basCrnp.setWrkNo(taskNo.intValue());
        return basCrnp;
    }

    public void setxSpeed(float xSpeed) {
        this.xSpeed = xSpeed;
    }

    public void setySpeed(float ySpeed) {
        this.ySpeed = ySpeed;
    }

    public void setzSpeed(float zSpeed) {
        this.zSpeed = zSpeed;
    }

    public void setxDistance(float xDistance) {
        this.xDistance = xDistance;
    }

    public void setyDistance(float yDistance) {
        this.yDistance = yDistance;
    }

    public void setxDuration(float xDuration) {
        this.xDuration = xDuration;
    }

    public void setyDuration(float yDuration) {
        this.yDuration = yDuration;
    }

}