From 7e46ccd589e02da0e06b6602d5aad2d88f82b3ef Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Thu, 12 Dec 2024 21:22:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Requests/sql/ship_seller.sql | 4 ++-- App/Requests/sql/sklad_workpiece.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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)