fix(s8): include order flow overtime types in monitoring trends

Web/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "admin.net",
 	"type": "module",
-	"version": "2.4.140",
+	"version": "2.4.141",
 	"packageManager": "pnpm@10.32.1",
 	"lastBuildTime": "2026.03.15",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",

server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -11,9 +11,9 @@
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
     <Copyright>Admin.NET</Copyright>
     <Description>Admin.NET 通用权限开发平台</Description>
-    <AssemblyVersion>1.0.106</AssemblyVersion>
-    <FileVersion>1.0.106</FileVersion>
-    <Version>1.0.106</Version>
+    <AssemblyVersion>1.0.107</AssemblyVersion>
+    <FileVersion>1.0.107</FileVersion>
+    <Version>1.0.107</Version>
   </PropertyGroup>
 
   <ItemGroup>

server/Plugins/Admin.NET.Plugin.AiDOP/Service/S8/S8MonitoringService.cs

@@ -381,7 +381,11 @@ public class S8MonitoringService : ITransient
         }
 
         var deliveryModules = new[] { "S1", "S7" };
-        var deliveryTypes = new[] { "ORDER_CHANGE", "DELIVERY_DELAY", "PENDING_SHIPMENT" };
+        var deliveryTypes = new[]
+        {
+            "ORDER_CHANGE", "DELIVERY_DELAY", "PENDING_SHIPMENT",
+            "ORDER_DUE_DATE_DELAY", "DELIVERY_DELAY_WARNING"
+        };
 
         var rows = await _rep.AsQueryable()
             .Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
@@ -410,7 +414,7 @@ public class S8MonitoringService : ITransient
                 OrderChange    = oc,
                 DeliveryDelay  = dd,
                 PendingShipment = ps,
-                Total          = oc + dd + ps,
+                Total          = bucket.Count,
             });
         }
 
@@ -459,7 +463,11 @@ public class S8MonitoringService : ITransient
         }
 
         var prodModules = new[] { "S2", "S6" };
-        var prodTypes = new[] { "EQUIP_FAULT", "MFG_MATERIAL_ABNORMAL", "MFG_QUALITY_ABNORMAL" };
+        var prodTypes = new[]
+        {
+            "EQUIP_FAULT", "MFG_MATERIAL_ABNORMAL", "MFG_QUALITY_ABNORMAL",
+            "BODY_PRODUCTION_DELAY_WARNING"
+        };
 
         var rows = await _rep.AsQueryable()
             .Where(e => e.TenantId == tenantId && e.FactoryId == factoryId && !e.IsDeleted)
@@ -486,7 +494,7 @@ public class S8MonitoringService : ITransient
                 EquipmentFault = ef,
                 MaterialFault  = mf,
                 QualityFault   = qf,
-                Total          = ef + mf + qf,
+                Total          = bucket.Count,
             });
         }
 
@@ -539,7 +547,8 @@ public class S8MonitoringService : ITransient
         var supplyTypes = new[]
         {
             "SUPPLIER_ETA_ISSUE", "SUPPLIER_SHIP_ISSUE", "WAREHOUSE_RECEIPT_ABNORMAL",
-            "IQC_ISSUE", "WH_PUTAWAY_ISSUE", "WORK_ORDER_KITTING_ABNORMAL", "WORK_ORDER_ISSUE_ABNORMAL"
+            "IQC_ISSUE", "WH_PUTAWAY_ISSUE", "WORK_ORDER_KITTING_ABNORMAL", "WORK_ORDER_ISSUE_ABNORMAL",
+            "PURCHASE_EXECUTION_DELAY"
         };
 
         var rows = await _rep.AsQueryable()
@@ -575,7 +584,7 @@ public class S8MonitoringService : ITransient
                 WarehousePutawayIssue      = s5,
                 WorkOrderKittingAbnormal   = s6,
                 WorkOrderIssueAbnormal     = s7,
-                Total                      = s1 + s2 + s3 + s4 + s5 + s6 + s7,
+                Total                      = bucket.Count,
             });
         }
 
@@ -614,25 +623,29 @@ public class S8MonitoringService : ITransient
         {
             "DELIVERY" => new (string, string, string)[]
             {
-                ("order-change",   "订单变更",     "ORDER_CHANGE"),
-                ("delivery-delay", "交期延迟",     "DELIVERY_DELAY"),
-                ("stock-pending",  "入库待发",     "PENDING_SHIPMENT"),
+                ("order-change",            "订单变更",     "ORDER_CHANGE"),
+                ("delivery-delay",          "交期延迟",     "DELIVERY_DELAY"),
+                ("stock-pending",           "入库待发",     "PENDING_SHIPMENT"),
+                ("order-due-date-delay",    "订单交期延期", "ORDER_DUE_DATE_DELAY"),
+                ("delivery-delay-warning",  "总装发货延期预警", "DELIVERY_DELAY_WARNING"),
             },
             "PRODUCTION" => new (string, string, string)[]
             {
-                ("equipment-fault", "设备异常", "EQUIP_FAULT"),
-                ("material-fault",  "物料异常", "MFG_MATERIAL_ABNORMAL"),
-                ("quality-fault",   "质量异常", "MFG_QUALITY_ABNORMAL"),
+                ("equipment-fault",                "设备异常",         "EQUIP_FAULT"),
+                ("material-fault",                 "物料异常",         "MFG_MATERIAL_ABNORMAL"),
+                ("quality-fault",                  "质量异常",         "MFG_QUALITY_ABNORMAL"),
+                ("body-production-delay-warning",  "本体生产延期预警", "BODY_PRODUCTION_DELAY_WARNING"),
             },
             "SUPPLY" => new (string, string, string)[]
             {
-                ("supplier-reply-delay", "供应商回复交期异常", "SUPPLIER_ETA_ISSUE"),
-                ("supplier-ship-fault",  "供应商发货异常",     "SUPPLIER_SHIP_ISSUE"),
-                ("warehouse-receipt",    "仓库收货异常",       "WAREHOUSE_RECEIPT_ABNORMAL"),
-                ("iqc-inspection",       "IQC 检验异常",       "IQC_ISSUE"),
-                ("warehouse-shelving",   "仓库上架入库异常",   "WH_PUTAWAY_ISSUE"),
-                ("work-order-prepare",   "仓库工单备料异常",   "WORK_ORDER_KITTING_ABNORMAL"),
-                ("work-order-issue",     "仓库工单发料异常",   "WORK_ORDER_ISSUE_ABNORMAL"),
+                ("supplier-reply-delay",   "供应商回复交期异常", "SUPPLIER_ETA_ISSUE"),
+                ("supplier-ship-fault",    "供应商发货异常",     "SUPPLIER_SHIP_ISSUE"),
+                ("warehouse-receipt",      "仓库收货异常",       "WAREHOUSE_RECEIPT_ABNORMAL"),
+                ("iqc-inspection",         "IQC 检验异常",       "IQC_ISSUE"),
+                ("warehouse-shelving",     "仓库上架入库异常",   "WH_PUTAWAY_ISSUE"),
+                ("work-order-prepare",     "仓库工单备料异常",   "WORK_ORDER_KITTING_ABNORMAL"),
+                ("work-order-issue",       "仓库工单发料异常",   "WORK_ORDER_ISSUE_ABNORMAL"),
+                ("purchase-execution-delay", "采购执行延期",     "PURCHASE_EXECUTION_DELAY"),
             },
             _ => Array.Empty<(string, string, string)>(),
         };