SQL fix

.pre-commit-config.yaml

@@ -8,4 +8,9 @@ repos:
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
-      - id: isort
+      - id: isort
+  - repo: https://github.com/sqlfluff/sqlfluff
+    rev: 3.3.0
+    hooks:
+      - id: sqlfluff-fix
+        args: [ --dialect=mariadb ]

App/Requests/sql/materials_names.sql

@@ -1 +1,5 @@
-SELECT DISTINCT material FROM workpiece;
+SELECT
+    work_id,
+    name,
+    material
+FROM workpiece;

App/Requests/sql/sklad_material.sql

@@ -1,4 +1,11 @@
-SELECT weight AS 'Вес', price AS 'Цена (в рублях)', 
+SELECT 
-count AS 'Количество', last_update AS 'Дата последнего обновления' 
+    w.waybill_date AS 'Дата поставки', 
-FROM workpiece 
+    s.name AS 'Поставщик', 
-WHERE material = '$material'
+    wl.amount AS 'Количество' 
+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'
+GROUP BY waybill_date, name;