From 13efda0c2a55caca8585421590c08682e574307a Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Tue, 10 Dec 2024 00:01:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2?= 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_material.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 e0c182c..11edb10 100644 --- a/App/Requests/sql/ship_seller.sql +++ b/App/Requests/sql/ship_seller.sql @@ -1,6 +1,6 @@ SELECT w.waybill_date 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) JOIN (SELECT user_id, sel_id FROM external_users) eu USING(user_id) diff --git a/App/Requests/sql/sklad_material.sql b/App/Requests/sql/sklad_material.sql index 2a154a5..10de13c 100644 --- a/App/Requests/sql/sklad_material.sql +++ b/App/Requests/sql/sklad_material.sql @@ -1,4 +1,4 @@ -SELECT weight AS 'Вес', price AS 'Цена', +SELECT weight AS 'Вес', price AS 'Цена (в рублях)', count AS 'Количество', last_update AS 'Дата последнего обновления' FROM workpiece WHERE material = '$material' \ No newline at end of file