修复产量为0时排行和图表仍显示无意义数据

main
haoliang 1 month ago
parent f9ce0254b0
commit 3fe20a24a2

@ -96,6 +96,7 @@ namespace CncRepository.Impl.Dashboard
(CASE WHEN m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END) AS Status, (CASE WHEN m.last_ping_time IS NOT NULL AND m.last_ping_time >= NOW() - INTERVAL 20 SECOND THEN 1 ELSE 0 END) AS Status,
(SELECT program_name FROM cnc_daily_production (SELECT program_name FROM cnc_daily_production
WHERE machine_id = m.id AND production_date = CURDATE() WHERE machine_id = m.id AND production_date = CURDATE()
AND end_total_count > base_total_count
ORDER BY id DESC LIMIT 1) AS Program ORDER BY id DESC LIMIT 1) AS Program
FROM cnc_machine m FROM cnc_machine m
LEFT JOIN ( LEFT JOIN (
@ -187,6 +188,7 @@ namespace CncRepository.Impl.Dashboard
FROM cnc_daily_production FROM cnc_daily_production
WHERE production_date BETWEEN @StartDate AND @EndDate WHERE production_date BETWEEN @StartDate AND @EndDate
GROUP BY program_name GROUP BY program_name
HAVING SUM(end_total_count - base_total_count) > 0
ORDER BY TotalQuantity {orderBy} ORDER BY TotalQuantity {orderBy}
LIMIT @Top"; LIMIT @Top";
var rows = conn.Query<ProgramRankItem>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList(); var rows = conn.Query<ProgramRankItem>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList();
@ -206,6 +208,7 @@ namespace CncRepository.Impl.Dashboard
FROM cnc_daily_production FROM cnc_daily_production
WHERE production_date BETWEEN @StartDate AND @EndDate WHERE production_date BETWEEN @StartDate AND @EndDate
GROUP BY program_name GROUP BY program_name
HAVING SUM(end_total_count - base_total_count) > 0
ORDER BY TotalQuantity DESC ORDER BY TotalQuantity DESC
LIMIT @Top"; LIMIT @Top";
var rows = conn.Query<ProgramDistributionItem>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList(); var rows = conn.Query<ProgramDistributionItem>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList();

Loading…
Cancel
Save