From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 10:06:37 +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_3D_Down.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Down.java
index 5387d72..8466e74 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Down.java
@@ -11,9 +11,9 @@
 
 /**
  * @Author liurunyu
- * @Date 2024/4/10 18:51
- * @LastEditTime 2024/4/10 18:51
- * @Description
+ * @Date 2024/4/10 18:26
+ * @LastEditTime 2024/4/10 18:26
+ * @Description 璁剧疆姘翠环
  */
 @AnnotationCodeDown(ifAny={
         CodeV1_0_1.cd_3D
@@ -31,6 +31,7 @@
         midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
         midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
         midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+        midRs.downCodeName = CodeV1_0_1.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
         midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
         midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
         midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -77,11 +78,11 @@
             throw new Exception("鏈彁渚涘懡浠ゅ弬鏁版暟鎹紝涓嶈兘鏋勯�犲姛鑳界爜涓�" + para.commandCode + "鐨勪笅琛屽懡浠�") ;
         }else{
             index = 0 ;
-            byte[] bs = new byte[12] ;
-            String icCardNo = ((String)para.param) ;
-            Integer icCardNoInt = Integer.valueOf(icCardNo);
-            ByteUtilUnsigned.int2Bytes_LE(bs, icCardNoInt, index);
-            index += 4 ;
+            byte[] bs = new byte[10] ;
+            Double priceDb = ((Double)para.param) * 100 ;
+            Integer priceInt = priceDb.intValue() ;
+            ByteUtilUnsigned.short2Bytes_LE(bs, priceInt.shortValue(), index);
+            index += 2 ;
             GlCreate.createPw(bs, index);
             index += 2 ;
             GlCreate.createTp(bs, index);
@@ -97,4 +98,4 @@
         return bytes ;
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.8.0