From cb01dd03539e8b1e3f713efe8b2821eb6a8aa386 Mon Sep 17 00:00:00 2001 From: lsh <lsh> Date: 星期三, 15 五月 2024 20:02:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index 3990184..23b173b 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -38,6 +38,7 @@ private CrnSlave slave; private CrnProtocol crnProtocol; private boolean resetFlag = false; + private boolean resetFlagTwo = false; public Long sign = System.currentTimeMillis(); @@ -204,12 +205,16 @@ crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52)); - //宸ヤ綅2鏁版嵁 鏃犲垯鏃犻渶渚嬩細 - crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56)); - crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56)); - crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58)); - crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60)); - crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64)); + //宸ヤ綅2鏁版嵁 鏃犲垯鏃犻渶鐞嗕細 + try{ + crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56)); + crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56)); + crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58)); + crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60)); + crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64)); + }catch (Exception e){ + + } OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId())); @@ -227,6 +232,16 @@ resetFlag = false; } } + if (resetFlagTwo) { + if(crnProtocol.getTaskNo()==9999){ + backHpFlag = false; + } + CrnCommand crnCommand = new CrnCommand(); + crnCommand.setAckFinish((short)1); + if (write5(crnCommand)) { + resetFlag = false; + } + } } try { -- Gitblit v1.9.1