|
|
|
|
@ -95,8 +95,9 @@ namespace CncRepository.Impl.Dashboard
|
|
|
|
|
COALESCE(SUM(ad.day_quantity), 0) AS Quantity,
|
|
|
|
|
(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
|
|
|
|
|
WHERE machine_id = m.id AND production_date = CURDATE()
|
|
|
|
|
ORDER BY id DESC LIMIT 1) AS Program
|
|
|
|
|
WHERE machine_id = m.id AND production_date = CURDATE()
|
|
|
|
|
AND end_total_count > base_total_count
|
|
|
|
|
ORDER BY id DESC LIMIT 1) AS Program
|
|
|
|
|
FROM cnc_machine m
|
|
|
|
|
LEFT JOIN (
|
|
|
|
|
SELECT machine_id, production_date,
|
|
|
|
|
@ -187,6 +188,7 @@ namespace CncRepository.Impl.Dashboard
|
|
|
|
|
FROM cnc_daily_production
|
|
|
|
|
WHERE production_date BETWEEN @StartDate AND @EndDate
|
|
|
|
|
GROUP BY program_name
|
|
|
|
|
HAVING SUM(end_total_count - base_total_count) > 0
|
|
|
|
|
ORDER BY TotalQuantity {orderBy}
|
|
|
|
|
LIMIT @Top";
|
|
|
|
|
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
|
|
|
|
|
WHERE production_date BETWEEN @StartDate AND @EndDate
|
|
|
|
|
GROUP BY program_name
|
|
|
|
|
HAVING SUM(end_total_count - base_total_count) > 0
|
|
|
|
|
ORDER BY TotalQuantity DESC
|
|
|
|
|
LIMIT @Top";
|
|
|
|
|
var rows = conn.Query<ProgramDistributionItem>(sql, new { StartDate = startDate, EndDate = endDate, Top = top }).ToList();
|
|
|
|
|
|