#

lsh

2024-01-16 4d4e8a4be7d5f84cfd4bd7eca8b6bcf3c7c7acda

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -3203,6 +3203,7 @@
                // 出库模式
                switch (wrkMast.getIoType()) {
                    case 1:
                    case 202:
                        ledCommand.setTitle("全板入库");
                        break;
                    case 10:
@@ -3241,27 +3242,28 @@
            Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
            // 获取LED线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // 相同工作号集合则过滤
            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
                continue;
            }
//            // 相同工作号集合则过滤
//            if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
//                continue;
//            }
            // 命令下发 -------------------------------------------------------------------------------
            if (!commands.isEmpty()) {
                if (led.getId() == 7) {
//                if (led.getId() == 7) {
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                        continue;
                    } else {
                        ledThread.setLedMk(false);
                    }
                } else {
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                        continue;
                    } else {
                        ledThread.setLedMk(false);
                    }
                }
//                }
//                else {
//                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
//                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
//                        continue;
//                    } else {
//                        ledThread.setLedMk(false);
//                    }
//                }

            }

@@ -4657,7 +4659,7 @@
                        && rgvProtocol.getTaskNo1()==0
                        && rgvProtocol.getTaskNo2()==0
                ) {
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvSlave.getId());
                    basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                    rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute());
                }

 src/main/resources/application.yml

@@ -344,10 +344,7 @@
      staNo: 122
    # WMS入库口1
    inWmsSta[0]:
      staNo: 118
    # WMS入库口1
    inWmsSta[1]:
      staNo: 119
      staNo: 145
    # 空板入库口1
    emptyInSta[0]:
      staNo: 122
@@ -473,14 +470,21 @@
   # LED1
  led[0]:
    id: 1
    ip: 10.10.10.201
    ip: 192.168.18.5
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 15
    staArr: 144
  # LED2
  led[1]:
    id: 2
    ip: 10.10.10.202
    ip: 192.168.18.6
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 11
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 217
  # LED3
  led[2]:
    id: 3
    ip: 192.168.18.7
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 221