src/main/java/com/zy/asrs/controller/SiteController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/SiteController.java
@@ -183,7 +183,7 @@ @PostMapping("/detl/update") @ManagerAuth(memo = "修改站点数据") public R siteDetlUpdate(@RequestParam Integer siteId, public R siteDetlUpdate(@RequestParam Integer devNo, @RequestParam Integer workNo, @RequestParam Short staNo, @RequestParam String pakMk){ @@ -191,7 +191,7 @@ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); Map<Integer, StaProtocol> station = devpThread.getStation(); for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) { if (siteId.equals(entry.getKey())) { if (devNo.equals(entry.getKey())) { StaProtocol staProtocol = entry.getValue(); if (staProtocol == null) { continue; src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -349,7 +349,7 @@ int index = staNos.indexOf(staProtocol.getSiteId()); do { log.info("输送递归次数:" + count); OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo()); // 工作号 OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo().intValue()); // 工作号 Thread.sleep(100); OperateResult write2 = siemensS7Net.Write("DB100." + (index * 66 + 4), staProtocol.getStaNo()); // 目标站 if (write1.IsSuccess && write2.IsSuccess) {