db/routines/vn/procedures/collectionPlacement_get.sql

@@ -55,24 +55,20 @@ BEGIN
 		SELECT ts.saleFk,
 				ts.itemFk,
 				CAST(0 AS DECIMAL(10,0)) saleOrder,
-				IF(ish.visible > 0 OR iss.id, 1, 100000) *
-					IFNULL(p2.pickingOrder, p.pickingOrder) `order`,
-				TO_SECONDS(IF(iss.id,
-					iss.created - INTERVAL vCurrentYear YEAR,
-					ish.created - INTERVAL YEAR(ish.created) YEAR)) priority,
+				(IF(ish.visible > 0 OR iss.id, 1, 100000) *
+				COALESCE(p2.pickingOrder, p.pickingOrder)) `order`,
+				TO_SECONDS(COALESCE(iss.created, ish.created)) - TO_SECONDS(MAKEDATE(IFNULL(YEAR(iss.created), YEAR(ish.created)), 1)) priority,
 				CONCAT(
-					IF(iss.id,
-						CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
-						''),
-					p.`code`) COLLATE utf8_general_ci placement,
+				IF(iss.id, CONCAT('< ', COALESCE(wk.`code`, '---'),' > '), ''),
+				p.`code`
+				) COLLATE utf8_general_ci placement,
 				sh.priority shelvingPriority,
 				sh.code COLLATE utf8_general_ci shelving,
 				ish.created,
 				ish.visible,
-				IFNULL(
-					IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
-					1) `grouping`,
-				st.code = 'previousPrepared' isPreviousPrepared,
+				COALESCE(
+				IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),1) `grouping`,
+				(st.code = 'previousPrepared') isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
@@ -80,11 +76,12 @@ BEGIN
 				iss.userFk,
 				ts.quantity
 			FROM tSale ts
-				LEFT JOIN (SELECT DISTINCT saleFk
-								FROM saleTracking st
-									JOIN state s ON s.id = st.stateFk
-								WHERE st.isChecked
-									AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+				LEFT JOIN (SELECT st.saleFk
+							FROM saleTracking st
+								JOIN state s ON s.id = st.stateFk
+							WHERE st.isChecked
+								AND s.semaphore = 1
+							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
@@ -93,14 +90,14 @@ BEGIN
 				JOIN warehouse w ON w.id = sc.warehouseFk
 				LEFT JOIN tGrouping g ON g.itemFk = ts.itemFk
 				LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
-					AND iss.itemShelvingFk = ish.id
+				   AND iss.itemShelvingFk = ish.id
 				LEFT JOIN worker wk ON wk.id = iss.userFk
 				LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = ts.saleFk
 				LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
-				AND NOT sc.isHideForPickers
-			HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL;
+					AND NOT sc.isHideForPickers
+					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL);
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))