*
lsh
2025-01-13 7aa5444a36007fc463ef8a4a08ed1bed5bc3bfd3
*
3个文件已修改
37 ■■■■■ 已修改文件
src/main/java/com/zy/core/ServerBootstrap.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/RgvThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/ServerBootstrap.java
@@ -53,10 +53,10 @@
        for (Slave rgv : slaveProperties.getRgv()) {
            MessageQueue.init(SlaveType.Rgv, rgv);
        }
        // 初始化输送线mq
        for (Slave devp : slaveProperties.getDevp()) {
            MessageQueue.init(SlaveType.Devp, devp);
        }
//        // 初始化输送线mq
//        for (Slave devp : slaveProperties.getDevp()) {
//            MessageQueue.init(SlaveType.Devp, devp);
//        }
//        // 初始化条码扫描仪mq
//        for (Slave barcode : slaveProperties.getBarcode()) {
//            MessageQueue.init(SlaveType.Barcode, barcode);
@@ -87,13 +87,13 @@
            new Thread((Runnable) rgvThread).start();
            SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
        }
        // 初始化输送线线程
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new SiemensDevpThread(devp);
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }
//        // 初始化输送线线程
//        log.info("初始化输送线线程...................................................");
//        for (DevpSlave devp : slaveProperties.getDevp()) {
//            DevpThread devpThread = new SiemensDevpThread(devp);
//            new Thread((Runnable) devpThread).start();
//            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
//        }
//
//        // 初始化条码扫描仪线程
//        log.info("初始化条码扫描仪线程...................................................");
src/main/java/com/zy/core/thread/RgvThread.java
@@ -105,6 +105,7 @@
        if (null == rgvProtocol) {
            rgvProtocol = new RgvProtocol();
        }
        rgvProtocol.setRgvNo(slave.getId());
        rgvProtocol.setMode((short) -1);
        rgvProtocol.setStatus((short)-1);
        rgvProtocol.setTaskNo1((short)0);
src/main/resources/application.yml
@@ -46,20 +46,6 @@
# 下位机配置
wcs-slave:
  # 输送线
  devp[0]:
    id: 1
    ip: 192.168.4.250
    port: 502
    rack: 0
    slot: 0
  # 输送线
  devp[1]:
    id: 2
    ip: 192.168.4.250
    port: 502
    rack: 0
    slot: 0
  # RGV穿梭车1
  rgv[0]:
    id: 1