From 853fe374274289974df99427418cc94416de8509 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 16:48:42 +0800
Subject: [PATCH] 表阀一体机协议金额全部是4位小数

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
index 182609a..a67201e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
@@ -23,6 +23,7 @@
 
         MidResultToRtu midRs = new MidResultToRtu() ;
         midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+        midRs.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
         midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
         midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
         midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
@@ -93,11 +94,7 @@
             bs[index] = cvo.projectNo.byteValue() ;
 
             index ++ ;
-            if(cvo.controllerType.equals("01")){
-                bs[index] = (byte)0xF0 ;
-            }else{
-                bs[index] = (byte)0x00 ;
-            }
+            GlCreate.createValveOrPump(cvo.controllerType, bs, index) ;
 
             index ++ ;
             GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
@@ -124,7 +121,7 @@
             if(cvo.moneyRemain == null){
                 cvo.moneyRemain = 0.0 ;
             }
-            strTemp = "" + (Double.valueOf(cvo.moneyRemain * 100)).intValue() ;
+            strTemp = "" + (Double.valueOf(cvo.moneyRemain * 10000)).intValue() ;
             bTemp = ByteUtil.string2BCD_LE(strTemp) ;
             bTempLen = bTemp.length ;
             count = 0 ;

--
Gitblit v1.8.0