back/methods/collection/getTickets.js

@@ -57,8 +57,10 @@ module.exports = Self => {
                     ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
                     COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
                     sh.code,
-                    IFNULL(p2.code, p.code) parkingCode,
-                    IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder,
+                    p2.code parkingCode,
+                    p2.pickingOrder pickingOrder,
+                    p.code parkingCodePrevia,
+                    p.pickingOrder pickingOrderPrevia,
                     iss.id itemShelvingSaleFk,
                     iss.isPicked
                 FROM ticketCollection tc
@@ -95,8 +97,10 @@ module.exports = Self => {
                 ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY p.pickingOrder),
                 COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) ,
                 sh.code,
-                IFNULL(p2.code, p.code),
-                IFNULL(p2.pickingOrder, p.pickingOrder),
+                p2.code,
+                p2.pickingOrder,
+                p.code,
+                p.pickingOrder,
                 iss.id itemShelvingSaleFk,
                 iss.isPicked
             FROM sectorCollection sc

db/routines/vn/procedures/itemShelvingSale_reallocate.sql

@@ -1,55 +1,55 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
-	vItemShelvingFk INT(10),
-	vItemFk INT(10),
-	vSectorFk INT
-)
-BEGIN
-/**
- * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
- * 
- * @param vItemShelvingFk Id itemShelving
- * @param vItemFk Id del artículo
- * @param vSectorFk Id del sector
- */
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-		BEGIN
-			ROLLBACK;
-			RESIGNAL;
-		END;
-
-	START TRANSACTION;
-	
-	UPDATE itemShelving
-		SET visible = 0,
-			available = 0
-		WHERE id = vItemShelvingFk 
-			AND itemFk = vItemFk;	
-
-	SELECT iss.id
-			FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND iss.itemFk = vItemFk
-				AND NOT iss.isPicked
-			FOR UPDATE;
-
-	INSERT INTO itemShelvingSaleReserve (saleFk, vSectorFk)
-		SELECT DISTINCT iss.saleFk
-			FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
-
-	DELETE iss
-		FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
-	COMMIT;
-
-	CALL itemShelvingSale_doReserve();
-END$$
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
+	vItemShelvingFk INT(10),
+	vItemFk INT(10),
+	vSectorFk INT
+)
+BEGIN
+/**
+ * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
+ * 
+ * @param vItemShelvingFk Id itemShelving
+ * @param vItemFk Id del artículo
+ * @param vSectorFk Id del sector
+ */
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+		BEGIN
+			ROLLBACK;
+			RESIGNAL;
+		END;
+
+	START TRANSACTION;
+	
+	UPDATE itemShelving
+		SET visible = 0,
+			available = 0
+		WHERE id = vItemShelvingFk 
+			AND itemFk = vItemFk;	
+
+	SELECT iss.id
+			FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND ish.itemFk = vItemFk
+				AND NOT iss.isPicked
+			FOR UPDATE;
+
+	INSERT INTO itemShelvingSaleReserve (saleFk, sectorFk)
+		SELECT DISTINCT iss.saleFk, vSectorFk
+			FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND ish.itemFk = vItemFk
+				AND NOT iss.isPicked;
+
+	DELETE iss
+		FROM itemShelvingSale iss
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+				AND ish.itemFk = vItemFk
+				AND NOT iss.isPicked;
+	COMMIT;
+
+	CALL itemShelvingSale_doReserve();
+END$$
 DELIMITER ;

db/versions/11177-crimsonPaniculata/00-firstScript.sql

@@ -0,0 +1,6 @@
+-- Place your SQL code here
+
+ALTER TABLE vn.itemShelvingSaleReserve DROP FOREIGN KEY IF EXISTS  itemShelvingSaleReserve_sector_FK;
+
+ALTER TABLE vn.itemShelvingSaleReserve ADD CONSTRAINT  itemShelvingSaleReserve_sector_FK 
+	FOREIGN KEY IF NOT EXISTS (sectorFk) REFERENCES vn.sector(id) ON DELETE RESTRICT ON UPDATE CASCADE;