From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 23 五月 2024 08:50:58 +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/p206V1_0_0/parse/Cd_02_Up.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
index dd96f44..c8395db 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java
@@ -44,6 +44,7 @@
         String confirmComCode = para.upCode ;
         ParseParamsForDownV1_0_1 downCpParams  = new ParseParamsForDownV1_0_1() ;
         downCpParams.setValue(
+                null,
                 ProtocolConstantV206V1_0_0.protocolName,
                 para.rtuAddr,
                 Command.defaultId,
@@ -83,7 +84,7 @@
     protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
         DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
         DataCd02Vo cdData = new DataCd02Vo() ;
-        dV1.dataCd02Vo = cdData ;
+        dV1.subData = cdData ;
         cdData.status = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1_0_0.dataIndex, 1) ;
     }
 }

--
Gitblit v1.8.0