verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

WIP: refactor: refs #8172 Created table parkingCoordinates #3320

Draft
guillermo wants to merge 2 commits from 8172-parkingCoordinates into dev
pull from: 8172-parkingCoordinates
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 3 +2437 -2412
2 changed files with 2437 additions and 2412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6300795e52 - Show all commits

24
db/dump/fixtures.before.sql
View File

@ -214,15 +214,15 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone
(1109, 'HLK', 'Bruce' , 'Banner', 19, 432978109), (1109, 'HLK', 'Bruce' , 'Banner', 19, 432978109),
(1110, 'JJJ', 'Jessica' , 'Jones' , 19, 432978110); (1110, 'JJJ', 'Jessica' , 'Jones' , 19, 432978110);
INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`) INSERT INTO `vn`.`parking` (`id`, `sectorFk`, `code`, `pickingOrder`)
VALUES VALUES
('1', 700, '01', 1, '700-01', 70001), ('1', 1, '700-01', 70001),
('2', 700, '02', 2, '700-02', 70002), ('2', 2, '700-02', 70002),
('3', 100, '01', 1, '100-01', 1), ('3', 1, '100-01', 1),
(32397, 100, '02', 1, 'A-47-1', 1165), (32397, 1, 'A-47-1', 1165),
(34831, 200, '01', 1, 'K-26-2', 20220), (34831, 1, 'K-26-2', 20220),
(34965, 200, '02', 2, 'L-08-4', 21800), (34965, 2, 'L-08-4', 21800),
(39096, 200, '03', 2, 'LR-02-3', 99999); (39096, 2, 'LR-02-3', 99999);
INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `userFk`, `isRecyclable`) INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `userFk`, `isRecyclable`)
VALUES VALUES
@ -494,7 +494,7 @@ DROP TEMPORARY TABLE IF EXISTS tmp.address;
CREATE TEMPORARY TABLE tmp.address CREATE TEMPORARY TABLE tmp.address
SELECT * FROM `vn`.`address`; SELECT * FROM `vn`.`address`;
UPDATE `vn`.`client` `c` UPDATE `vn`.`client` `c`
JOIN `tmp`.`address` `a` ON `a`.`clientFk` = `c`.`id` JOIN `tmp`.`address` `a` ON `a`.`clientFk` = `c`.`id`
SET `c`.`defaultAddressFk` = `a`.`id` SET `c`.`defaultAddressFk` = `a`.`id`
WHERE `defaultAddressFk` IS NULL; WHERE `defaultAddressFk` IS NULL;
@ -1867,10 +1867,10 @@ INSERT INTO `vn`.`workerManaExcluded`(`workerFk`)
VALUES VALUES
(9); (9);
/* /*
el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes, el mana de los trabajadores lo podemos poner a mano en la tabla si lo calculamos antes,
pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto pero si hazemos alguna modificacion en alguna tabla que utiliza para calcularlo ya no seria correcto
La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets La otra manera es poner el calculo con los 2 trabajadores que utilizamos ahora mismo para los tickets
*/ */
call vn.manaSpellersRequery(19); call vn.manaSpellersRequery(19);

25
db/versions/11389-yellowChico/00-firstScript.sql Normal file
View File

@ -0,0 +1,25 @@
CREATE TABLE vn.parkingCoordinates (
parkingFk int(11) NOT NULL,
x varchar(5) NOT NULL,
y varchar(5) NOT NULL,
z varchar(5) NOT NULL,
CONSTRAINT parkingCoordinates_pk PRIMARY KEY (parkingFk),
CONSTRAINT parkingCoordinates_parking_FK FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE CASCADE
)
ENGINE=InnoDB
DEFAULT CHARSET=utf8mb3
COLLATE=utf8mb3_unicode_ci;
UPDATE vn.parkingCoordinates pc
JOIN vn.parking p ON p.id = pc.parkingFk
SET pc.x = IFNULL(p.`column`, 0),
pc.y = IFNULL(p.`row`, 0),
pc.z = IFNULL(p.`floor`, 0)
WHERE p.`column` IS NOT NULL
OR p.`row` IS NOT NULL
OR p.`floor` IS NOT NULL;
ALTER TABLE vn.parking
DROP COLUMN `column`,
DROP COLUMN `row`,
DROP COLUMN `floor`;