#

luxiaotao1123

2020-08-20 1310ca11b7aec973c6d75f986fb980b2446baafe

#

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

New file
@@ -0,0 +1,11 @@
package com.zy.core.model.protocol;

import lombok.Data;

/**
 * Created by vincent on 2020/8/17
 */
@Data
public class CrnError3 {

}

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

New file
@@ -0,0 +1,11 @@
package com.zy.core.model.protocol;

import lombok.Data;

/**
 * Created by vincent on 2020/8/17
 */
@Data
public class CrnError4 {

}

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

New file
@@ -0,0 +1,11 @@
package com.zy.core.model.protocol;

import lombok.Data;

/**
 * Created by vincent on 2020/8/17
 */
@Data
public class CrnError5 {

}

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

New file
@@ -0,0 +1,11 @@
package com.zy.core.model.protocol;

import lombok.Data;

/**
 * Created by vincent on 2020/8/17
 */
@Data
public class CrnError6 {

}

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

@@ -122,9 +122,32 @@
    private CrnError2 crnError2;

    /**
     * 保留
     * 异常3
     */
    private Short temp1;
    private boolean[] error3;

    private CrnError3 crnError3;

    /**
     * 异常4
     */
    private boolean[] error4;

    private CrnError4 crnError4;

    /**
     * 异常5
     */
    private boolean[] error5;

    private CrnError5 crnError5;

    /**
     * 异常6
     */
    private boolean[] error6;

    private CrnError6 crnError6;

    /**
     * X行走线速度m/min
@@ -243,6 +266,26 @@
        this.crnError2.none = error2[15];
    }

    public void setError3(boolean[] error3) {
        this.error3 = error3;
        this.crnError3 = new CrnError3();
    }

    public void setError4(boolean[] error4) {
        this.error4 = error4;
        this.crnError4 = new CrnError4();
    }

    public void setError5(boolean[] error5) {
        this.error5 = error5;
        this.crnError5 = new CrnError5();
    }

    public void setError6(boolean[] error6) {
        this.error6 = error6;
        this.crnError6 = new CrnError6();
    }

    /**
     * 最近一次入出库类型
     *       I:入库

 src/main/java/com/zy/core/thread/CrnThread.java

@@ -130,14 +130,17 @@
            // 异常信息
            crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
            crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
            crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
            crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
            crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
            crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));

            /**
             *   当读到status == 90.任务完成等待WCS确认 时

 src/main/webapp/views/pipeline.html

@@ -129,6 +129,8 @@
    },500);

    $(document).on('click','#site-table tr', function () {
        var siteId = $(this).children("td").eq(0).html();
        if (siteId !== null && siteId !== "") {
        layer.open({
            type: 1,
            title: false,
@@ -143,7 +145,7 @@

            }
        })
        console.log($(this).children("td").eq(0).html());
        }
    });