Переглянути джерело

fix(s8): remove result KPI types from process exception scope

YY968XX 2 тижнів тому
батько
коміт
a9a4d62aa2

+ 5 - 5
Web/src/views/aidop/s8/config/S8WatchRuleConfigPage.vue

@@ -202,11 +202,9 @@ const EXCEPTION_TYPE_NAME_MAP: Record<string, string> = {
 	ORDER_REVIEW_DELAY: '订单评审延迟',
 	ORDER_DUE_DATE_DELAY: '订单交期延迟',
 	ORDER_DELIVERY_DELAY_WARNING: '订单交付延期预警',
-	DELIVERY_SATISFACTION_RATE_ABNORMAL: '交付满足率异常',
 	// S2
 	WORK_ORDER_DELAY: '工单延期异常',
 	WORK_ORDER_COMPLETION_DELAY_WARNING: '工单完工延期预警',
-	WORK_ORDER_COMPLETION_RATE_ABNORMAL: '工单完工满足率异常',
 	MFG_MATERIAL_ABNORMAL: '制造协同物料异常',
 	MFG_QUALITY_ABNORMAL: '制造协同质量异常',
 	// S3
@@ -234,14 +232,12 @@ const EXCEPTION_TYPE_NAME_MAP: Record<string, string> = {
 	PRODUCTION_MATERIAL_ABNORMAL: '生产物料异常',
 	PRODUCTION_QUALITY_ABNORMAL: '生产质量异常',
 	PRODUCTION_WORK_ORDER_COMPLETION_DELAY: '工单完工延期',
-	PRODUCTION_WORK_ORDER_COMPLETION_RATE_ABNORMAL: '工单完工满足率异常',
 	// S7
 	PENDING_SHIPMENT: '入库待发异常',
 	FINISHED_GOODS_PENDING_SHIPMENT: '成品待发异常',
 	SHIPMENT_ABNORMAL: '出货异常',
 	DELIVERY_DELAY: '订单交付延期',
-	ORDER_DELIVERY_RATE_ABNORMAL: '订单交付满足率异常',
-	// 旧 7 条"待裁剪"(保留中文,避免历史卡片/异常列表显示空)
+	// 旧 7 条"待裁剪" + 4 条结果指标(保留中文,供历史规则 parseRuleTemplateName 展示;不进入 picker,picker 由 enabledOnly API 驱动)
 	DIMENSION_DEVIATION: '尺寸超差',
 	MATERIAL_SHORTAGE: '物料异常',
 	QUALITY_DEFECT: '质量异常',
@@ -249,6 +245,10 @@ const EXCEPTION_TYPE_NAME_MAP: Record<string, string> = {
 	WH_INBOUND_ISSUE: '仓库收货异常',
 	WH_KIT_ISSUE: '仓库工单备料异常',
 	WH_ISSUE_OUT_ISSUE: '仓库工单发料异常',
+	DELIVERY_SATISFACTION_RATE_ABNORMAL: '交付满足率异常',
+	WORK_ORDER_COMPLETION_RATE_ABNORMAL: '工单完工满足率异常',
+	PRODUCTION_WORK_ORDER_COMPLETION_RATE_ABNORMAL: '工单完工满足率异常',
+	ORDER_DELIVERY_RATE_ABNORMAL: '订单交付满足率异常',
 };
 
 // rule_code 受 varchar(64) 限制使用的缩写 → 完整 exception_type_code。

+ 4 - 4
server/Plugins/Admin.NET.Plugin.AiDOP/SeedData/S8ExceptionTypeSeedData.cs

@@ -72,10 +72,10 @@ public class S8ExceptionTypeSeedData : ISqlSugarEntitySeedData<Entity.S8.AdoS8Ex
             // S1 产销协同(新增 3)
             T(baseId + 21, "ORDER_DUE_DATE_DELAY",                         "订单交期延迟",           S8SceneCode.S1, 240, "ROLE_ORDER_PLANNER",      "SERIOUS",   110, ct, monitoringCategoryKey: S8MonitoringCategory.OrderReview),
             T(baseId + 22, "ORDER_DELIVERY_DELAY_WARNING",                 "订单交付延期预警",       S8SceneCode.S1, 240, "ROLE_ORDER_PLANNER",      "FOLLOW", 111, ct, monitoringCategoryKey: S8MonitoringCategory.OrderReview),
-            T(baseId + 23, "DELIVERY_SATISFACTION_RATE_ABNORMAL",          "交付满足率异常",         S8SceneCode.S1, 240, "ROLE_ORDER_PLANNER",      "SERIOUS",   112, ct, monitoringCategoryKey: S8MonitoringCategory.OrderReview),
+            T(baseId + 23, "DELIVERY_SATISFACTION_RATE_ABNORMAL",          "交付满足率异常",         S8SceneCode.S1, 240, "ROLE_ORDER_PLANNER",      "SERIOUS",   112, ct, enabled: false, remark: "[DEPRECATED] result KPI moved out of S8 process exception scope; reserve for S9", monitoringCategoryKey: S8MonitoringCategory.OrderReview),
             // S2 制造协同(新增 4)
             T(baseId + 24, "WORK_ORDER_COMPLETION_DELAY_WARNING",          "工单完工延期预警",       S8SceneCode.S2, 120, "ROLE_PRODUCTION_PLANNER", "FOLLOW", 210, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
-            T(baseId + 25, "WORK_ORDER_COMPLETION_RATE_ABNORMAL",          "工单完工满足率异常",     S8SceneCode.S2, 240, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   211, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
+            T(baseId + 25, "WORK_ORDER_COMPLETION_RATE_ABNORMAL",          "工单完工满足率异常",     S8SceneCode.S2, 240, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   211, ct, enabled: false, remark: "[DEPRECATED] result KPI moved out of S8 process exception scope; reserve for S9", monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             T(baseId + 26, "MFG_MATERIAL_ABNORMAL",                        "制造协同物料异常",       S8SceneCode.S2,  60, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   212, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             T(baseId + 27, "MFG_QUALITY_ABNORMAL",                         "制造协同质量异常",       S8SceneCode.S2,  60, "ROLE_QC",                 "SERIOUS",   213, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             // S3 供应协同(新增 1)
@@ -95,11 +95,11 @@ public class S8ExceptionTypeSeedData : ISqlSugarEntitySeedData<Entity.S8.AdoS8Ex
             T(baseId + 38, "PRODUCTION_MATERIAL_ABNORMAL",                  "生产物料异常",           S8SceneCode.S6,  60, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   610, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             T(baseId + 39, "PRODUCTION_QUALITY_ABNORMAL",                   "生产质量异常",           S8SceneCode.S6,  60, "ROLE_QC",                 "SERIOUS",   611, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             T(baseId + 40, "PRODUCTION_WORK_ORDER_COMPLETION_DELAY",        "生产工单完工延期",       S8SceneCode.S6,  60, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   612, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
-            T(baseId + 41, "PRODUCTION_WORK_ORDER_COMPLETION_RATE_ABNORMAL","生产工单完工满足率异常", S8SceneCode.S6, 240, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   613, ct, monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
+            T(baseId + 41, "PRODUCTION_WORK_ORDER_COMPLETION_RATE_ABNORMAL","生产工单完工满足率异常", S8SceneCode.S6, 240, "ROLE_PRODUCTION_PLANNER", "SERIOUS",   613, ct, enabled: false, remark: "[DEPRECATED] result KPI moved out of S8 process exception scope; reserve for S9", monitoringCategoryKey: S8MonitoringCategory.BodyProduction),
             // S7 成品仓储(新增 3)
             T(baseId + 42, "FINISHED_GOODS_PENDING_SHIPMENT",              "成品待发异常",           S8SceneCode.S7, 240, "ROLE_WH_OUTBOUND",        "FOLLOW", 710, ct, monitoringCategoryKey: S8MonitoringCategory.FinalAssemblyDelivery),
             T(baseId + 43, "SHIPMENT_ABNORMAL",                            "出货异常",               S8SceneCode.S7, 120, "ROLE_WH_OUTBOUND",        "SERIOUS",   711, ct, monitoringCategoryKey: S8MonitoringCategory.FinalAssemblyDelivery),
-            T(baseId + 44, "ORDER_DELIVERY_RATE_ABNORMAL",                 "订单交付满足率异常",     S8SceneCode.S7, 240, "ROLE_ORDER_PLANNER",      "SERIOUS",   712, ct, monitoringCategoryKey: S8MonitoringCategory.FinalAssemblyDelivery),
+            T(baseId + 44, "ORDER_DELIVERY_RATE_ABNORMAL",                 "订单交付满足率异常",     S8SceneCode.S7, 240, "ROLE_ORDER_PLANNER",      "SERIOUS",   712, ct, enabled: false, remark: "[DEPRECATED] result KPI moved out of S8 process exception scope; reserve for S9", monitoringCategoryKey: S8MonitoringCategory.FinalAssemblyDelivery),
         };
     }
 

+ 0 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Service/S8/S8MonitoringService.cs

@@ -187,7 +187,6 @@ public class S8MonitoringService : ITransient
         "MATERIAL_SHORTAGE"                         => "本体生产",
         "QUALITY_DEFECT"                            => "本体生产",
         "DIMENSION_DEVIATION"                       => "本体生产",
-        "YIELD_DEFICIT"                             => "本体生产",
         "WH_KIT_ISSUE"                              => "本体生产",
         "WH_ISSUE_OUT_ISSUE"                        => "本体生产",
         "WH_INBOUND_ISSUE"                          => "材料采购",