From 2fef20fe45a1fc901b51243bcc60682524447990 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期五, 23 八月 2024 18:55:41 +0800
Subject: [PATCH] Merge branch '2.0.0-release' of http://nonxin.cn:8090/r/product/product-server/V2.0.0
---
product-server-device/src/main/java/com/product/device/config/DeviceCode.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 151 insertions(+), 11 deletions(-)
diff --git a/product-server-device/src/main/java/com/product/device/config/DeviceCode.java b/product-server-device/src/main/java/com/product/device/config/DeviceCode.java
index b9a80d5..fd9f9a8 100644
--- a/product-server-device/src/main/java/com/product/device/config/DeviceCode.java
+++ b/product-server-device/src/main/java/com/product/device/config/DeviceCode.java
@@ -1,7 +1,12 @@
package com.product.device.config;
+import java.text.DecimalFormat;
+import java.text.Format;
+
import com.product.common.enums.IEnum;
import com.product.common.enums.ModuleEnum;
+import com.product.core.config.Global;
+import com.product.util.BaseUtil;
/**
* Copyright 漏 2019.
@@ -14,25 +19,160 @@
*/
public enum DeviceCode implements IEnum {
- SYSTEM_OPERATION_SUCCESS("鎴愬姛", "200"),
- SYSTEM_FORM_NODATA("璇锋眰鍙傛暟涓虹┖", ModuleEnum.DEVICE.getValue() + "001"),
- DEVICE_CREATE_INSPECTION_ERROR("鍒涘缓璁惧鐐规閿欒", ModuleEnum.DEVICE.getValue() + "002"),
- DEVICE_CREATE_FAILURE_ERROR("鍒涘缓璁惧鏁呴殰閿欒", ModuleEnum.DEVICE.getValue() + "003"),
- ;
-
- private String text;
- private String value;
+ SYSTEM_OPERATION_SUCCESS("鎴愬姛", 200),
+ SYSTEM_FORM_NODATA("璇锋眰鍙傛暟涓虹┖", 999),
+ SYSTEM_FORM_COUNT("璇锋眰鍙傛暟鏈夎", 998),
+ SYSTEM_TABLE_NODATA("璇锋眰琛ㄥ悕鏈夎", 997),
+ SYSTEM_CPAGES_NOT_NULL("鍒嗛〉鍙傛暟涓嶈兘涓虹┖", 996),
+ SYSTEM_LOGIN_USER_FAIL("鑾峰彇褰撳墠鐧诲綍浜哄け璐�", 995),
- private DeviceCode(String text, String value) {
+
+ COMMON_GET_WAREHOUSE_KEEPER_FAIL("鑾峰彇搴撶鍛樺け璐�", 1),
+ COMMON_UNKNOWN_ERROR("鏈煡寮傚父", 2),
+ COMMON_DATA_ERROR("鏁版嵁寮傚父", 3),
+
+ ARCHIVES_SAVE_FAIL("璁惧妗ｆ淇濆瓨", 4),
+ ARCHIVES_DELETE_FAIL("璁惧妗ｆ鍒犻櫎", 5),
+
+ DEVICE_CREATE_INSPECTION_ERROR("鍒涘缓璁惧鐐规閿欒", 4),
+ DEL_PRINT_CONFIG_DATA_FAIL("鍒犻櫎閰嶇疆鏁版嵁澶辫触", 6),
+ DEVICE_ARCHIVES_OPERATE_FAIL("鐢垫妗ｆ鎿嶄綔澶辫触锛�", 7),
+ SAVE_PATROL_CONFIG_ERROR("鐢垫璁惧宸℃椤圭洰鎿嶄綔澶辫触", 8),
+ DEVICE_MAINTENANCE_REVIEW_FAIL("璁惧缁翠繚澶嶆牳澶辫触", 9),
+ DEVICE_MAINTENANCE_YEAR_FAIL("鑾峰彇缁翠繚鍗曚綅骞村害缁翠繚缁熻澶辫触", 10),
+ DEVICE_MAINTENANCE_YEAR_FINISH_FAIL("鑾峰彇缁翠繚鍗曚綅骞村害缁翠繚浠诲姟瀹屾垚鎯呭喌澶辫触", 11),
+
+
+ //璁惧鐐规
+ DEVICE_INSPECTION_ITEM_OPERATE_FAIL("鐐规椤圭洰鎿嶄綔閿欒锛�", 12),
+ DEVICE_INSPECTION_ITEM_DELETE_FAIL("鐐规椤圭洰鍒犻櫎澶辫触", 13),
+ DEVICE_INSPECTION_ITEM_HAS_REFERENCED("鐐规椤圭洰宸茶寮曠敤锛屼笉鑳藉垹闄�", 14),
+ DEVICE_INSPECTION_CONFIG_OPERATE_FIAL("鐐规閰嶇疆鎿嶄綔閿欒锛�", 15),
+ DEVICE_INSPECTION_CONFIG_SAVE_FIAL("鐐规閰嶇疆淇濆瓨閿欒", 16),
+ DEVICE_INSPECTION_RECORD_OPERATE_FIAL("鐐规璁板綍鎿嶄綔閿欒锛�", 17),
+ DEVICE_INSPECTION_RECORD_SAVEE_FIAL("鐐规璁板綍淇濆瓨澶辫触", 18),
+
+ //璁惧淇濆吇
+ DEVICE_MAINTENANCE_CONTENT_OPERATE_FAIL("淇濆吇椤圭洰鎿嶄綔閿欒锛�", 19),
+ DEVICE_MAINTENANCE_CONTENT_DEL_FAIL("淇濆吇鍐呭鍒犻櫎澶辫触", 20),
+ DEVICE_MAINTENANCE_CONTENT_HAS_REFERENCED("淇濆吇鍐呭宸茶寮曠敤锛屼笉鑳藉垹闄�", 21),
+ DEVICE_MAINTENANCE_CONFIG_OPERATE_FAIL("淇濆吇閰嶇疆鎿嶄綔閿欒锛�", 22),
+ DEVICE_MAINTENANCE_CONFIG_SAVE_FAIL("淇濆吇閰嶇疆淇濆瓨澶辫触", 23),
+ DEVICE_MAINTENANCE_PLAN_OPERATE_FAIL("淇濆吇璁″垝鎿嶄綔閿欒锛�", 24),
+ DEVICE_MAINTENANCE_PLAN_SAVE_FAIL("淇濆吇璁″垝淇濆瓨澶辫触", 25),
+ DEVICE_MAINTENANCE_PLAN_HAS_BEGIN("淇濆吇璁″垝宸茬粡寮�濮�", 26),
+ DEVICE_MAINTENANCE_PLAN_HAS_COMMON_PLAN("鍚屽勾搴﹀悓淇濆吇绫诲瀷璁″垝宸茬粡鍒涘缓", 27),
+ DEVICE_MAINTENANCE_PLAN_HAS_NO_CONFIG("娌℃湁閰嶇疆瀵瑰簲绫诲瀷鐨勪繚鍏昏澶�", 28),
+ DEVICE_MAINTENANCE_RECORD_OPERATE_FAIL("淇濆吇璁板綍鎿嶄綔閿欒锛�", 29),
+ DEVICE_MAINTENANCE_TAK_COMPLETE_FAIL("淇濆吇浠诲姟瀹屾垚澶辫触", 30),
+
+ //璁惧浠诲姟
+ DEVICE_TASK_TYPE_NO_EXIST("浠诲姟绫诲瀷鏁版嵁涓嶅瓨鍦�", 31),
+ DEVICE_TASK_DATA_NO_EXIST("璁惧浠诲姟鏁版嵁涓嶅瓨鍦�", 32),
+ DEVICE_TASK_CREATE_FAIL_PARAM_ERROR("鍙傛暟寮傚父锛屽彂璧蜂换鍔″け璐ワ紝", 33),
+ DEVICE_TASK_COMPLETE_FAIL_TASK_NO_EXIST("浠诲姟瀹屾垚澶辫触锛屼换鍔℃暟鎹笉瀛樺湪锛�", 34),
+ DEVICE_TASK_COMPLETE_FAIL_TASK_OWNER_MISMATCH("褰撳墠鍔炵悊浜轰笌涓茶浠诲姟鑺傜偣鍔炵悊浜轰笉鍖归厤", 35),
+ DEVICE_TASK_HAS_FINISH("浠诲姟宸茬粡缁撴潫锛屾棤闇�鍐嶆鍔炵悊", 36),
+ DEVICE_TASK_WAREHOUSE_KEPPER_NO_EXIST("搴撶鍛樹笉瀛樺湪", 37),
+
+ //澶囦欢妗ｆ
+ SPARE_PART_ARCHIVE_OPERATE_FIAL("澶囦欢妗ｆ鎿嶄綔閿欒锛�", 38),
+ SPARE_PART_ARCHIVE_DELETE_FIAL("澶囦欢妗ｆ鍒犻櫎澶辫触", 39),
+ SPARE_PART_ARCHIVE_DELETE_FIAL_DATA_REFERENCED("澶囦欢妗ｆ鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 40),
+ SPARE_PART_ARCHIVE_NEED_BAECODE_UNIT("闇�瑕佹寚瀹氫笖浠呰兘鎸囧畾涓�涓崟浣嶄负鏉＄爜鍗曚綅锛岃鑱旂郴绠＄悊鍛樺湪澶囦欢妗ｆ杩涜璁剧疆锛�", 41),
+ SPARE_PART_ARCHIVE_GET_BASE_UNIT_FAIL("鍩烘湰鍗曚綅鑾峰彇澶辫触", 42),
+
+ //澶囦欢閲囪喘鐢宠
+ SPARE_PART_PURCHASE_APPLY_OPERATE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 43),
+ SPARE_PART_PURCHASE_APPLY_DELETE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 44),
+ SPARE_PART_PURCHASE_APPLY_DELETE_FIAL_DATA_REFERENCED("澶囦欢妗ｆ鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 45),
+ SPARE_PART_PURCHASE_APPLY_CONFIRM("璇ラ噰璐敵璇峰崟宸茬粡琚簱绠＄‘璁わ紝鏃犳硶鏇存敼锛�", 46),
+ SPARE_PART_PURCHASE_APPLY_SUB_LIST_FAIL("鏈敓鎴愯鍗曠殑閲囪喘鐢宠鍗曟槑缁嗚幏鍙栧け璐ワ細", 47),
+
+ //澶囦欢閲囪喘璁㈠崟
+ SPARE_PART_PURCHASE_ORDER_OPERATE_FIAL("澶囦欢閲囪喘鐢宠鎿嶄綔澶辫触锛�", 48),
+ SPARE_PART_PURCHASE_ORDER_PARTIAL_WAREHOUSING("宸插瓨鍦ㄩ儴鍒嗗瓙琛ㄦ暟鎹叆搴擄紝鏃犳硶鍒犻櫎", 49),
+ SPARE_PART_PURCHASE_ORDER_SELECT_ONE_SUPPLIER_ORDER("鍙兘閫夋嫨涓�瀹朵緵搴斿晢鐨勮鍗�", 50),
+
+ //澶囦欢鍏ュ簱
+ SPARE_PART_WAREHOUSE_IN_OPERATE_FIAL("澶囦欢鍏ュ簱鎿嶄綔澶辫触锛�", 51),
+ SPARE_PART_WAREHOUSE_IN_SAVE_FIAL("澶囦欢鍏ュ簱淇濆瓨澶辫触", 52),
+ SPARE_PART_WAREHOUSE_IN_SUB_OPERATE_FIAL("澶囦欢閲囪喘鐢宠瀛愯〃鎿嶄綔澶辫触锛�", 53),
+
+ //澶囦欢棰嗙敤
+ SPARE_PART_RECEIVE_OPERATE_FAIL("澶囦欢棰嗙敤鎿嶄綔澶辫触锛�", 54),
+ SPARE_PART_RECEIVE_SUB_LIST_BY_REPAIR_FAIL("缁翠慨澶囦欢棰嗙敤鏄庣粏鑾峰彇澶辫触", 55),
+ SPARE_PART_RECEIVE_SUB_LIST_BY_MAINTENANCE_FAIL("缁翠慨澶囦欢棰嗙敤鏄庣粏鑾峰彇澶辫触", 56),
+ SPARE_PART_RECEIVE_SUB_DETAIL_OPERATE_FAIL("澶囦欢棰嗙敤鏄庣粏鎿嶄綔澶辫触锛�", 57),
+ SPARE_PART_RECEIVE_SUB_SPLIT_OPERATE_FAIL("澶囦欢棰嗙敤鎷嗕欢鎿嶄綔澶辫触锛�", 58),
+ SPARE_PART_RECEIVE_TASK_HAS_SEND("浠诲姟宸插彂璧锋垨宸茬粨鏉燂紝璇峰嬁閲嶅鍙戣捣浠诲姟", 59),
+
+ //澶囦欢褰掕繕
+ SPARE_PART_RETURN_OPERATE_FAIL("澶囦欢褰掕繕鎿嶄綔澶辫触锛�", 60),
+ SPARE_PART_RETURN_DELETE_FIAL("澶囦欢褰掕繕鍒犻櫎澶辫触", 61),
+ SPARE_PART_RETURN_DELETE_FIAL_DATA_REFERENCED("澶囦欢褰掕繕鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 62),
+
+ //澶囦欢搴撳瓨
+ SPARE_PART_STOCK_OPERATE_FAIL("澶囦欢搴撳瓨鎿嶄綔澶辫触锛�", 63),
+ SPARE_PART_STOCK_ARCHIVE_PARAM_NO_UPLOAD("澶囦欢妗ｆ鍙傛暟鏈笂浼狅紝鏃犳硶杩涜璁＄畻", 64),
+ SPARE_PART_SROCK_SPECIFY_BARCODE_SPLIT("璇锋寚瀹氫竴涓潯鐮佽繘琛屾媶浠�", 65),
+ SPARE_PART_SROCK_SPLIT_METHOD_UNREASONABLE("鎷嗕欢鏂瑰紡涓嶅悎鐞嗭紝璇烽噸鏂伴�夋嫨", 66),
+ SPARE_PART_STOCK_DISABLED_OR_NO_EXIST_UNIT("绂佺敤鎴栬�呮湭褰曞叆鍒扮郴缁熺殑鍗曚綅锛屾棤娉曡繘琛岃绠楋紝鍗曚綅uuid锛�%s", 67),
+ SPARE_PART_STOCK_CANNOT_GET_ARCHIVE_UNIT("鏈幏鍙栧埌澶囦欢妗ｆid涓恒��%s銆戠殑鍗曚綅", 68),
+
+ //澶囦欢鎶ュ簾
+ SPARE_PART_SCRAPE_OPERATE_FAIL("澶囦欢鎶ュ簾鎿嶄綔澶辫触锛�", 69),
+ SPARE_PART_SCRAPE_DELETE_FIAL("澶囦欢鎶ュ簾鍒犻櫎澶辫触", 70),
+ SPARE_PART_SCRAPE_DELETE_FIAL_DATA_REFERENCED("澶囦欢鎶ュ簾鍒犻櫎澶辫触,鏁版嵁宸茶寮曠敤", 71),
+
+ //搴撳瓨鐩樼偣
+ SPARE_PART_INVENTORY_OPERATE_FAIL("澶囦欢搴撳瓨鎿嶄綔澶辫触锛�", 72),
+ SPARE_PART_INVENTORY_PARSE_ERROR("閿欒鐨勫弬鏁帮紝瑙ｆ瀽澶辫触", 73),
+
+
+ DEVICE_RECORD_SAVE_FAIL("{&device.name(璁惧)&}鍙拌处淇濆瓨澶辫触", 74),
+
+ DEVICE_RECORD_FIND_FAIL("{&device.name(璁惧)&)鍙拌处璇︽儏鏌ヨ澶辫触", 75),
+ DEVICE_RECORD_FIND_ALL_FAIL("{&device.name(璁惧)&}鍙拌处鏌ヨ澶辫触", 76),
+ TASK_FIELDSET_NOT_FIND_ERROR("鏈壘鍒拌澶囦繚鍏讳俊鎭�", 77),
+
+ INSPECTION_PLAN_CONFIG_LIST_FIND_FAIL("璁惧鐐规璁″垝閰嶇疆鏌ヨ澶辫触", 78),
+
+ GET_INSPECTION_PLAN_DETAIL_LIST_FAIL("鑾峰彇鐐规璁″垝鏄庣粏澶辫触", 79),
+ ;
+
+ private String text;
+ private int value;
+
+ private DeviceCode(String text, int value) {
this.text = text;
this.value = value;
}
public String getText() {
- return text;
+ try {
+ //浣跨敤姝ｅ垯鍖归厤text涓殑鐗规畩琛ㄨ揪寮忎互{&寮�澶达紝&}缁撳熬锛岃幏鍙栧埌鍏朵腑鐨勫唴瀹�
+ String regex = "\\{&(.+?)&\\}";
+ String result = this.text;
+ if (this.text.matches(regex)) {
+ result = this.text.replaceAll(regex, "$1");
+ }
+ String defaultValue = null;
+ //鎴彇result涓互(寮�澶达紝)缁撳熬鐨勫唴瀹�
+ if (result.contains("(") && result.contains(")")) {
+ defaultValue = result.substring(0, result.indexOf("("));
+ }
+ //鍘绘帀result涓� (寮�澶达紝)缁撳熬鐨勫唴瀹� 鍖呭惈鎷彿
+ result = result.replaceAll("\\(.*?\\)", "");
+ //鑾峰彇绯荤粺閰嶇疆涓殑鍊�
+ return BaseUtil.ifNull(Global.getSystemConfig(result, defaultValue),text);
+ } catch (Exception e) {
+ return text;
+ }
}
public String getValue() {
- return value;
+ Format format = new DecimalFormat("000");
+ return ModuleEnum.DEVICE.getValue() + format.format(this.value);
}
}
--
Gitblit v1.9.2