From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java index df6850b..cc155a8 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java @@ -102,7 +102,10 @@ index ++ ;//姘存车/闃� 0xf0:闃�闂� 0x00:姘存车 - index ++ ;//褰撳墠鐢ㄦ按鏂瑰紡 1涓狧EX 0x00:姝e父鍒峰崱寮�娉�/闃�鐢ㄦ按 + index ++ ;//褰撳墠鐢ㄦ按鏂瑰紡 + cdData.opType = bs[index]; + //杩涜鍏煎杞崲 + cdData.opType = CommonV202404.openType2P206V1(cdData.opType) ; index++ ; cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ; @@ -123,7 +126,7 @@ cdData.eleTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; index += 5 ; - cdData.moneyRemainUser = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; + cdData.moneyRemainUser = ByteUtil.BCD2Long_LE(bs, index, index + 4)/10000.0D ;//2025-02-24锛屽墿浣欓噾棰濇敼涓�4浣嶅皬鏁� index += 5 ; cdData.waterRemainUser = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; -- Gitblit v1.8.0