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-11 15:19:27 +03:00
parent fe2b1fd014
commit 6c435f6bb7
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App/Requests/requests_model.py
View File

@@ -33,9 +33,9 @@ def materials_names() -> list:
def sklad(request) -> InfoRespronse: def sklad(request) -> InfoRespronse:
db_config = current_app.config["db_config"] 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) result = select_list(db_config, _sql)
return InfoRespronse(result, error_message="", status=True) return InfoRespronse(result, error_message="", status=True)

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

@@ -2,6 +2,7 @@ SELECT w.waybill_date AS 'Дата поставки',
SUM(w.total) AS 'Общая сумма (в рублях)', SUM(w.total) AS 'Общая сумма (в рублях)',
SUM(wl.amount) as 'Общее количество заготовок' SUM(wl.amount) as 'Общее количество заготовок'
FROM waybill w 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 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 user_id, sel_id FROM external_users) eu USING(user_id)
JOIN (SELECT sel_id, name FROM sellers) s USING(sel_id) JOIN (SELECT sel_id, name FROM sellers) s USING(sel_id)

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

@@ -1,5 +1,6 @@
SELECT 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 'Поставщик', s.name AS 'Поставщик',
wl.amount AS 'Количество' wl.amount AS 'Количество'
FROM waybill w 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 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 user_id, sel_id FROM external_users) eu USING(user_id)
JOIN (SELECT sel_id, name FROM sellers) s USING(sel_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; GROUP BY waybill_date, name;

10
App/Requests/templates/zagotovki.html
View File

@@ -2,7 +2,7 @@
<html lang="ru" data-bs-theme="dark"> <html lang="ru" data-bs-theme="dark">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Количество заготовок на складе</title> <title>Поставки заготовок на склад</title>
<link href="/static/css/main.css" type="text/css" rel="stylesheet"> <link href="/static/css/main.css" type="text/css" rel="stylesheet">
<link <link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
@@ -20,7 +20,7 @@
<div class="row flex-nowrap justify-content-between pb-5"> <div class="row flex-nowrap justify-content-between pb-5">
<div class="col-1 pt-1"></div> <div class="col-1 pt-1"></div>
<div class="col-10 text-center"> <div class="col-10 text-center">
<h1 class="display-5 fw-bold">Количество заготовок на складе</h1> <h1 class="display-5 fw-bold">Поставки заготовок на склад</h1>
</div> </div>
<div class="col-1 d-flex justify-content-end align-items-center"> <div class="col-1 d-flex justify-content-end align-items-center">
<a href="{{ url_for('logout') }}"><button class="btn btn-danger">Выход</button></a> <a href="{{ url_for('logout') }}"><button class="btn btn-danger">Выход</button></a>
@@ -32,10 +32,10 @@
<main class="flex-shrink-0"> <main class="flex-shrink-0">
<div class="form py-5"> <div class="form py-5">
<form action="" method="post" style="display: inline-block;"> <form action="" method="post" style="display: inline-block;">
<label>Выберите материал</label> <label>Выберите заготовку</label>
<select class="form-select" name="id"> <select class="form-select" name="workpiece">
{% for item in materials %} {% for item in materials %}
<option value="{{ item["work_id"] }}">{{ item["name"] }}</option> <option value="{{ item["work_id"] }}">{{ item["name"] }} - {{ item["material"] }}</option>
{% endfor %} {% endfor %}
</select> </select>
<button type="submit" class="btn btn-primary">Отправить</button> <button type="submit" class="btn btn-primary">Отправить</button>