From 8ec0cf6b589aa77e20c6856e461ea628649cad92 Mon Sep 17 00:00:00 2001
From: Anton Kamalov <kamalovap@paksurion.ru>
Date: Tue, 10 Dec 2024 18:09:15 +0300
Subject: [PATCH] SQL fix

---
 .pre-commit-config.yaml              |  7 ++++++-
 App/Requests/sql/materials_names.sql |  6 +++++-
 App/Requests/sql/sklad_material.sql  | 15 +++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5f2aa90..30225de 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,4 +8,9 @@ repos:
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
-      - id: isort
\ No newline at end of file
+      - id: isort
+  - repo: https://github.com/sqlfluff/sqlfluff
+    rev: 3.3.0
+    hooks:
+      - id: sqlfluff-fix
+        args: [ --dialect=mariadb ]
\ No newline at end of file
diff --git a/App/Requests/sql/materials_names.sql b/App/Requests/sql/materials_names.sql
index e5873a7..fe16f5b 100644
--- a/App/Requests/sql/materials_names.sql
+++ b/App/Requests/sql/materials_names.sql
@@ -1 +1,5 @@
-SELECT DISTINCT material FROM workpiece;
\ No newline at end of file
+SELECT
+    work_id,
+    name,
+    material
+FROM workpiece;
diff --git a/App/Requests/sql/sklad_material.sql b/App/Requests/sql/sklad_material.sql
index 10de13c..645d5c8 100644
--- a/App/Requests/sql/sklad_material.sql
+++ b/App/Requests/sql/sklad_material.sql
@@ -1,4 +1,11 @@
-SELECT weight AS 'Вес', price AS 'Цена (в рублях)', 
-count AS 'Количество', last_update AS 'Дата последнего обновления' 
-FROM workpiece 
-WHERE material = '$material'
\ No newline at end of file
+SELECT 
+    w.waybill_date AS 'Дата поставки', 
+    s.name AS 'Поставщик', 
+    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;
\ No newline at end of file