From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0

---
 src/packages/constants/src/dict-enum.ts |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/src/packages/constants/src/dict-enum.ts b/src/packages/constants/src/dict-enum.ts
index f0a2d99..2a62e5a 100644
--- a/src/packages/constants/src/dict-enum.ts
+++ b/src/packages/constants/src/dict-enum.ts
@@ -123,6 +123,19 @@
   CRM_PRODUCT_STATUS: 'crm_product_status', // CRM 鍟嗗搧鐘舵��
   CRM_PRODUCT_UNIT: 'crm_product_unit', // CRM 浜у搧鍗曚綅
   CRM_RECEIVABLE_RETURN_TYPE: 'crm_receivable_return_type', // CRM 鍥炴鐨勮繕娆炬柟寮�
+  CRM_INVOICE_TYPE: 'crm_invoice_type', // CRM 鍙戠エ绫诲瀷
+  CRM_SALES_TARGET_PERIOD_TYPE: 'crm_sales_target_period_type', // CRM 閿�鍞洰鏍囧懆鏈熺被鍨�
+  CRM_SALES_TARGET_DIMENSION: 'crm_sales_target_dimension', // CRM 閿�鍞洰鏍囩淮搴�
+  CRM_SALES_TARGET_STATUS: 'crm_sales_target_status', // CRM 閿�鍞洰鏍囩姸鎬�
+} as const;
+
+/** ========== AFTERSALES - 鍞悗鏈嶅姟妯″潡 ========== */
+const AFTERSALES_DICT = {
+  AFTERSALE_TICKET_STATUS: 'aftersale_ticket_status', // 鍞悗宸ュ崟鐘舵��
+  AFTERSALE_RETURN_STATUS: 'aftersale_return_status', // 鍞悗閫�璐х姸鎬�
+  AFTERSALE_ISSUE_TYPE: 'aftersale_issue_type', // 鍞悗闂绫诲瀷
+  AFTERSALE_RETURN_TYPE: 'aftersale_return_type', // 鍞悗閫�璐х被鍨�
+  AFTERSALE_SEVERITY_LEVEL: 'aftersale_severity_level', // 鍞悗涓ラ噸绋嬪害
 } as const;
 
 /** ========== ERP - 浼佷笟璧勬簮璁″垝妯″潡 ========== */
@@ -221,8 +234,12 @@
   MES_DV_REPAIR_RESULT: 'mes_dv_repair_result', // MES 缁翠慨缁撴灉
   MES_DV_CHECK_RECORD_STATUS: 'mes_dv_check_record_status', // MES 鐐规璁板綍鐘舵��
   MES_DV_CHECK_RESULT: 'mes_dv_check_result', // MES 鐐规缁撴灉
+  MES_DV_METERING_CATEGORY: 'mes_dv_metering_category', // MES 璁¢噺鍣ㄥ叿绫诲埆
+  MES_DV_METERING_STATUS: 'mes_dv_metering_status', // MES 璁¢噺鍣ㄥ叿鐘舵��
+  MES_DV_METERING_CHECK_RESULT: 'mes_dv_metering_check_result', // MES 璁¢噺妫�娴嬬粨璁�
   MES_PRO_LINK_TYPE: 'mes_pro_link_type', // MES 宸ュ簭鍏崇郴绫诲瀷
   MES_PRO_WORK_ORDER_STATUS: 'mes_pro_work_order_status', // MES 鐢熶骇宸ュ崟鐘舵��
+  ORDER_PRODUCTION_STATUS: 'order_production_status', // 鐢熶骇璁㈠崟鐘舵��
   MES_PRO_WORK_ORDER_TYPE: 'mes_pro_work_order_type', // MES 宸ュ崟绫诲瀷
   MES_PRO_WORK_ORDER_SOURCE_TYPE: 'mes_pro_work_order_source_type', // MES 宸ュ崟鏉ユ簮绫诲瀷
   MES_PRO_TASK_STATUS: 'mes_pro_task_status', // MES 鐢熶骇浠诲姟鐘舵��
@@ -231,6 +248,7 @@
   MES_PD_PROJECT_STATUS: 'mes_pd_project_status', // MES 浜у搧璁捐椤圭洰鐘舵��
   MES_PD_TASK_STATUS: 'mes_pd_task_status', // MES 浜у搧璁捐浠诲姟鐘舵��
   MES_PD_DRAWING_REVIEW_STATUS: 'mes_pd_drawing_review_status', // MES 鍥剧焊瀹℃牳鐘舵��
+  MES_PD_DOCUMENT_AUDIT_STATUS: 'mes_pd_document_audit_status', // MES 璧勬枡瀹℃牳鐘舵��
   MES_PD_VERSION_CHANGE_TYPE: 'mes_pd_version_change_type', // MES 鐗堟湰鍙樻洿绫诲瀷
   MES_PD_DOCUMENT_TYPE: 'mes_pd_document_type', // MES 璁捐璧勬枡绫诲瀷
   MES_PD_ARCHIVE_STATUS: 'mes_pd_archive_status', // MES 璁捐褰掓。鐘舵��
@@ -276,6 +294,8 @@
   MES_WM_TRANSFER_TYPE: 'mes_wm_transfer_type', // MES 杞Щ鍗曠被鍨�
   MES_PD_PARAM_TYPE: 'mes_pd_param_type', // MES 宸ヨ壓鍙傛暟绫诲瀷
   MES_PD_TEMPLATE_TYPE: 'mes_pd_template_type', // MES 宸ヨ壓妯℃澘绫诲瀷
+  MES_NCR_STATUS: 'mes_ncr_status', // MES 涓嶅悎鏍煎搧澶勭悊鍗曠姸鎬�
+  MES_NCR_DISPOSITION: 'mes_ncr_disposition', // MES 涓嶅悎鏍煎搧澶勭疆鏂瑰紡
 } as const;
 
 /** ========== WMS - 浠撳偍绠$悊妯″潡 ========== */
@@ -293,12 +313,35 @@
   STOCK_BIZ_TYPE: 'stock_biz_type', // 搴撳瓨涓氬姟绫诲瀷
 } as const;
 
+/** ========== HRM - 浜哄姏璧勬簮妯″潡 ========== */
+const HRM_DICT = {
+  HRM_DEGREE: 'hrm_degree', // HRM 瀛﹀巻
+  HRM_EMPLOYEE_STATUS: 'hrm_employee_status', // HRM 鍛樺伐鐘舵��
+  HRM_GENDER: 'hrm_gender', // HRM 鎬у埆
+  HRM_AUDIT_STATUS: 'hrm_audit_status', // HRM 瀹℃壒鐘舵��
+  HRM_LEAVE_TYPE: 'hrm_leave_type', // HRM 璇峰亣绫诲瀷
+  HRM_TRANSFER_TYPE: 'hrm_transfer_type', // HRM 璋冨矖绫诲瀷
+  HRM_RESIGNATION_TYPE: 'hrm_resignation_type', // HRM 绂昏亴绫诲瀷
+  HRM_CLOCK_TYPE: 'hrm_clock_type', // HRM 鎵撳崱绫诲瀷
+  HRM_HOLIDAY_TYPE: 'hrm_holiday_type', // HRM 鑺傚亣鏃ョ被鍨�
+  HRM_DATA_SOURCE: 'hrm_data_source', // HRM 鏁版嵁鏉ユ簮
+  HRM_SALARY_STATUS: 'hrm_salary_status', // HRM 钖祫鐘舵��
+  HRM_HANDOVER_STATUS: 'hrm_handover_status', // HRM 浜ゆ帴鐘舵��
+  HRM_PAYMENT_METHOD: 'hrm_payment_method', // HRM 鍙戞斁鏂瑰紡
+  HRM_CONTRACT_TYPE: 'hrm_contract_type', // HRM 鍚堝悓绫诲瀷
+  HRM_CONTRACT_TERM_TYPE: 'hrm_contract_term_type', // HRM 鍚堝悓鏈熼檺绫诲瀷
+  HRM_CONTRACT_STATUS: 'hrm_contract_status', // HRM 鍚堝悓鐘舵��
+  HRM_CONTRACT_TERMINATE_STATUS: 'hrm_contract_terminate_status', // HRM 鍚堝悓瑙i櫎缁堟鐘舵��
+} as const;
+
 /** 瀛楀吀绫诲瀷鏋氫妇 - 缁熶竴瀵煎嚭 */
 const DICT_TYPE = {
+  ...AFTERSALES_DICT,
   ...AI_DICT,
   ...BPM_DICT,
   ...CRM_DICT,
   ...ERP_DICT,
+  ...HRM_DICT,
   ...INFRA_DICT,
   ...IM_DICT,
   ...IOT_DICT,

--
Gitblit v1.9.3