|
|
@@ -460,9 +460,11 @@ public class S8MonitoringService : ITransient
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// S8-PROD-SUPPLY-TREND-CHART-REPLACE-DUPLICATE-SECTION-1:Production 页近 N 日生产异常趋势。
|
|
|
- /// 口径:module_code IN (S2,S6) AND exception_type_code IN (EQUIP_FAULT / MFG_MATERIAL_ABNORMAL / MFG_QUALITY_ABNORMAL);
|
|
|
- /// 时间字段 created_at;不排除 CLOSED;按日聚合,缺失日期补 0;days 限 1-30。
|
|
|
+ /// S8-PRODUCTION-PAGE-TYPE-TITLE-AND-TREND-ALIGN-1:Production 页近 N 日生产异常趋势。
|
|
|
+ /// 口径:module_code IN (S2,S6) AND exception_type_code IN
|
|
|
+ /// (EQUIP_FAULT / MFG_MATERIAL_ABNORMAL / MFG_QUALITY_ABNORMAL / BODY_PRODUCTION_DELAY_WARNING);
|
|
|
+ /// 时间字段 created_at;不排除 CLOSED;按日聚合,缺失日期补 0;days 限 1-30;
|
|
|
+ /// Total = EquipmentFault + MaterialFault + QualityFault + BodyProductionDelay,与右侧明细对齐。
|
|
|
/// </summary>
|
|
|
public async Task<AdoS8ProductionTrendDto> GetProductionTrendAsync(long tenantId = 1, long factoryId = 1, int days = 7, string? period = null)
|
|
|
{
|
|
|
@@ -505,17 +507,19 @@ public class S8MonitoringService : ITransient
|
|
|
{
|
|
|
var d = from.AddDays(i);
|
|
|
var bucket = byDate.TryGetValue(d, out var list) ? list : new();
|
|
|
- var ef = bucket.Count(r => r.ExceptionTypeCode == "EQUIP_FAULT");
|
|
|
- var mf = bucket.Count(r => r.ExceptionTypeCode == "MFG_MATERIAL_ABNORMAL");
|
|
|
- var qf = bucket.Count(r => r.ExceptionTypeCode == "MFG_QUALITY_ABNORMAL");
|
|
|
+ var ef = bucket.Count(r => r.ExceptionTypeCode == "EQUIP_FAULT");
|
|
|
+ var mf = bucket.Count(r => r.ExceptionTypeCode == "MFG_MATERIAL_ABNORMAL");
|
|
|
+ var qf = bucket.Count(r => r.ExceptionTypeCode == "MFG_QUALITY_ABNORMAL");
|
|
|
+ var bpd = bucket.Count(r => r.ExceptionTypeCode == "BODY_PRODUCTION_DELAY_WARNING");
|
|
|
dayList.Add(new AdoS8ProductionTrendDayDto
|
|
|
{
|
|
|
- Date = d.ToString("MM/dd"),
|
|
|
- RawDate = d.ToString("yyyy-MM-dd"),
|
|
|
- EquipmentFault = ef,
|
|
|
- MaterialFault = mf,
|
|
|
- QualityFault = qf,
|
|
|
- Total = bucket.Count,
|
|
|
+ Date = d.ToString("MM/dd"),
|
|
|
+ RawDate = d.ToString("yyyy-MM-dd"),
|
|
|
+ EquipmentFault = ef,
|
|
|
+ MaterialFault = mf,
|
|
|
+ QualityFault = qf,
|
|
|
+ BodyProductionDelay = bpd,
|
|
|
+ Total = ef + mf + qf + bpd,
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -656,7 +660,9 @@ public class S8MonitoringService : ITransient
|
|
|
("equipment-fault", "设备异常", "EQUIP_FAULT"),
|
|
|
("material-fault", "物料异常", "MFG_MATERIAL_ABNORMAL"),
|
|
|
("quality-fault", "质量异常", "MFG_QUALITY_ABNORMAL"),
|
|
|
- ("body-production-delay-warning", "本体生产延期预警", "BODY_PRODUCTION_DELAY_WARNING"),
|
|
|
+ // S8-PRODUCTION-PAGE-TYPE-TITLE-AND-TREND-ALIGN-1:大屏显示「本体生产延期」(去预警),
|
|
|
+ // typeCode 保持 BODY_PRODUCTION_DELAY_WARNING,不改 ado_s8_exception_type.type_name。
|
|
|
+ ("body-production-delay-warning", "本体生产延期", "BODY_PRODUCTION_DELAY_WARNING"),
|
|
|
},
|
|
|
"SUPPLY" => new (string, string, string)[]
|
|
|
{
|