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

db/dump/fixtures.after.sql

@@ -73,9 +73,10 @@ INSERT INTO vn.cmr (id, truckPlate, observations, senderInstruccions, paymentIns
 
 UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');
 
-INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `warehouseAliasFk`, `isOwn`, `isAnyVolumeAllowed`) VALUES
+INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) 
-    ('Agencia', '1', '1', '1', '1'),
+    VALUES
-    ('Otra agencia ', '1', '2', '0', '0');
+    ('Agencia', '1', '1', '1'),
+    ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
     ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),

db/dump/fixtures.before.sql

@@ -174,20 +174,15 @@ INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`,
         (19,'Francia',  1, 'FR', 1, 27, 4, 0, 1),
         (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);
 
-INSERT INTO `vn`.`warehouseAlias`(`id`, `name`)
+INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
     VALUES
-        (1, 'Main Warehouse'),
+        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
-        (2, 'Gotham');
+        (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 13,  1, 1, 0),
-
+        (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
-INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `aliasFk`, `countryFk`, `hasProduction`)
+        (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
-    VALUES
+        (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
-        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 2, 1,   1),
+        (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
-        (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 2, 13,  1),
+        (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);
-        (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 2, 1,   0),
-        (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
 
 INSERT INTO `vn`.`sectorType` (id,description)
 	VALUES (1,'First type');
@@ -271,18 +266,18 @@ INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
         (3, 'PICKUP', 'Recogida'),
         (4, 'OTHER', 'Otros');
 
-INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `warehouseAliasFk`)
+INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`)
     VALUES
-        (1,     'inhouse pickup'        ,   1, 1),
+        (1,     'inhouse pickup'        ,   1),
-        (2,     'Super-Man delivery'    ,   1, 1),
+        (2,     'Super-Man delivery'    ,   1),
-        (3,     'Teleportation device'  ,   1, 1),
+        (3,     'Teleportation device'  ,   1),
-        (4,     'Entanglement'          ,   1, 1),
+        (4,     'Entanglement'          ,   1),
-        (5,     'Quantum break device'  ,   1, 1),
+        (5,     'Quantum break device'  ,   1),
-        (6,     'Walking'               ,   1, 1),
+        (6,     'Walking'               ,   1),
-        (7,     'Gotham247'             ,   1, 1),
+        (7,     'Gotham247'             ,   1),
-        (8,     'Gotham247Expensive'    ,   1, 1),
+        (8,     'Gotham247Expensive'    ,   1),
-        (9,     'Refund'                ,   1, 1),
+        (9,     'Refund'                ,   1),
-        (10,    'Other agency'          ,   1, 1);
+        (10,    'Other agency'          ,   1);
 
 UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
 UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';

db/routines/vn/procedures/fustControl.sql

@@ -1,79 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControl`(vFromDated DATE, vToDated DATE)
-BEGIN
-	
-	DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
-	DECLARE vDateStart DATETIME;
-	DECLARE vDateEnd DATETIME;
-
-	SET vDateStart = vFromDated;
-	SET vDateEnd = util.Dayend(vToDated);
-
-	SELECT p.id FustCode, 
-			CAST(sent.stucks AS DECIMAL(10,0)) FH, 
-			CAST(tp.stucks AS DECIMAL(10,0)) Tickets, 
-			CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner, 
-			CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
-		FROM vn.packaging p
-		LEFT JOIN (
-			SELECT FustCode, sum(fustQuantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,b.packagingFk) FustCode, s.quantity / b.packing AS fustQuantity
-					FROM vn.sale s 
-						JOIN vn.ticket t ON t.id = s.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk 
-						JOIN vn.buy b ON b.id = lb.buy_id 
-						JOIN vn.packaging p ON p.id = b.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk 
-						JOIN vn.province p2 ON p2.id = a.provinceFk 
-						JOIN vn.country c ON c.id = p2.countryFk 
-					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND c.country = 'FRANCIA') sub 
-					GROUP BY FustCode) sent ON sent.FustCode = p.id
-		LEFT JOIN (
-			SELECT FustCode, sum(quantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp 
-						JOIN vn.ticket t ON t.id = tp.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN vn.packaging p ON p.id = tp.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk 
-						JOIN vn.province p2 ON p2.id = a.provinceFk 
-						JOIN vn.country c ON c.id = p2.countryFk 
-					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND c.country = 'FRANCIA'
-						AND t.clientFk != vSijsnerClientFk
-						AND tp.quantity > 0) sub 
-					GROUP BY FustCode) tp ON tp.FustCode = p.id
-		LEFT JOIN (
-			SELECT FustCode, sum(quantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp 
-						JOIN vn.ticket t ON t.id = tp.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN vn.packaging p ON p.id = tp.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-					WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND t.clientFk = vSijsnerClientFk) sub 
-					GROUP BY FustCode) sj ON sj.FustCode = p.id
-		WHERE sent.stucks 
-			OR tp.stucks
-			OR sj.stucks;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/fustControlDetail.sql

@@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControlDetail`(vFromDated DATE, vToDated DATE)
-BEGIN
-	
-	DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
-	DECLARE vDateStart DATETIME;
-	DECLARE vDateEnd DATETIME;
-
-	SET vDateStart = vFromDated;
-	SET vDateEnd = util.Dayend(vToDated);
-	
-	SELECT a.nickname shopName,
-			a.city , 
-			IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, 
-			tp.quantity,
-			tp.ticketFk,
-			CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
-				FROM vn.ticketPackaging tp 
-					JOIN vn.ticket t ON t.id = tp.ticketFk 
-					JOIN vn.warehouse w ON w.id = t.warehouseFk 
-					JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-					JOIN vn.packaging p ON p.id = tp.packagingFk 
-					LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-					JOIN vn.address a ON a.id = t.addressFk 
-					JOIN vn.province p2 ON p2.id = a.provinceFk 
-					JOIN vn.country c ON c.id = p2.countryFk 
-				WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
-					AND wa.name = 'VNH'
-					AND p.isPackageReturnable 
-					AND c.country = 'FRANCIA'
-					AND t.clientFk != vSijsnerClientFk
-					AND tp.quantity > 0;
-				
-END$$
-DELIMITER ;

db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql

@@ -8,27 +8,22 @@ BEGIN
  * @param vItemFk Identificador de vn.item
  * @param vSectorFk Identificador de vn.sector
  */
-	DECLARE vWarehouseAliasFk INT;
-
-	SELECT w.aliasFk INTO vWarehouseAliasFk
-		FROM vn.sector s
-		JOIN vn.warehouse w ON w.id = s.warehouseFk
-		WHERE s.id = vSectorFk;
-
 	SELECT ish.shelvingFk shelving,
-		p.code parking,
+			p.code parking,
-		sum(ish.visible) as stockTotal,
+			SUM(ish.visible) stockTotal,
-		ish.created,
+			ish.created,
-		p.pickingOrder
+			p.pickingOrder
 		FROM vn.itemShelving ish
 			JOIN vn.shelving sh ON sh.code = ish.shelvingFk
 			JOIN vn.parking p ON p.id = sh.parkingFk
 			JOIN vn.sector sc ON sc.id = p.sectorFk
 			JOIN vn.warehouse w ON w.id = sc.warehouseFk
-			WHERE w.aliasFk = vWarehouseAliasFk
+		WHERE sc.id = vSectorFk
-				AND ish.visible > 0
+			AND ish.visible > 0
-				AND ish.itemFk = vItemFk
+			AND ish.itemFk = vItemFk
 		GROUP BY ish.id
-		ORDER BY (sc.id = vSectorFk) DESC, sh.priority DESC, ish.created, p.pickingOrder;
+		ORDER BY sh.priority DESC,
+			ish.created, 
+			p.pickingOrder;
 END$$
-DELIMITER ;
+DELIMITER ;

db/routines/vn/triggers/warehouse_afterUpdate.sql

@@ -1,12 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`warehouse_afterUpdate`
-	AFTER UPDATE ON `warehouse`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isFeedStock IS TRUE AND OLD.isFeedStock IS FALSE THEN
-		INSERT IGNORE INTO warehouseAlias(`name`) VALUES(NEW.`name`);
-		INSERT IGNORE INTO warehouseJoined(warehouseFk, warehouseAliasFk)
-			VALUES(NEW.id,LAST_INSERT_ID());
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/views/warehouseJoined.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`warehouseJoined`
-AS SELECT `wj`.`warehouse_id` AS `warehouseFk`,
-	`wj`.`warehouse_alias_id` AS `warehouseAliasFk`
-FROM `vn2008`.`warehouse_joined` `wj`

db/routines/vn/views/zoneEstimatedDelivery.sql

@@ -14,7 +14,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 		JOIN saleVolume sv ON sv.ticketFk = t.id
 		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
 		JOIN warehouse w ON w.id = t.warehouseFk
-		JOIN warehouseAlias wa ON wa.id = w.aliasFk
 		STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
 		LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
 			AND zc.dated = util.VN_CURDATE()

db/routines/vn2008/procedures/desglose_volume.sql

@@ -1,82 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`desglose_volume`(IN vAgencyFk INT)
-BEGIN
-	
-    DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
-    DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
-    DECLARE vIsHolland BOOL;
-    
-   	SELECT (wa.name = 'Holanda') INTO vIsHolland
-   		FROM vn.agency a 
-   			JOIN vn.warehouseAlias wa ON wa.id = a.warehouseAliasFk 
-   			WHERE a.id = vAgencyFk;
-	
-   	IF vIsHolland THEN
-   	
-   		DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-		CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-		(
-	         ticketFk INT PRIMARY KEY
-	        ,carros DECIMAL(5,1) DEFAULT 0
-	    );
-   	
-   		INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, carros)
-		SELECT sv.ticketFk, ROUND(vc.dutchCompressionRate * sum(sv.volume) / vc.trolleyM3,0)
-			FROM vn.ticket t
-	        JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-	        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-	        JOIN vn.volumeConfig vc
-	            WHERE t.shipped BETWEEN vStarted AND vEnded
-	            AND am.agencyFk = vAgencyFk
-	            GROUP BY t.id;
-	           
-	    SELECT 	a.nickname Provincia, 
-				count(*) expediciones, 
-				0 Bultos, 
-				sum(tpe.carros) Prevision
-	        FROM vn.ticket t
-	        	JOIN vn.address a ON a.id = t.addressFk 
-		        JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-	        GROUP BY a.nickname;
-   	
-   	ELSE
-   	
-   		DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-		CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-		(
-	         ticketFk INT PRIMARY KEY
-	        ,boxes INT DEFAULT 0
-	    );
-   	
-		INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
-		SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
-			FROM vn.ticket t
-	        JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-	        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-	        JOIN vn.volumeConfig vc
-	            WHERE t.shipped BETWEEN vStarted AND vEnded
-	            AND IFNULL(t.packages,0) = 0
-	            AND am.agencyFk = vAgencyFk
-	            GROUP BY t.id;
-		
-		
-		SELECT 	p.name Provincia, 
-				count(*) expediciones, 
-				sum(t.packages) Bultos, 
-				sum(tpe.boxes) Prevision
-	        FROM vn.ticket t
-		        JOIN vn.address a ON a.id = t.addressFk 
-		        JOIN vn.province p ON a.provinceFk = p.id
-		        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-		        JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-		    WHERE t.warehouseFk = 60
-	            AND t.shipped BETWEEN vStarted AND vEnded
-	            AND am.agencyFk = vAgencyFk
-	        GROUP BY p.name;
-	       
-	 END IF;
-           SELECT * FROM tmp.ticket_PackagingEstimated;
-     DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
-
-END$$
-DELIMITER ;

db/routines/vn2008/views/agency.sql

@@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `a`.`id` AS `agency_id`,
 	`a`.`name` AS `name`,
 	`a`.`warehouseFk` AS `warehouse_id`,
-	`a`.`warehouseAliasFk` AS `warehouse_alias_id`,
 	`a`.`isOwn` AS `propios`,
 	`a`.`workCenterFk` AS `workCenterFk`
 FROM `vn`.`agency` `a`

db/versions/10857-navyArborvitae/00-firstScript.sql

@@ -0,0 +1,8 @@
+ALTER TABLE vn.agency 
+	CHANGE warehouseAliasFk warehouseAliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+ALTER TABLE vn.warehouse 
+	CHANGE aliasFk aliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+RENAME TABLE vn.warehouseAlias TO vn.warehouseAlias__;
+ALTER TABLE vn.warehouseAlias__ COMMENT='@deprecated 2024-01-23 refs #5167';