7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit b86110c898 - Show all commits

View File

@ -46,7 +46,7 @@ module.exports = Self => {
const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)', const [sales] = await Self.rawSql('CALL vn.sale_getFromTicketOrCollection(?)',
[id], myOptions); [id], myOptions);
const isPicker = source == 'CHECKER'; const isPicker = source != 'CHECKER';
const [placements] = await Self.rawSql('CALL vn.collectionPlacement_get(?, ?)', const [placements] = await Self.rawSql('CALL vn.collectionPlacement_get(?, ?)',
[id, isPicker], myOptions [id, isPicker], myOptions
); );

View File

@ -52,7 +52,9 @@ module.exports = Self => {
return { return {
id: itemShelving.id, id: itemShelving.id,
itemFk: itemShelving.itemFk, itemFk: itemShelving.itemFk,
longName: item ? item.longName || `${item.name} ${item.size}` : '', name: item.name,
size: item.size,
longName: item.longName,
quantity: itemShelving.visible, quantity: itemShelving.visible,
carros carros
}; };