#
lsh
2023-03-02 820a2b268b0a95041bb3d4b1a393adc42c88d077
#
2个文件已修改
21 ■■■■ 已修改文件
src/main/java/com/zy/core/enums/SteTaskModeType.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensCrnThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -59,10 +59,10 @@
    public static SteTaskModeType findInByLoc(String locNo) {
        switch (Utils.getGroupRow(locNo, true)) {
            case 17:
                return SteTaskModeType.IN_RIGHT;   // 右
            case 18:
                return SteTaskModeType.IN_LEFT;    // 左
            case 4:
                return SteTaskModeType.IN_LEFT;   // 左
            case 5:
                return SteTaskModeType.IN_RIGHT;    // 右
            default:
                throw new CoolException("解析穿梭车原点定位失败");
        }
@@ -70,10 +70,10 @@
    public static SteTaskModeType findOutByLoc(String locNo) {
        switch (Utils.getGroupRow(locNo, false)) {
            case 2:
                return SteTaskModeType.OUT_RIGHT;   // 右
            case 30:
                return SteTaskModeType.OUT_LEFT;    // 左
            case 4:
                return SteTaskModeType.OUT_LEFT;   // 右
            case 5:
                return SteTaskModeType.OUT_RIGHT;    // 左
            default:
                throw new CoolException("解析穿梭车原点定位失败");
        }
@@ -107,9 +107,9 @@
    public static SteTaskModeType findWaiting(Integer row) {
        if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
            return SteTaskModeType.BACK_ORIGIN;
            return SteTaskModeType.WAITING_RIGHT;
        } else if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
            return SteTaskModeType.GO_ORIGIN;
            return SteTaskModeType.WAITING_LEFT;
        } else {
            throw new CoolException("解析穿梭车原点定位失败");
        }
src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -226,6 +226,7 @@
            News.error("堆垛机写入命令为空");
            return false;
        }
        siemensNet.Write("DB100.18", (short) 0);
//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[10];