#

zjj

2024-03-21 e345071993bd2ec85c7754d6234c70a0bd24ef71

#

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

@@ -5,7 +5,7 @@
    NONE(-1, "离线"),
    STOP(0, "关机"),
    HAND(1, "手动"),
    HALF_AUTO(2, "半自动"),
    HALF_AUTO(2, "机载柜模式"),
    AUTO(3, "自动"),
    AUTO3(4, "其它4"),
    AUTO2(100, "其它"),

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

@@ -191,16 +191,16 @@
                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));

                // 工位1复位信号
                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
                    if (resetFlag1) {
                        RgvCommand rgvCommand = new RgvCommand();
                        rgvCommand.setAckFinish1((short)1);
                        if (write(rgvCommand)) {
                            resetFlag1 = false;
                        }
                    }
                }
//                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
//                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
//                    if (resetFlag1) {
//                        RgvCommand rgvCommand = new RgvCommand();
//                        rgvCommand.setAckFinish1((short)1);
//                        if (write(rgvCommand)) {
//                            resetFlag1 = false;
//                        }
//                    }
//                }

                // 工位2复位信号
//                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)