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-12 21:22:54 +03:00
parent 7fb67f0270
commit 7e46ccd589
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
SELECT DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', SELECT DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки',
TIME_FORMAT(w.waybill_date, '%H:%i') AS 'Время поставки', TIME_FORMAT(w.waybill_date, '%H:%i') 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)

2
App/Requests/sql/sklad_workpiece.sql
View File

@@ -2,7 +2,7 @@ SELECT
DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки', DATE_FORMAT(w.waybill_date, '%Y-%m-%d') AS 'Дата поставки',
TIME_FORMAT(w.waybill_date, '%H:%i') 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
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)