From 0ce585c279882137a4f7ebac4030b0922b58c344 Mon Sep 17 00:00:00 2001 From: zjj <zjj123456> Date: 星期一, 14 十月 2024 15:22:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 7332e89..de5891e 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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)); diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 5781dd1..aa0de4c 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/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()) { -- Gitblit v1.9.1