7658-devToTest_2428 #2663

Merged
alexm merged 251 commits from 7658-devToTest_2428 into test 2024-07-02 07:20:13 +00:00
1 changed files with 8 additions and 17 deletions
Showing only changes of commit 1140e6bbd3 - Show all commits

View File

@ -13,25 +13,16 @@ BEGIN
*/
DECLARE vQuery TEXT;
SET vQuery = '
SELECT isl.itemShelvingFk,
isl.created,
isl.accion,
isl.itemFk,
SELECT isl.itemFk,
i.longName,
isl.shelvingFk,
w.code,
isl.accion,
isl.quantity,
isl.visible,
isl.available,
isl.`grouping`,
isl.packing,
isl.stars,
item.longName,
item.size,
item.subName,
worker.code,
isl.accion
FROM item
JOIN itemShelvingLog isl ON item.id = isl.itemFk
JOIN worker ON isl.workerFk = worker.id
isl.created
FROM item i
JOIN itemShelvingLog isl ON i.id = isl.itemFk
JOIN worker w ON isl.workerFk = w.id
WHERE shelvingFk = ?
OR isl.itemFk = ?
ORDER BY isl.created DESC';