#
mrzhssss
2022-11-21 82fd2711ad9e1edb40490c1f107e5a50b2369e6a
#
3个文件已修改
21 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -778,9 +778,8 @@
//            // 入出库模式判断
//            if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
                if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {
                    continue;
                }
//                if (wrkMast.getStaNo() == 204 && devpThread.ioModeOf2F != IoModeType.PAKOUT_MODE) {continue;}
//                if (wrkMast.getStaNo() == 402 && devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) {continue;}
                // 查询站点详细信息
                BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -311,6 +311,12 @@
                log.error("写入输送线2F入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
        if (this.ioModeOf4F != IoModeType.NONE) {
            if (!siemensS7Net.Write("DB100.170", this.ioModeOf4F.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线4F入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线4F入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
    }
    /**
src/main/resources/application.yml
@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
    username: sa
    password: sa@123
  mvc:
@@ -146,7 +146,7 @@
  # 堆垛机4
  crn[3]:
    id: 4
    ip: 10.10.10.121
    ip: 10.10.10.200
    port: 102
    rack: 0
    slot: 0
@@ -239,8 +239,8 @@
      barcode: ${wcs-slave.barcode[3].id}
  devp[1]:
    id: 1
    ip: 10.10.10.60
    id: 2
    ip: 10.10.10.93
    port: 102
    rack: 0
    slot: 0
@@ -274,7 +274,7 @@
    port: 51236
  barcode[3]:
    id: 4
    ip: 10.10.10.52
    ip: 10.10.10.93
    port: 51236
   # LED1
  led[0]: