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

refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Guillermo Bonet 2022-12-14 16:15:41 +01:00
parent b7a369a41c
commit 76001ec022
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ticket/back/methods/ticket/collectionLabel.js
View File

@ -14,7 +14,7 @@ module.exports = Self => {
}, { }, {
arg: 'labelCount', arg: 'labelCount',
type: 'number', type: 'number',
required: true, required: false,
description: 'The number of labels' description: 'The number of labels'
} }
], ],

2
print/templates/reports/collection-label/collection-label.html
View File

@ -15,7 +15,7 @@
<td id="outline" class="ellipsize">{{labelData.workerCode || '---'}}</td> <td id="outline" class="ellipsize">{{labelData.workerCode || '---'}}</td>
</tr> </tr>
<tr> <tr>
<td id="outline" class="ellipsize">{{labelCount || 0}}</td> <td id="outline" class="ellipsize">{{labelCount || labelData.labelCount || 0}}</td>
</tr> </tr>
<tr> <tr>
<td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td> <td id="outline" class="ellipsize">{{labelData.code == 'V' ? (labelData.size || 0) + 'cm' : (labelData.volume || 0) + 'm³'}}</td>

2
print/templates/reports/collection-label/collection-label.js
View File

@ -14,7 +14,7 @@ module.exports = {
}, },
labelCount: { labelCount: {
type: Number, type: Number,
required: true, required: false,
description: 'The number of labels' description: 'The number of labels'
} }
}, },

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

@ -12,6 +12,7 @@ SELECT c.itemPackingTypeFk code,
TIME_FORMAT(t.shipped, '%H:%i') shippedHour, TIME_FORMAT(t.shipped, '%H:%i') shippedHour,
TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour, TIME_FORMAT(zo.`hour`, '%H:%i') zoneHour,
DATE_FORMAT(t.shipped, '%d/%m/%y') shipped, DATE_FORMAT(t.shipped, '%d/%m/%y') shipped,
tt.labelCount,
t.nickName, t.nickName,
COUNT(*) lineCount COUNT(*) lineCount
FROM vn.ticket t FROM vn.ticket t