From 42f5453644c41d3b6ac9e381f931efdfc9da8178 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:56 +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_92_A2_Down.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 18ff4f4..00cebd7 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
@@ -24,6 +24,7 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -79,7 +80,7 @@
if(!NumUtil.isPlusIntNumber(cvo.orderNo)){
throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
}
- if(cvo.orderNo.length() != 12){
+ if(cvo.orderNo.length() != 16){
throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
}
@@ -102,7 +103,7 @@
GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
index += 8 ;
- if(cvo.waterRemain != null){
+ if(cvo.waterRemain == null){
cvo.waterRemain = 0.0 ;
}
String strTemp = "" + Double.valueOf(cvo.waterRemain * 100).intValue() ;
@@ -112,15 +113,15 @@
for(int i = 0 ; i < bTempLen; i++){
bs[index++] = bTemp[i] ;
count ++ ;
- if(count >= 4){
+ if(count >= 5){
break ;
}
}
- for(; count < 4; count++){
+ for(; count < 5; count++){
bs[index++] = 0 ;
}
- if(cvo.moneyRemain != null){
+ if(cvo.moneyRemain == null){
cvo.moneyRemain = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.moneyRemain * 100)).intValue() ;
@@ -139,7 +140,7 @@
}
- if(cvo.waterPrice != null){
+ if(cvo.waterPrice == null){
cvo.waterPrice = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.waterPrice * 100)).intValue() ;
@@ -158,7 +159,7 @@
}
- if(cvo.elePrice != null){
+ if(cvo.elePrice == null){
cvo.elePrice = 0.0 ;
}
strTemp = "" + (Double.valueOf(cvo.elePrice * 100)).intValue() ;
--
Gitblit v1.8.0