verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

feat: refs #6634 Modified collection-label #1932

Merged
guillermo merged 5 commits from 6634-collectionLabelPrevia into dev 2024-01-15 09:53:46 +00:00
Conversation 0 Commits 5 Files Changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a900e0fff6 - Show all commits

4
db/changes/240401/01-saleGroupDetailDefaultSize.sql
View File

@ -1,2 +1,2 @@
ALTER TABLE vn.productionConfig ADD saleGroupDetailDefaultSize int NULL COMMENT 'Altura por defecto para los artículos de previa'; ALTER TABLE vn.productionConfig ADD itemPreviousDefaultSize int NULL COMMENT 'Altura por defecto para los artículos de previa';
UPDATE IGNORE vn.productionConfig SET saleGroupDetailDefaultSize = 40 WHERE id = 1; UPDATE IGNORE vn.productionConfig SET itemPreviousDefaultSize = 40 WHERE id = 1;

2
print/templates/reports/collection-label/sql/labelsData.sql
View File

@ -8,7 +8,7 @@ SELECT c.itemPackingTypeFk code,
t.clientFk, t.clientFk,
CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume, CAST(SUM(sv.volume) AS DECIMAL(5, 2)) volume,
MAX( MAX(
IF(sgd.id, IFNULL(pc.saleGroupDetailDefaultSize, i.`size`), i.`size`) IF(sgd.id, IFNULL(pc.itemPreviousDefaultSize, i.`size`), i.`size`)
) `size`, ) `size`,
w.code workerCode, w.code workerCode,
TIME_FORMAT(t.shipped, '%H:%i') shippedHour, TIME_FORMAT(t.shipped, '%H:%i') shippedHour,