From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +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/p206V1/CodeV1.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CodeV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CodeV1.java
index 09637fa..961f686 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CodeV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CodeV1.java
@@ -2,7 +2,7 @@
public class CodeV1 {
//鍔熻兘鐮佷负瀛楃涓诧紝鍗佸叚杩涘埗鏁版嵁
- public static final String cd_02 = "02" ;//閬ユ祴绔欓摼璺娴�
+ public static final String cd_02 = "02" ;//閬ユ祴绔欓摼璺娴� 涓诲姩涓婃姤
public static final String cd_10 = "10" ;//璁剧疆閬ユ祴绔欑粓绔湴鍧�
public static final String cd_11 = "11" ;//璁剧疆閬ユ祴绔欐椂閽燂紙鏈疄鐜帮級
public static final String cd_12 = "12" ;//璁剧疆宸ヤ綔妯″紡锛堟湭瀹炵幇锛�
@@ -30,9 +30,9 @@
public static final String cd_6A = "6A" ;//鏌ヨ闃�闂ㄥ牭杞數娴佸��
public static final String cd_6B = "6B" ;//鏌ヨ闃�闂ㄨ秴鏃舵椂闂�
public static final String cd_6D = "6D" ;//鏌ヨ闃舵姘翠环
- public static final String cd_81 = "81" ;//闅忔満鑷姤鎶� ok
- public static final String cd_83 = "83" ;//閬ユ祴绔欏紑鍏抽榾鑷姤 ok
- public static final String cd_84 = "84" ;//寮�闃�宸ヤ綔鎶� ok
+ public static final String cd_81 = "81" ;//闅忔満鑷姤鎶� 涓诲姩涓婃姤
+ public static final String cd_83 = "83" ;//閬ユ祴绔欏紑鍏抽榾鑷姤 涓诲姩涓婃姤
+ public static final String cd_84 = "84" ;//寮�闃�宸ヤ綔鎶� 涓诲姩涓婃姤
public static final String cd_91 = "91" ;//娓呯┖鍘嗗彶璁板綍
public static final String cd_92 = "92" ;//閬ユ帶鍚姩闃�闂�
public static final String cd_93 = "93" ;//閬ユ帶鍏抽棴闃�闂�
@@ -44,7 +44,15 @@
public static final String cd_A1 = "A1" ;//瀹氭椂鍏抽榾寮忚鍒掑紑闃�
public static final String cd_A2 = "A2" ;//瀹氶噺鍏抽榾寮忚鍒掑紑闃�
public static final String cd_B0 = "B0" ;//鏌ヨ瀹炴椂鏁版嵁锛堟湭瀹炵幇锛�
- public static final String cd_C0 = "C0" ;//閬ユ祴绔欐暣鐐逛笂鎶ュ疄鏃舵暟鎹� ok
+ public static final String cd_C0 = "C0" ;//閬ユ祴绔欐暣鐐逛笂鎶ュ疄鏃舵暟鎹� 涓诲姩涓婃姤
+
+ public static final String cd_1600 = "1600" ;//鍗囩骇澶嶄綅
+ public static final String cd_1601 = "1601" ;//鍗囩骇閰嶇疆
+ public static final String cd_1602 = "1602" ;//鍗囩骇鏁版嵁
+ public static final String cd_1603 = "1603" ;//鍗囩骇鏍￠獙
+ public static final String cd_9601 = "9601" ;//鍗囩骇閰嶇疆
+ public static final String cd_9602 = "9602" ;//鍗囩骇鏁版嵁
+ public static final String cd_9603 = "9603" ;//鍗囩骇鏍￠獙
public static String getCodeName(String code) {
String name = (code.equals(cd_02) ? "閾捐矾妫�娴�" :
@@ -90,13 +98,21 @@
(code.equals(cd_A2) ? "瀹氶噺鍏抽榾寮忚鍒掑紑闃�" :
(code.equals(cd_B0) ? "鏌ヨ瀹炴椂鏁版嵁" :
(code.equals(cd_C0) ? "鑷姤(鏁寸偣)瀹炴椂鏁版嵁" :
- ""))))))))))))))))))))))))))))))))))))))))))) ;
+ (code.equals(cd_1600) ? "鍗囩骇澶嶄綅" :
+ (code.equals(cd_1601) ? "鍗囩骇閰嶇疆" :
+ (code.equals(cd_1602) ? "鍗囩骇鏁版嵁" :
+ (code.equals(cd_1603) ? "鍗囩骇鏍￠獙" :
+ (code.equals(cd_9601) ? "鍗囩骇閰嶇疆" :
+ (code.equals(cd_9602) ? "鍗囩骇鏁版嵁" :
+ (code.equals(cd_9603) ? "鍗囩骇鏍￠獙" :
+ "")))))))))))))))))))))))))))))))))))))))))))))))))) ;
if(name == null || name.equals("")){
name = code ;
}
return name ;
}
+
/**
* 鏄惁涓烘湁鏁堝姛鑳界爜
* @param code 鍔熻兘鐮�
--
Gitblit v1.8.0