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 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/packages/constants/src/dict-enum.ts b/src/packages/constants/src/dict-enum.ts index e899ad2..2a62e5a 100644 --- a/src/packages/constants/src/dict-enum.ts +++ b/src/packages/constants/src/dict-enum.ts @@ -123,6 +123,10 @@ 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 - 鍞悗鏈嶅姟妯″潡 ========== */ @@ -230,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 鐢熶骇浠诲姟鐘舵�� @@ -286,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 - 浠撳偍绠＄悊妯″潡 ========== */ @@ -318,6 +328,10 @@ 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 鍚堝悓瑙ｉ櫎缁堟鐘舵�� } as const; /** 瀛楀吀绫诲瀷鏋氫妇 - 缁熶竴瀵煎嚭 */ -- Gitblit v1.9.3