ParkSuMin/RIS
Archived
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Корректировка запросов

Browse Source
This commit is contained in:
Anton Kamalov
2024-12-04 13:00:52 +03:00
parent 8caa72d2fd
commit 08029a9883
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App/Requests/__init__.py
View File

@@ -23,6 +23,7 @@ def sklad_zapros():
else: else:
zagotovki = sklad(request) zagotovki = sklad(request)
if zagotovki.status: if zagotovki.status:
material = dict(request.form)
header = f'Заготовки на складе из материала \"{material["material"]}\"' header = f'Заготовки на складе из материала \"{material["material"]}\"'
return render_template('output.html', items=zagotovki.result, header=header) return render_template('output.html', items=zagotovki.result, header=header)
else: else:
@@ -36,6 +37,7 @@ def sellers_ship():
else: else:
zagotovki = materials_per_seller(request) zagotovki = materials_per_seller(request)
if zagotovki.status: if zagotovki.status:
seller = dict(request.form)
header = f'Поставки от поставщика \"{seller["seller"]}\"' header = f'Поставки от поставщика \"{seller["seller"]}\"'
return render_template('output.html', items=zagotovki.result, header=header, link=url_for('requests_bp.requests')) return render_template('output.html', items=zagotovki.result, header=header, link=url_for('requests_bp.requests'))
else: else:

15
App/Requests/sql/ship_seller.sql
View File

@@ -1,8 +1,9 @@
SELECT w.date_of_delivery AS 'Дата поставки', SELECT w.waybill_date AS 'Дата поставки',
SUM(w.sum) AS 'Общая сумма', SUM(w.total) AS 'Общая сумма',
SUM(wl.cnt) as 'Количество' SUM(wl.amount) as 'Количество'
FROM waybill w FROM waybill w
JOIN (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id) JOIN (SELECT waybill_id, SUM(amount) AS amount FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id)
JOIN sellers USING(sel_id) JOIN (SELECT user_id, sel_id FROM external_users) eu USING(user_id)
WHERE sellers.name = '${seller}' JOIN (SELECT sel_id, name FROM sellers) s USING(sel_id)
GROUP BY date_of_delivery WHERE s.name = '$seller'
GROUP BY waybill_date

2
App/Requests/sql/sklad_material.sql
View File

@@ -1,4 +1,4 @@
SELECT weight AS 'Вес', price AS 'Цена', SELECT weight AS 'Вес', price AS 'Цена',
count AS 'Количество', last_update AS 'Дата последнего обновления' count AS 'Количество', last_update AS 'Дата последнего обновления'
FROM workpiece FROM workpiece
WHERE material = '${material}' WHERE material = '$material'