#

luxiaotao1123

2020-08-20 a58907b689885ca6bb9258ac81a8b279f74e7c34

#

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

@@ -8,8 +8,14 @@
@Data
public class CrnError1 {

    // 急停
    public boolean stop;
    // 遥控器急停
    public boolean remoteStop;

    // 主控盘急停
    public boolean mainStop;

    // 操作盘急停
    public boolean controlStop;

    // X行走变频器故障
    public boolean xCoverErr;
@@ -20,40 +26,35 @@
    // Z货叉变频器故障
    public boolean zCoverErr;

    // 激光测距仪故障
    public boolean rangeErr;
    // 激光故障
    public boolean laserErr;

    // 条码阅读器故障
    public boolean barcodeErr;

    // X前极限到位
    // X前极限
    public boolean xFrontLimitErr;

    // X后极限到位
    // X后极限
    public boolean xBackLimitErr;

    // Y上极限到位
    // Y上极限
    public boolean yUpLimitErr;

    // Y下极限到位
    // Y下极限
    public boolean yDownLimitErr;

    // Z左极限到位
    // Z左极限
    public boolean zLeftLimitErr;

    // Z右极限到位
    // Z右极限
    public boolean zRightLimitErr;

    // X定位超上限
    public boolean xLocationUpErr;
    // 左超宽1
    public boolean leftOverWidthErr1;

    // X定位超下限
    public boolean xLocationDownErr;
    // 左超宽2
    public boolean leftOverWidthErr2;

    // Y定位超上限
    public boolean yLocationUpErr;

    // Y定位超下限
    public boolean yLocationDownErr;

}

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

@@ -8,52 +8,53 @@
@Data
public class CrnError2 {

    // Z定位超上限
    public boolean zLocationUpErr;
    // 左超长1
    public boolean leftOverLenErr1;

    // Z定位超下限
    public boolean zLocationDownErr;
    // 左超长2
    public boolean leftOverLenErr2;

    // WCS命令异常
    public boolean wcsCommandErr;
    // 左超高
    public boolean leftOverHighErr;

    // 左超宽
    public boolean leftWidthLimitErr;
    // 右超宽1
    public boolean rightOverWidthErr1;

    // 右超宽
    public boolean rightWidthLimitErr;
    // 右超宽2
    public boolean rightOverWidthErr2;

    // 左超长
    public boolean leftLengthLimitErr;
    // 右超长1
    public boolean rightOverLenErr1;

    // 右超长
    public boolean rightLengthLimitErr;
    // 右超长2
    public boolean rightOverLenErr2;

    // 超高
    public boolean highLimitErr;
    // 右超高
    public boolean rightOverHighErr;

    // 左取货伸叉时无货
    public boolean leftTakeNoneErr;
    // 左松绳
    public boolean leftLooseRopeErr;

    // 右取货升叉时无货
    public boolean rightTakeNoneErr;
    // 右松绳
    public boolean rightLooseRopeErr;

    // 左放货伸叉时有货
    public boolean leftPutLoadErr;
    // 前安全门故障
    public boolean frontDoorErr;

    // 右放货伸叉时有货
    public boolean rightPutLoadErr;
    // 后安全门故障
    public boolean backDoorErr;

    // 启动错误
    public boolean startErr;
    public boolean startupErr;

    // 松绳报警
    public boolean looseRopeErr;
    // X向前定位超上限
    public boolean xFrontLocaUpErr;

    // 安全门开关报警
    public boolean safeDoorSwitchErr;
    // X向前定位超下限
    public boolean xFrontLocaDownErr;

    // --
    public boolean none;
    // X向后定位超上限
    public boolean xBackLocaUpErr;


}

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

@@ -8,4 +8,53 @@
@Data
public class CrnError3 {

    // X向后定位超下限
    public boolean xBackLocaDownErr;

    // Y向上定位超上限
    public boolean yUpLocaUpErr;

    // Y向上定位超下限
    public boolean yUpLocaDownErr;

    // Y向下定位超上限
    public boolean yDownLocaUpErr;

    // Y向下定位超下限
    public boolean yDownLocaDownErr;

    // Z向左定位超上限
    public boolean zLeftLocaUpErr;

    // Z向左定位超下限
    public boolean zLeftLocaDownErr;

    // Z向右定位超上限
    public boolean zRightLocaUpErr;

    // Z向右定位超下限
    public boolean zRightLocaDownErr;

    // 左取货时库位无货
    public boolean leftTakeNoneErr;

    // 右取货时库位无货
    public boolean rightTakeNoneErr;

    // 左取货后库位有货
    public boolean leftTakeThenLoadErr;

    // 右取货后库位有货
    public boolean rightTakeThenLoadErr;

    // 左放货时库位有货
    public boolean leftPutAndLoadErr;

    // 右取货后库位有货
    public boolean rightPutAndLoadErr;

    // 左放货后库位无货
    public boolean leftPutThenNoneErr;


}

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

@@ -8,4 +8,16 @@
@Data
public class CrnError4 {

    // 右放货后库位无货
    public boolean rightPutThenNoneErr;

    // X松闸超时
    public boolean xLooseBrakeTimeout;

    // Y松闸超时
    public boolean yLooseBrakeTimeout;

    // Z松闸超时
    public boolean zLooseBrakeTimeout;

}

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

@@ -227,53 +227,73 @@
    public void setError1(boolean[] error1){
        this.error1 = error1;
        this.crnError1 = new CrnError1();
        this.crnError1.stop = error1[0];
        this.crnError1.xCoverErr = error1[1];
        this.crnError1.yCoverErr = error1[2];
        this.crnError1.zCoverErr = error1[3];
        this.crnError1.rangeErr = error1[4];
        this.crnError1.barcodeErr = error1[5];
        this.crnError1.xFrontLimitErr = error1[6];
        this.crnError1.xBackLimitErr = error1[7];
        this.crnError1.yUpLimitErr = error1[8];
        this.crnError1.yDownLimitErr = error1[9];
        this.crnError1.zLeftLimitErr = error1[10];
        this.crnError1.zRightLimitErr = error1[11];
        this.crnError1.xLocationUpErr = error1[12];
        this.crnError1.xLocationDownErr = error1[13];
        this.crnError1.yLocationUpErr = error1[14];
        this.crnError1.yLocationDownErr = error1[15];
        this.crnError1.remoteStop = error1[0];
        this.crnError1.mainStop = error1[1];
        this.crnError1.controlStop = error1[2];
        this.crnError1.xCoverErr = error1[3];
        this.crnError1.yCoverErr = error1[4];
        this.crnError1.zCoverErr = error1[5];
        this.crnError1.laserErr = error1[6];
        this.crnError1.barcodeErr = error1[7];
        this.crnError1.xFrontLimitErr = error1[8];
        this.crnError1.xBackLimitErr = error1[9];
        this.crnError1.yUpLimitErr = error1[10];
        this.crnError1.yDownLimitErr = error1[11];
        this.crnError1.zLeftLimitErr = error1[12];
        this.crnError1.zRightLimitErr = error1[13];
        this.crnError1.leftOverWidthErr1 = error1[14];
        this.crnError1.leftOverWidthErr2 = error1[15];
    }

    public void setError2(boolean[] error2){
        this.error2 = error2;
        this.crnError2 = new CrnError2();
        this.crnError2.zLocationUpErr = error2[0];
        this.crnError2.zLocationDownErr = error2[1];
        this.crnError2.wcsCommandErr = error2[2];
        this.crnError2.leftWidthLimitErr = error2[3];
        this.crnError2.rightWidthLimitErr = error2[4];
        this.crnError2.leftLengthLimitErr = error2[5];
        this.crnError2.rightLengthLimitErr = error2[6];
        this.crnError2.highLimitErr = error2[7];
        this.crnError2.leftTakeNoneErr = error2[8];
        this.crnError2.rightTakeNoneErr = error2[9];
        this.crnError2.leftPutLoadErr = error2[10];
        this.crnError2.rightPutLoadErr = error2[11];
        this.crnError2.startErr = error2[12];
        this.crnError2.looseRopeErr = error2[13];
        this.crnError2.safeDoorSwitchErr = error2[14];
        this.crnError2.none = error2[15];
        this.crnError2.leftOverLenErr1 = error2[0];
        this.crnError2.leftOverLenErr2 = error2[1];
        this.crnError2.leftOverHighErr = error2[2];
        this.crnError2.rightOverWidthErr1 = error2[3];
        this.crnError2.rightOverWidthErr2 = error2[4];
        this.crnError2.rightOverLenErr1 = error2[5];
        this.crnError2.rightOverLenErr2 = error2[6];
        this.crnError2.rightOverHighErr = error2[7];
        this.crnError2.leftLooseRopeErr = error2[8];
        this.crnError2.rightLooseRopeErr = error2[9];
        this.crnError2.frontDoorErr = error2[10];
        this.crnError2.backDoorErr = error2[11];
        this.crnError2.startupErr = error2[12];
        this.crnError2.xFrontLocaUpErr = error2[13];
        this.crnError2.xFrontLocaDownErr = error2[14];
        this.crnError2.xBackLocaUpErr = error2[15];
    }

    public void setError3(boolean[] error3) {
        this.error3 = error3;
        this.crnError3 = new CrnError3();
        this.crnError3.xBackLocaDownErr = error3[0];
        this.crnError3.yUpLocaUpErr = error3[1];
        this.crnError3.yUpLocaDownErr = error3[2];
        this.crnError3.yDownLocaUpErr = error3[3];
        this.crnError3.yDownLocaDownErr = error3[4];
        this.crnError3.zLeftLocaUpErr = error3[5];
        this.crnError3.zLeftLocaDownErr = error3[6];
        this.crnError3.zRightLocaUpErr = error3[7];
        this.crnError3.zRightLocaDownErr = error3[8];
        this.crnError3.leftTakeNoneErr = error3[9];
        this.crnError3.rightTakeNoneErr = error3[10];
        this.crnError3.leftTakeThenLoadErr = error3[11];
        this.crnError3.rightTakeThenLoadErr = error3[12];
        this.crnError3.leftPutAndLoadErr = error3[13];
        this.crnError3.rightPutAndLoadErr = error3[14];
        this.crnError3.leftPutThenNoneErr = error3[15];
    }

    public void setError4(boolean[] error4) {
        this.error4 = error4;
        this.crnError4 = new CrnError4();
        this.crnError4.rightPutThenNoneErr = error4[0];
        this.crnError4.xLooseBrakeTimeout = error4[1];
        this.crnError4.yLooseBrakeTimeout = error4[2];
        this.crnError4.zLooseBrakeTimeout = error4[3];
    }

    public void setError5(boolean[] error5) {