diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py index 74fc5be..f40799e 100644 --- a/App/Requests/__init__.py +++ b/App/Requests/__init__.py @@ -23,6 +23,7 @@ def sklad_zapros(): else: zagotovki = sklad(request) if zagotovki.status: + material = dict(request.form) header = f'Заготовки на складе из материала \"{material["material"]}\"' return render_template('output.html', items=zagotovki.result, header=header) else: @@ -36,6 +37,7 @@ def sellers_ship(): else: zagotovki = materials_per_seller(request) if zagotovki.status: + seller = dict(request.form) header = f'Поставки от поставщика \"{seller["seller"]}\"' return render_template('output.html', items=zagotovki.result, header=header, link=url_for('requests_bp.requests')) else: diff --git a/App/Requests/sql/ship_seller.sql b/App/Requests/sql/ship_seller.sql index 582b34f..e0c182c 100644 --- a/App/Requests/sql/ship_seller.sql +++ b/App/Requests/sql/ship_seller.sql @@ -1,8 +1,9 @@ -SELECT w.date_of_delivery AS 'Дата поставки', - SUM(w.sum) AS 'Общая сумма', - SUM(wl.cnt) as 'Количество' +SELECT w.waybill_date AS 'Дата поставки', + SUM(w.total) AS 'Общая сумма', + SUM(wl.amount) as 'Количество' FROM waybill w -JOIN (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id) -JOIN sellers USING(sel_id) -WHERE sellers.name = '${seller}' -GROUP BY date_of_delivery \ No newline at end of file +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) +WHERE s.name = '$seller' +GROUP BY waybill_date \ No newline at end of file diff --git a/App/Requests/sql/sklad_material.sql b/App/Requests/sql/sklad_material.sql index e377fb5..2a154a5 100644 --- a/App/Requests/sql/sklad_material.sql +++ b/App/Requests/sql/sklad_material.sql @@ -1,4 +1,4 @@ SELECT weight AS 'Вес', price AS 'Цена', count AS 'Количество', last_update AS 'Дата последнего обновления' FROM workpiece -WHERE material = '${material}' \ No newline at end of file +WHERE material = '$material' \ No newline at end of file