diff --git a/App/Requests/sql/ship_seller.sql b/App/Requests/sql/ship_seller.sql index f97bfb8..bcfce65 100644 --- a/App/Requests/sql/ship_seller.sql +++ b/App/Requests/sql/ship_seller.sql @@ -1,7 +1,7 @@ SELECT DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', TIME_FORMAT(w.waybill_date, '%H:%i') AS 'Время поставки', - SUM(w.total) AS 'Общая сумма (в рублях)', - SUM(wl.amount) as 'Общее количество заготовок' + SUM(w.total) AS 'Общая сумма (в ₽)', + SUM(wl.amount) as 'Общее количество заготовок (в шт.)' FROM waybill w JOIN (SELECT waybill_id, SUM(amount) AS amount FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id) diff --git a/App/Requests/sql/sklad_workpiece.sql b/App/Requests/sql/sklad_workpiece.sql index 14f8729..d925e29 100644 --- a/App/Requests/sql/sklad_workpiece.sql +++ b/App/Requests/sql/sklad_workpiece.sql @@ -2,7 +2,7 @@ SELECT DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', TIME_FORMAT(w.waybill_date, '%H:%i') AS 'Время поставки', s.name AS 'Поставщик', - wl.amount AS 'Количество' + wl.amount AS 'Количество (в шт.)' FROM waybill w JOIN (SELECT waybill_id, work_id, amount FROM waybill_lines) wl USING(waybill_id)