From b48ed5159987e8cee81bc765010cfd9393ad7003 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 13 八月 2026 13:28:09 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index eb2ae1a..ca229f4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -18,7 +18,6 @@
ErrorCode MD_ITEM_TYPE_CODE_DUPLICATE = new ErrorCode(1_040_100_005, "鍚屼竴鐖跺垎绫讳笅宸插瓨鍦ㄨ缂栫爜鐨勫垎绫�");
ErrorCode MD_ITEM_TYPE_PARENT_IS_CHILD = new ErrorCode(1_040_100_006, "涓嶈兘璁剧疆鑷繁鐨勫瓙鍒嗙被涓虹埗鍒嗙被");
ErrorCode MD_ITEM_TYPE_EXITS_ITEM = new ErrorCode(1_040_100_007, "璇ュ垎绫讳笅瀛樺湪鐗╂枡锛屾棤娉曞垹闄�");
- ErrorCode MD_ITEM_TYPE_NOT_LEAF = new ErrorCode(1_040_100_008, "鍙兘灏嗙墿鏂欐寕杞藉埌鍙跺瓙鍒嗙被锛堣鍒嗙被涓嬪瓨鍦ㄥ瓙鍒嗙被锛�");
// ========== MES 鍩虹鏁版嵁-璁￠噺鍗曚綅锛�1-040-101-000锛� ==========
ErrorCode MD_UNIT_MEASURE_NOT_EXISTS = new ErrorCode(1_040_101_000, "璁￠噺鍗曚綅涓嶅瓨鍦�");
@@ -33,7 +32,6 @@
ErrorCode MD_ITEM_NOT_EXISTS = new ErrorCode(1_040_102_000, "鐗╂枡涓嶅瓨鍦�");
ErrorCode MD_ITEM_CODE_DUPLICATE = new ErrorCode(1_040_102_001, "鐗╂枡缂栫爜宸插瓨鍦�");
ErrorCode MD_ITEM_NAME_DUPLICATE = new ErrorCode(1_040_102_002, "鐗╂枡鍚嶇О宸插瓨鍦�");
- ErrorCode MD_ITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_102_003, "瀵煎叆鐗╂枡鏁版嵁涓嶈兘涓虹┖");
ErrorCode MD_ITEM_BATCH_REQUIRED = new ErrorCode(1_040_102_004, "褰撳墠鐗╂枡鍚敤浜嗘壒娆＄鐞嗭紝璇烽�夋嫨鎵规");
ErrorCode MD_ITEM_IS_DISABLE = new ErrorCode(1_040_102_005, "鐗╂枡宸茬鐢�");
@@ -216,6 +214,15 @@
ErrorCode DV_CHECK_RECORD_NO_LINE = new ErrorCode(1_040_306_002, "鎻愪氦鐐规璁板綍鏃讹紝鑷冲皯闇�瑕佷竴鏉＄偣妫�椤圭洰");
// ========== MES 璁惧绠＄悊-鐐规璁板綍鏄庣粏锛�1-040-306-100锛� ==========
ErrorCode DV_CHECK_RECORD_LINE_NOT_EXISTS = new ErrorCode(1_040_306_100, "璁惧鐐规璁板綍鏄庣粏涓嶅瓨鍦�");
+
+ // ========== MES 璁惧绠＄悊-璁￠噺鍣ㄥ叿锛�1-040-307-000锛� ==========
+ ErrorCode DV_METERING_NOT_EXISTS = new ErrorCode(1_040_307_000, "璁￠噺鍣ㄥ叿涓嶅瓨鍦�");
+ ErrorCode DV_METERING_CODE_DUPLICATE = new ErrorCode(1_040_307_001, "璁￠噺鍣ㄥ叿缂栫爜宸插瓨鍦�");
+ ErrorCode DV_METERING_HAS_CHECK_RECORD = new ErrorCode(1_040_307_002, "璁￠噺鍣ㄥ叿宸插叧鑱旀娴嬭褰曪紝鏃犳硶鍒犻櫎");
+
+ // ========== MES 璁惧绠＄悊-璁￠噺妫�娴嬭褰曪紙1-040-307-100锛� ==========
+ ErrorCode DV_METERING_CHECK_NOT_EXISTS = new ErrorCode(1_040_307_100, "璁￠噺妫�娴嬭褰曚笉瀛樺湪");
+ ErrorCode DV_METERING_CHECK_CODE_DUPLICATE = new ErrorCode(1_040_307_101, "璁￠噺妫�娴嬬紪鍙峰凡瀛樺湪");
// ========== MES 宸ュ叿绠＄悊-宸ュ叿绫诲瀷锛�1-040-400-000锛� ==========
ErrorCode TM_TOOL_TYPE_NOT_EXISTS = new ErrorCode(1_040_400_000, "宸ュ叿绫诲瀷涓嶅瓨鍦�");
@@ -420,6 +427,13 @@
// ========== MES 璐ㄩ噺绠＄悊-閫�璐ф楠岃锛�1-040-608-100锛� ==========
ErrorCode QC_RQC_LINE_NOT_EXISTS = new ErrorCode(1_040_608_100, "閫�璐ф楠岃涓嶅瓨鍦�");
+ // ========== MES 璐ㄩ噺绠＄悊-涓嶅悎鏍煎搧澶勭悊 NCR锛�1-040-609-000锛� ==========
+ ErrorCode QC_NCR_NOT_EXISTS = new ErrorCode(1_040_609_000, "涓嶅悎鏍煎搧澶勭悊鍗曚笉瀛樺湪");
+ ErrorCode QC_NCR_CODE_DUPLICATE = new ErrorCode(1_040_609_001, "涓嶅悎鏍煎搧澶勭悊鍗曠紪鍙峰凡瀛樺湪");
+ ErrorCode QC_NCR_NOT_PENDING_REVIEW = new ErrorCode(1_040_609_002, "鍙湁寰呰瘎瀹＄姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙搷浣�");
+ ErrorCode QC_NCR_NOT_REVIEWED = new ErrorCode(1_040_609_003, "鍙湁宸茶瘎瀹＄姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙墽琛屽缃�");
+ ErrorCode QC_NCR_NOT_DISPOSED = new ErrorCode(1_040_609_004, "鍙湁宸插缃姸鎬佺殑涓嶅悎鏍煎搧澶勭悊鍗曟墠鍙叧闂�");
+
// ========== MES 浠撳簱绠＄悊-浠撳簱锛�1-040-700-000锛� ==========
ErrorCode WM_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_040_700_000, "浠撳簱涓嶅瓨鍦�");
ErrorCode WM_WAREHOUSE_CODE_DUPLICATE = new ErrorCode(1_040_700_001, "浠撳簱缂栫爜宸插瓨鍦�");
--
Gitblit v1.9.3