zjj
2024-10-14 0ce585c279882137a4f7ebac4030b0922b58c344
Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
2个文件已修改
3 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2082,7 +2082,7 @@
                                && basDevp.getWrkNo() == 0 && basDevp.getCanining().equals("Y")){
//                             更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo((short) 9997);
                            staProtocol.setStaNo(basDevp.getDevNo().shortValue());
                            staProtocol.setStaNo((short) (basDevp.getDevNo()==1004?1003:1013));
//                            staProtocol.setStaNo((short) 1013);
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devpThread.getSlave().getId(), new Task(2, staProtocol));
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -565,6 +565,7 @@
                staProtocol.setOutEnable(status[3]);// 可出
                staProtocol.setForce(status[4]);
                staProtocol.setAmount(count);
                staProtocol.setLow(true);
                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {