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

Merge pull request 'feat: refs #8213 refs#8213 picker ItemShelvingSale' (!3242) from 8213-itemShelvingSalePicker into test
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3242
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
This commit is contained in:
Sergio De la torre 2024-11-25 15:22:55 +00:00
parent 7cf6acec19 f6941928cd
commit b0b64b2630
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/methods/collection/getTickets.js
View File

@ -63,7 +63,8 @@ module.exports = Self => {
p.pickingOrder pickingOrder,
iss.id itemShelvingSaleFk,
iss.isPicked,
iss.itemShelvingFk
iss.itemShelvingFk,
st.code stateCode
FROM ticketCollection tc
LEFT JOIN collection c ON c.id = tc.collectionFk
JOIN sale s ON s.ticketFk = tc.ticketFk
@ -77,6 +78,7 @@ module.exports = Self => {
LEFT JOIN parking p ON p.id = sh.parkingFk
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
LEFT JOIN origin o ON o.id = i.originFk
LEFT JOIN state st ON st.id = sg.stateFk
WHERE tc.collectionFk = ?
GROUP BY s.id, ish.id, p.code, p2.code
UNION ALL
@ -104,7 +106,8 @@ module.exports = Self => {
p.pickingOrder,
iss.id itemShelvingSaleFk,
iss.isPicked,
iss.itemShelvingFk
iss.itemShelvingFk,
st.code stateCode
FROM sectorCollection sc
JOIN sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id
JOIN saleGroup sg ON sg.id = ss.saleGroupFk
@ -118,6 +121,7 @@ module.exports = Self => {
LEFT JOIN parking p ON p.id = sh.parkingFk
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
LEFT JOIN origin o ON o.id = i.originFk
LEFT JOIN state st ON st.id = sg.stateFk
WHERE sc.id = ?
AND sgd.saleGroupFk
GROUP BY s.id, ish.id, p.code, p2.code`, [id, id], myOptions);

4
db/versions/11362-limeLilium/00-firstScript.sql Normal file
View File

@ -0,0 +1,4 @@
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES('SaleGroup', 'find', 'READ', 'ALLOW', 'ROLE', 'production');

7
modules/ticket/back/models/saleGroup.json
View File

@ -29,6 +29,11 @@
"type": "belongsTo",
"model": "Parking",
"foreignKey": "parkingFk"
},
"state": {
"type": "belongsTo",
"model": "State",
"foreignKey": "stateFk"
}
}
}
}