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_92_A2_Down.java | 8 ++------ 1 files changed, 2 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 26eb4b6..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 @@ -94,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); @@ -125,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