From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本;2、默认设备是表阀一体(0x02)

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
index 4e4977c..222f6d7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd92_A2Vo.java
@@ -13,7 +13,8 @@
 	public Integer projectNo ;//椤圭洰缂栧彿
 	public String icCardNo ;//IC鍗$紪鍙凤紙17浣嶆暟瀛楋級
 	public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
-	public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
+	//2025-05-13姹熸捣鍙垹闄�
+	//public String opDt ;//寮�娉�/闃�鏃堕棿锛坹yyy-mm-dd HH:MM:SS锛�
 	public Byte opType ;//寮�闃�绫诲瀷
 	public Byte opResult ;//寮�鍚车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
 
@@ -41,11 +42,13 @@
 		sb.append("      璁㈠崟鍙� : ") ;
 		sb.append(orderNo == null?"鏈煡":orderNo) ;
 		sb.append("\n") ;
+		/*
 		sb.append("      寮�娉�/闃�鏃堕棿 : ") ;
 		sb.append(opDt == null?"鏈煡":opDt) ;
 		sb.append("\n") ;
+		 */
 		sb.append("      寮�鍚车/闃�绫诲瀷 : ") ;
-		sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x01 ? "骞冲彴":"鐢ㄦ埛")) ;
+		sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x02 ? "骞冲彴":"鐢ㄦ埛")) ;
 		sb.append("\n") ;
 		sb.append("      寮�鍚车/闃�缁撴灉 : ") ;
 		sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;
@@ -70,11 +73,13 @@
 		sb.append("璁㈠崟鍙� : ") ;
 		sb.append(orderNo == null?"鏈煡":orderNo) ;
 		sb.append("\n") ;
+		/*
 		sb.append("寮�娉�/闃�鏃堕棿 : ") ;
 		sb.append(opDt == null?"鏈煡":opDt) ;
 		sb.append("\n") ;
+		 */
 		sb.append("寮�鍚车/闃�绫诲瀷 : ") ;
-		sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x01 ? "骞冲彴":"鐢ㄦ埛")) ;
+		sb.append(opType == null?"鏈煡":(opType.byteValue() == 0x02 ? "骞冲彴":"鐢ㄦ埛")) ;
 		sb.append("\n") ;
 		sb.append("寮�鍚车/闃�缁撴灉 : ") ;
 		sb.append(opResult == null?"鏈煡":(opResult.byteValue() == 0x01 ? "鎴愬姛":"澶辫触")) ;

--
Gitblit v1.8.0