#

luxiaotao1123

2020-08-15 baae63a330467be864de7d156bc189e84ae996b6

#

 src/main/java/com/zy/core/enums/CrnStatusType.java

@@ -2,16 +2,16 @@

public enum CrnStatusType {

    IDLE(0, "空闲"),
    IDLE(0, "空闲，无任务"),
    FETCH_POSITION(1, "取货定位中"),
    FETCHING(2, "取货中"),
    PUT_POSITION(3, "放货定位中"),
    PUT_POSITION(3, "取货完成，放货定位中"),
    PUTTING(4, "放货中"),
    TO_ORIGIN(5, "回原点中"),
    ORIGIN(6, "反原点"),
    LOC_MOVE(7, "库位移位"),
    WAITING(90, "任务完成等待WCS确认"),
    SOS(99, "报警"),
//    SOS(99, "报警"),
    ;

    public Integer id;

 src/main/java/com/zy/core/enums/CrnTaskModeType.java

@@ -7,7 +7,7 @@
    PAKOUT(2),    // 出库
    LOC_MOVE(3),    // 库位移转
    SITE_MOVE(4),    // 站位移转
    ORIGIN(5),    // 回原点
    OFFSET_MOVE(7),    // 坐标移行
    ;

    public Integer id;

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

@@ -115,7 +115,7 @@
            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
            crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
//            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
            crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
            crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
            crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 22));