From 6c435f6bb70a38e8fe8e7b197e76e14a46fe9c17 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Wed, 11 Dec 2024 15:19:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B4=20=D0=A0=D0=9F=D0=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Requests/requests_model.py | 4 ++-- App/Requests/sql/ship_seller.sql | 1 + App/Requests/sql/sklad_material.sql | 5 +++-- App/Requests/templates/zagotovki.html | 10 +++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index bccd958..ce7c71c 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -33,9 +33,9 @@ def materials_names() -> list: def sklad(request) -> InfoRespronse: db_config = current_app.config["db_config"] - id = dict(request.form) + workpiece = dict(request.form) - _sql = sql_provider.get("sklad_material.sql", id) + _sql = sql_provider.get("sklad_material.sql", workpiece) result = select_list(db_config, _sql) return InfoRespronse(result, error_message="", status=True) diff --git a/App/Requests/sql/ship_seller.sql b/App/Requests/sql/ship_seller.sql index 11edb10..db16924 100644 --- a/App/Requests/sql/ship_seller.sql +++ b/App/Requests/sql/ship_seller.sql @@ -2,6 +2,7 @@ SELECT w.waybill_date 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) JOIN (SELECT sel_id, name FROM sellers) s USING(sel_id) diff --git a/App/Requests/sql/sklad_material.sql b/App/Requests/sql/sklad_material.sql index 645d5c8..14f8729 100644 --- a/App/Requests/sql/sklad_material.sql +++ b/App/Requests/sql/sklad_material.sql @@ -1,5 +1,6 @@ SELECT - w.waybill_date AS 'Дата поставки', + DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', + TIME_FORMAT(w.waybill_date, '%H:%i') AS 'Время поставки', s.name AS 'Поставщик', wl.amount AS 'Количество' FROM waybill w @@ -7,5 +8,5 @@ FROM waybill w JOIN (SELECT waybill_id, work_id, amount FROM waybill_lines) wl USING(waybill_id) JOIN (SELECT user_id, sel_id FROM external_users) eu USING(user_id) JOIN (SELECT sel_id, name FROM sellers) s USING(sel_id) -WHERE work_id = '$id' +WHERE work_id = '$workpiece' GROUP BY waybill_date, name; \ No newline at end of file diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html index f99600c..b6034d4 100644 --- a/App/Requests/templates/zagotovki.html +++ b/App/Requests/templates/zagotovki.html @@ -2,7 +2,7 @@ - Количество заготовок на складе + Поставки заготовок на склад
-

Количество заготовок на складе

+

Поставки заготовок на склад

@@ -32,10 +32,10 @@
- - {% for item in materials %} - + {% endfor %}