From c929083f415ef98765afec91d5a8c88be4450f5b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:11 +0800
Subject: [PATCH] 为甘肃嘉峪关项目基于靳总制定协议实现一款产品

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_02_Up.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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..973fa1f 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,11 +44,12 @@
         String confirmComCode = para.upCode ;
         ParseParamsForDownV1_0_1 downCpParams  = new ParseParamsForDownV1_0_1() ;
         downCpParams.setValue(
+                null,
                 ProtocolConstantV206V1_0_0.protocolName,
                 para.rtuAddr,
                 Command.defaultId,
                 confirmComCode,
-                null,
+                para.data!=null?(para.data.subData!=null?(((DataV1_0_1)(para.data.subData)).subData):null):null,
                 null);
         //鏋勯�犲簲绛�
         byte[] data = new Cd_02_Down().doParse(downCpParams) ;
@@ -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