Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/methods/collection/assignCollection.js

@@ -19,8 +19,15 @@ module.exports = Self => {
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
-        const [info, info2, [{'@vCollectionFk': collectionFk}]] = await Self.rawSql(
+
-            'CALL vn.collection_getAssigned(?, @vCollectionFk);SELECT @vCollectionFk', [userId], myOptions);
+        const randStr = Math.random().toString(36).substring(3);
+        const result = await Self.rawSql(`
+            CALL vn.collection_getAssigned(?, @vCollectionFk);
+            SELECT @vCollectionFk ?
+            `, [userId, randStr], myOptions);
+
+        const collectionFk = result.find(item => item[0]?.[randStr] !== undefined)?.[0]?.[randStr];
+
         if (!collectionFk) throw new UserError('There are not picking tickets');
         await Self.rawSql('CALL vn.collection_printSticker(?, NULL)', [collectionFk], myOptions);
 

db/routines/vn/procedures/collection_getAssigned.sql

@@ -5,100 +5,139 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_getAssigne
 )
 BEGIN
 /**
- * Comprueba si existen colecciones libres que se ajustan al perfil del usuario
+ * Comprueba si existen colecciones libres que se ajustan
- * y le asigna la más antigua.
+ * al perfil del usuario y le asigna la más antigua.
- * Añade un registro al semillero de colecciones y hace la reserva para la colección
+ * Añade un registro al semillero de colecciones.
- * 
+ *
  * @param vUserFk Id de usuario
  * @param vCollectionFk Id de colección
  */
 	DECLARE vHasTooMuchCollections BOOL;
-	DECLARE vItemPackingTypeFk VARCHAR(1);
+	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWarehouseFk INT;
+	DECLARE vCollectionWorker INT;
-	DECLARE vLockName VARCHAR(215);
+	DECLARE vMaxNotAssignedCollectionLifeTime TIME;
-	DECLARE vLockTime INT DEFAULT 30;
+
+	DECLARE vCollections CURSOR FOR
+		WITH collections AS (			
+			SELECT tc.collectionFk, 
+					SUM(sv.volume) volume,
+					c.saleTotalCount,
+					c.itemPackingTypeFk,
+					c.trainFk,
+					c.warehouseFk,
+					c.wagons
+				FROM vn.ticketCollection tc
+					JOIN vn.collection c ON c.id = tc.collectionFk 
+					JOIN vn.saleVolume sv ON sv.ticketFk = tc.ticketFk
+				WHERE c.workerFk IS NULL 
+					AND sv.shipped >= util.VN_CURDATE()
+				GROUP BY tc.collectionFk
+		) SELECT c.collectionFk
+			FROM collections c
+				JOIN vn.operator o
+			WHERE o.workerFk = vUserFk
+				AND (c.saleTotalCount <= o.linesLimit OR o.linesLimit IS NULL)
+				AND (c.itemPackingTypeFk = o.itemPackingTypeFk OR o.itemPackingTypeFk IS NULL)
+				AND o.numberOfWagons = c.wagons
+				AND o.trainFk = c.trainFk
+				AND o.warehouseFk = c.warehouseFk;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+	-- Si hay colecciones sin terminar, sale del proceso
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		IF vLockName IS NOT NULL THEN
+		ROLLBACK;
-			DO RELEASE_LOCK(vLockName);
-		END IF;
-		
 		RESIGNAL;
 	END;
 
-	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
-	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0,
+	SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0, pc.maxNotAssignedCollectionLifeTime 
-			pc.collection_assign_lockname
+			INTO vHasTooMuchCollections, vMaxNotAssignedCollectionLifeTime
-		INTO vHasTooMuchCollections,
+		FROM productionConfig pc
-			vLockName
+			LEFT JOIN tmp.collection ON TRUE;
-		FROM tmp.collection c
-			JOIN productionConfig pc;
 
 	DROP TEMPORARY TABLE tmp.collection;
 
 	IF vHasTooMuchCollections THEN
-		CALL util.throw('There are pending collections');
+		CALL util.throw('Hay colecciones pendientes');
-	END IF;
-
-	SELECT warehouseFk, itemPackingTypeFk
-		INTO vWarehouseFk, vItemPackingTypeFk
-		FROM operator
-		WHERE workerFk = vUserFk;
-
-	SET vLockName = CONCAT_WS('/',
-		vLockName,
-		vWarehouseFk,
-		vItemPackingTypeFk
-	);
-
-	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas
-	INSERT INTO ticketTracking(stateFk, ticketFk)
-			SELECT s.id, tc.ticketFk
-				FROM collection c
-					JOIN ticketCollection tc ON tc.collectionFk = c.id
-					JOIN state s ON s.code = 'PRINTED_AUTO'
-					JOIN productionConfig pc 
-			WHERE c.workerFk IS NULL 
-				AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
 
-	DELETE c
+	INSERT INTO ticketTracking(stateFk, ticketFk)
-		FROM collection c
+		SELECT s.id, tc.ticketFk
-			JOIN productionConfig pc 
+			FROM `collection` c
-		WHERE c.workerFk IS NULL 
+				JOIN ticketCollection tc ON tc.collectionFk = c.id
-			AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime;
+				JOIN `state` s ON s.code = 'PRINTED_AUTO'
+			WHERE c.workerFk IS NULL 
+				AND TIMEDIFF(util.VN_NOW(), c.created) > vMaxNotAssignedCollectionLifeTime;
+
+	DELETE FROM `collection` 
+		WHERE workerFk IS NULL 
+			AND TIMEDIFF(util.VN_NOW(), created) > vMaxNotAssignedCollectionLifeTime;
 
 	-- Se añade registro al semillero
-	INSERT INTO collectionHotbed
+
-		SET userFk = vUserFk;
+	INSERT INTO collectionHotbed(userFk) VALUES(vUserFk);
 
 	-- Comprueba si hay colecciones disponibles que se ajustan a su configuracion
-	SELECT MIN(c.id) INTO vCollectionFk
+
-		FROM collection c 
+	OPEN vCollections;
-			JOIN operator o ON (o.itemPackingTypeFk = c.itemPackingTypeFk 
+	l: LOOP
-					OR c.itemPackingTypeFk IS NULL)
+		SET vDone = FALSE;
-				AND o.numberOfWagons = c.wagons
+		FETCH vCollections INTO vCollectionFk;
-				AND o.trainFk = c.trainFk
+
-				AND o.warehouseFk = c.warehouseFk
+		IF vDone THEN
-				AND c.workerFk IS NULL
+			LEAVE l;
-		WHERE o.workerFk = vUserFk;
+		END IF;
+
+		BEGIN
+			DECLARE EXIT HANDLER FOR SQLEXCEPTION
+			BEGIN
+				ROLLBACK;
+				SET vCollectionFk = NULL;
+				RESIGNAL;
+			END;
+
+			START TRANSACTION;
+
+			SELECT workerFk INTO vCollectionWorker
+				FROM `collection` 
+				WHERE id = vCollectionFk FOR UPDATE;
+
+			IF vCollectionWorker IS NULL THEN
+				UPDATE `collection`
+					SET workerFk = vUserFk
+					WHERE id = vCollectionFk;
+
+				COMMIT;
+				LEAVE l;
+			END IF;
+
+			ROLLBACK;
+		END;
+	END LOOP;
+	CLOSE vCollections;
 
 	IF vCollectionFk IS NULL THEN
 		CALL collection_new(vUserFk, vCollectionFk);
+		
+		START TRANSACTION;
+
+		SELECT workerFk INTO vCollectionWorker
+			FROM `collection` 
+			WHERE id = vCollectionFk FOR UPDATE;
+
+		IF vCollectionWorker IS NULL THEN
+			UPDATE `collection`
+				SET workerFk = vUserFk
+				WHERE id = vCollectionFk;
+		END IF;
+
+		COMMIT;
 	END IF;
-
-	UPDATE collection
-		SET workerFk = vUserFk
-		WHERE id = vCollectionFk;
-
 	CALL itemShelvingSale_addByCollection(vCollectionFk);
-	
-	DO RELEASE_LOCK(vLockName);
 END$$
 DELIMITER ;

db/versions/11289-azureAralia/00-firstScript.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE vn.sector ADD isOnReservationMode tinyint(1) DEFAULT FALSE NULL;

modules/shelving/back/models/sector.json

@@ -59,6 +59,9 @@
         "isReserve": {
             "type": "boolean",
             "required": true
+        },
+        "isOnReservationMode": {
+            "type": "boolean"
         }
     }
-}
+}

modules/worker/back/methods/device/handle-user.js

@@ -87,7 +87,7 @@ module.exports = Self => {
                 {
                     relation: 'sector',
                     scope: {
-                        fields: ['warehouseFk', 'description'],
+                        fields: ['warehouseFk', 'description', 'isOnReservationMode'],
                     }
                 }, {
                     relation: 'printer',