Compare commits

..

No commits in common. "940bc8caed34b3152d711c62f6fea25216888fee" and "16111220fbdf5ff21fb95718efe45352152c4eae" have entirely different histories.

2 changed files with 3 additions and 5 deletions

View File

@ -48,7 +48,7 @@ BEGIN
iss.itemShelvingFk, iss.itemShelvingFk,
SUM(IFNULL(iss.quantity,0)), SUM(IFNULL(iss.quantity,0)),
IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'), IF(sgd.id, 'PREVIOUS_PREPARATION', 'PREPARED'),
sh.code ish.shelvingFk
INTO vItemFk, INTO vItemFk,
vSaleFk, vSaleFk,
vItemShelvingFk, vItemShelvingFk,
@ -58,8 +58,7 @@ BEGIN
FROM itemShelvingSale iss FROM itemShelvingSale iss
JOIN sale s ON s.id = iss.saleFk JOIN sale s ON s.id = iss.saleFk
JOIN itemShelving ish ON ish.id = iss.itemShelvingFk JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = iss.saleFk LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = iss.saleFk
LEFT JOIN shelving sh ON sh.id = ish.shelvingFk
WHERE iss.id = vItemShelvingSaleFk WHERE iss.id = vItemShelvingSaleFk
AND NOT iss.isPicked; AND NOT iss.isPicked;

View File

@ -21,8 +21,7 @@ BEGIN
ish.isChecked, ish.isChecked,
ic.url, ic.url,
ish.available, ish.available,
ish.buyFk, ish.buyFk
sh.shelvingFk
FROM itemShelving ish FROM itemShelving ish
JOIN item i ON i.id = ish.itemFk JOIN item i ON i.id = ish.itemFk
JOIN shelving s ON s.id = ish.shelvingFk JOIN shelving s ON s.id = ish.shelvingFk