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/p206V2/parse/global/GlCreate.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
index 71b7883..eb37b70 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V2.parse.global;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.util.*;
@@ -95,9 +96,12 @@
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
int crc = new CRC16().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_LE(bytes, crc, 0);
- bytes[2] = ProtocolConstantV206V2.P_Tail_Byte ;
+ bytes[0] = crcBs[2] ;
+ bytes[1] = crcBs[3] ;
+ bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
return bytes ;
}
}
--
Gitblit v1.8.0