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-10-25 21:50:49 +03:00
parent 36688b318d
commit 3c29e51307
2 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
App/Report/sql/report1.sql Normal file
View File

@@ -0,0 +1,11 @@
SELECT sellers.name AS 'Поставщик',
w.date_of_delivery AS 'Дата поставки',
SUM(wl.count) AS 'Общее количество заготовок',
SUM(wl.price) AS 'Общая стоимость поставленных заготовок'
FROM waybill w
JOIN waybill_lines wl USING(waybill_id)
JOIN workpiece USING(work_id)
JOIN sellers USING(sel_id)
WHERE workpiece.material = '${material}'
AND (w.date_of_delivery BETWEEN '${date_from}' AND '${date_to}')
GROUP BY sellers.name, w.date_of_delivery;

43
App/Requests/requests.py
View File

@@ -14,6 +14,7 @@ requests_bp = Blueprint('requests_bp', __name__, template_folder='templates')
@requests_bp.route('/', methods=['GET', 'POST'])
@check_auth
@group_required
def requests():
if request.method == 'GET':
return render_template('zapros_menu.html', options=requests_list)
@@ -40,6 +41,25 @@ def sklad_zapros():
@requests_bp.route('/req2', methods=['GET', 'POST'])
@check_auth
@group_required
def zagotovki_ship():
if request.method == 'GET':
zagotovki = route(session['db_config'], {}, sql_provider, 'zagotovki.sql')
if zagotovki.status:
return render_template('zagotovki.html', materials=zagotovki.result, header='Поставки заготовок')
else:
return render_template('error.html', error_message=zagotovki.error_message)
else:
material = dict(request.form)
zagotovki = route(session['db_config'], material, sql_provider, 'zapros2.sql')
if zagotovki.status:
header = f'Поставки заготовок из материала \'{material['material']}\''
return render_template('output.html', items=zagotovki.result, object=header)
else:
return render_template('error.html', error_message=zagotovki.error_message)
@requests_bp.route('/req3', methods=['GET', 'POST'])
@check_auth
@group_required
def sellers_ship():
if request.method == 'GET':
zagotovki = route(session['db_config'], {}, sql_provider, 'sellers.sql')
@@ -51,28 +71,9 @@ def sellers_ship():
return render_template('error.html', error_message=zagotovki.error_message)
else:
seller = dict(request.form)
zagotovki = route(session['db_config'], seller, sql_provider, 'zapros2.sql')
zagotovki = route(session['db_config'], seller, sql_provider, 'zapros3.sql')
if zagotovki.status:
header = f'Заготовки, поставленные поставщиком \'{seller['seller']}\''
return render_template('output.html', items=zagotovki.result, object=header)
else:
return render_template('error.html', error_message=zagotovki.error_message)
@requests_bp.route('/req3', methods=['GET', 'POST'])
@check_auth
@group_required
def zagotovki_ship():
if request.method == 'GET':
zagotovki = route(session['db_config'], {}, sql_provider, 'zagotovki.sql')
if zagotovki.status:
return render_template('zagotovki.html', materials=zagotovki.result, header='Поставки заготовок')
else:
return render_template('error.html', error_message=zagotovki.error_message)
else:
material = dict(request.form)
zagotovki = route(session['db_config'], material, sql_provider, 'zapros3.sql')
if zagotovki.status:
header = f'Поставки заготовок из материала \'{material['material']}\''
header = f'Поставки от поставщика \'{seller['seller']}\''
return render_template('output.html', items=zagotovki.result, object=header)
else:
return render_template('error.html', error_message=zagotovki.error_message)