From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +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/DictTypeConstants.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
index 05f4b64..0fd3d74 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
@@ -3,7 +3,7 @@
 /**
  * MES 瀛楀吀绫诲瀷鐨勬灇涓剧被
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 public interface DictTypeConstants {
 
@@ -79,6 +79,8 @@
     String MES_ORDER_STATUS = "mes_order_status"; // MES 鍗曟嵁鐘舵�侊紙IQC/IPQC/OQC/RQC 閫氱敤锛�
     String MES_QC_CHECK_RESULT = "mes_qc_check_result"; // MES 妫�娴嬬粨鏋�
     String MES_QC_SOURCE_DOC_TYPE = "mes_qc_source_doc_type"; // MES 鏉ユ簮鍗曟嵁绫诲瀷
+    String MES_NCR_STATUS = "mes_ncr_status"; // MES NCR 鐘舵��
+    String MES_NCR_DISPOSITION = "mes_ncr_disposition"; // MES NCR 澶勭疆鏂瑰紡
 
     // ========== 璁惧绠$悊 (DV) ==========
     String MES_DV_MACHINERY_STATUS = "mes_dv_machinery_status"; // MES 璁惧鐘舵��
@@ -91,6 +93,9 @@
     String MES_DV_CHECK_RESULT = "mes_dv_check_result"; // MES 鐐规缁撴灉
     String MES_DV_REPAIR_STATUS = "mes_dv_repair_status"; // MES 缁翠慨宸ュ崟鐘舵��
     String MES_DV_REPAIR_RESULT = "mes_dv_repair_result"; // MES 缁翠慨缁撴灉
+    String MES_DV_METERING_CATEGORY = "mes_dv_metering_category"; // MES 璁¢噺鍣ㄥ叿绫诲埆
+    String MES_DV_METERING_STATUS = "mes_dv_metering_status"; // MES 璁¢噺鍣ㄥ叿鐘舵��
+    String MES_DV_METERING_CHECK_RESULT = "mes_dv_metering_check_result"; // MES 璁¢噺妫�娴嬬粨璁�
 
     // ========== 鎺掔彮鏃ュ巻 (CAL) ==========
     String MES_CAL_HOLIDAY_TYPE = "mes_cal_holiday_type"; // MES 鍋囨湡绫诲瀷

--
Gitblit v1.9.3