From ac47ec165d87f505d80761ac92a0ece0ae84d215 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期五, 26 七月 2024 14:49:15 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java index 9e3242f..d0a2096 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_24_Down.java @@ -5,13 +5,10 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V202404.CodeV202404; import com.dy.common.mw.protocol.p206V202404.ParseParamsForDownV202404; -import com.dy.common.mw.protocol.p206V202404.downVos.ComCd23Vo; import com.dy.common.mw.protocol.p206V202404.downVos.ComCd24Vo; import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate; import com.dy.common.util.ByteUtil; import com.dy.common.util.NumUtil; - -import java.nio.charset.StandardCharsets; @AnnotationCodeDown(ifAny={ CodeV202404.cd_24 @@ -84,12 +81,12 @@ bytes = ByteUtil.bytesMerge(bytes, bs) ; - byte[] bsRg = ByteUtil.hexToBytes(cvo.registerNo) ; + byte[] bsRg = ByteUtil.hex2Bytes(cvo.registerNo) ; bytes = ByteUtil.bytesMerge(bytes, bsRg) ; byte[] bs1 = new byte[7] ; - index ++ ; + index = 0 ; GlCreate.createPw(bs1, index); index += 2 ; -- Gitblit v1.8.0