From f708df717c1c72c5dfafa39d6ff8e0b4b7d0b919 Mon Sep 17 00:00:00 2001
From: Anton Kamalov <kamalov.anton@csoftcom.com>
Date: Thu, 24 Oct 2024 23:34:57 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=BC=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Requests/sql/zapros2.sql | 14 +++++++-------
 App/Requests/sql/zapros3.sql | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/App/Requests/sql/zapros2.sql b/App/Requests/sql/zapros2.sql
index 7336117..21d1431 100644
--- a/App/Requests/sql/zapros2.sql
+++ b/App/Requests/sql/zapros2.sql
@@ -1,9 +1,9 @@
-SELECT w.date_of_delivery AS 'Дата поставки',
-       SUM(w.sum) AS 'Общая сумма',
-       SUM(wl.cnt) as 'Количество' 
+SELECT w.date_of_delivery AS 'Дата поставки', 
+	   name AS 'Поставщик',
+       wl.count AS 'Количество', 
+       wl.price * wl.count AS 'Общая сумма'
 FROM waybill w
-JOIN (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id)
+JOIN waybill_lines wl USING(waybill_id)
+JOIN workpiece wp USING(work_id)
 JOIN sellers USING(sel_id)
-WHERE sellers.name = '${seller}'
-AND YEAR(date_of_delivery) = '${date}'
-GROUP BY date_of_delivery
\ No newline at end of file
+WHERE material = '${material}';
\ No newline at end of file
diff --git a/App/Requests/sql/zapros3.sql b/App/Requests/sql/zapros3.sql
index 21d1431..7336117 100644
--- a/App/Requests/sql/zapros3.sql
+++ b/App/Requests/sql/zapros3.sql
@@ -1,9 +1,9 @@
-SELECT w.date_of_delivery AS 'Дата поставки', 
-	   name AS 'Поставщик',
-       wl.count AS 'Количество', 
-       wl.price * wl.count AS 'Общая сумма'
+SELECT w.date_of_delivery AS 'Дата поставки',
+       SUM(w.sum) AS 'Общая сумма',
+       SUM(wl.cnt) as 'Количество' 
 FROM waybill w
-JOIN waybill_lines wl USING(waybill_id)
-JOIN workpiece wp USING(work_id)
+JOIN (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id)
 JOIN sellers USING(sel_id)
-WHERE material = '${material}';
\ No newline at end of file
+WHERE sellers.name = '${seller}'
+AND YEAR(date_of_delivery) = '${date}'
+GROUP BY date_of_delivery
\ No newline at end of file