From f1407edab8c340af83e6d5008b4b826a3922e989 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:33:55 +0800
Subject: [PATCH] 完善协议(20240510)数据处理任务树。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_15_Down.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_15_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_15_Down.java
index a853664..647a77f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_15_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_15_Down.java
@@ -62,7 +62,7 @@
             if(cvo.flowNo.length() != 12){
                 throw new Exception("娴佹按鍙峰繀椤绘槸12浣嶆暟瀛�") ;
             }
-            byte[] bs = new byte[17] ;
+            byte[] bs = new byte[40] ;
             int index = 0 ;
             bs[index] = (byte)(Integer.parseInt(cvo.controllerType, 16));
 
@@ -96,9 +96,9 @@
                     bs[index++] = 0 ;
                 }
             }
-            if(cvo.chargeMoney != null){
-                String chargeMoney = "" + (Double.valueOf(cvo.chargeWater * 100)).longValue() ;
-                byte[] bTemp = ByteUtil.string2BCD_LE(chargeMoney) ;
+            if(cvo.chargeWater != null){
+                String chargeWater = "" + (Double.valueOf(cvo.chargeWater * 100)).longValue() ;
+                byte[] bTemp = ByteUtil.string2BCD_LE(chargeWater) ;
                 int bTempLen = bTemp.length ;
                 int count = 0 ;
                 for(int i = 0 ; i < bTempLen; i++){
@@ -120,9 +120,12 @@
             ByteUtil.string2BCD_BE(bs, cvo.flowNo, index) ;
 
             index += 6 ;
+            GlCreate.createDt(bs, index);
+
+            index += 6 ;
             GlCreate.createPw(bs, index);
 
-            index ++ ;
+            index += 2 ;
             GlCreate.createS2D(bs, index) ;
 
             index += 4 ;

--
Gitblit v1.8.0