From 229741972d5998de57d0d246f73c5e7ff0d42530 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 九月 2024 08:40:49 +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/global/GlCreate.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index 9a0db38..d2ac976 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -114,25 +114,8 @@
ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
- byte month = Byte.parseByte(DateTime.MM()) ;
- byte week = (byte)(DateTime.week_Int().byteValue() << 1) ;
- String month1 = "0" ;
- String month2 = "0" ;
- if(month < 10){
- month1 = "" + month ;
- }else{
- if(month == 10){
- month1 = "0" ;
- }else if(month == 11){
- month1 = "1" ;
- }else if(month == 12){
- month1 = "2" ;
- }
- week = (byte)(week | 0x01) ;
- }
- month2 = "" + week ;
-
- ByteUtil.string2BCD_BE(bs, month2 + month1, index + 4) ;
+ //浠ヤ笅鍐欐硶鑷劧涔熸槸BCD
+ bs[index + 4] = (byte)((DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM()))) ;
ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
/*
--
Gitblit v1.8.0