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

#5858 - zoneCollisions #1853

Merged
jsegarra merged 78 commits from 5858-zone_Collisions into dev 2024-03-15 12:36:38 +00:00
Conversation 0 Commits 78 Files Changed 16 +159 -159
2 changed files with 159 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7f6e61ea1 - Show all commits

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

@ -2821,7 +2821,7 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
(4, 1), (4, 1),
(5, 9), (5, 9),
(6, 9), (6, 9),
(7, 1); (7, 100);
INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
VALUES VALUES
@ -2839,7 +2839,7 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
(1, 9), (1, 9),
(1, 3), (1, 3),
(6, 9), (6, 9),
(7, 9); (7, 100);
INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`) INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
VALUES VALUES
@ -3077,11 +3077,11 @@ INSERT INTO vn.packaging
INSERT IGNORE INTO vn.intrastat INSERT IGNORE INTO vn.intrastat
SET id = 44219999, SET id = 44219999,
description = 'Manufacturas de madera', description = 'Manufacturas de madera',
taxClassFk = 1, taxClassFk = 1,
taxCodeFk = 1; taxCodeFk = 1;
INSERT IGNORE INTO vn.warehouse INSERT IGNORE INTO vn.warehouse
SET id = 999, SET id = 999,
name = 'TestingWarehouse', name = 'TestingWarehouse',
@ -3092,33 +3092,33 @@ INSERT IGNORE INTO vn.warehouse
hasProduction = TRUE; hasProduction = TRUE;
INSERT IGNORE INTO vn.sector INSERT IGNORE INTO vn.sector
SET id = 9991, SET id = 9991,
description = 'NormalSector', description = 'NormalSector',
warehouseFk = 999, warehouseFk = 999,
code = 'NS', code = 'NS',
isPackagingArea = FALSE, isPackagingArea = FALSE,
sonFk = NULL, sonFk = NULL,
isMain = TRUE, isMain = TRUE,
itemPackingTypeFk = NULL; itemPackingTypeFk = NULL;
INSERT IGNORE INTO vn.sector INSERT IGNORE INTO vn.sector
SET id = 9992, SET id = 9992,
description = 'PreviousSector', description = 'PreviousSector',
warehouseFk = 999, warehouseFk = 999,
code = 'PS', code = 'PS',
isPackagingArea = FALSE, isPackagingArea = FALSE,
sonFk = NULL, sonFk = NULL,
isMain = TRUE, isMain = TRUE,
itemPackingTypeFk = NULL; itemPackingTypeFk = NULL;
INSERT IGNORE INTO vn.sector INSERT IGNORE INTO vn.sector
SET id = 9993, SET id = 9993,
description = 'MezaninneSector', description = 'MezaninneSector',
warehouseFk = 999, warehouseFk = 999,
code = 'MS', code = 'MS',
isPackagingArea = FALSE, isPackagingArea = FALSE,
sonFk = 9991, sonFk = 9991,
isMain = TRUE, isMain = TRUE,
itemPackingTypeFk = NULL; itemPackingTypeFk = NULL;
@ -3152,58 +3152,58 @@ INSERT IGNORE INTO vn.itemType
SET id = 999, SET id = 999,
code = 'WOO', code = 'WOO',
name = 'Wood Objects', name = 'Wood Objects',
categoryFk = 3, categoryFk = 3,
workerFk = 103, workerFk = 103,
isInventory = TRUE, isInventory = TRUE,
life = 10, life = 10,
density = 250, density = 250,
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
temperatureFk = 'warm'; temperatureFk = 'warm';
INSERT IGNORE INTO vn.travel INSERT IGNORE INTO vn.travel
SET id = 99, SET id = 99,
shipped = CURDATE(), shipped = CURDATE(),
landed = CURDATE(), landed = CURDATE(),
warehouseInFk = 999, warehouseInFk = 999,
warehouseOutFk = 1, warehouseOutFk = 1,
isReceived = TRUE; isReceived = TRUE;
INSERT INTO vn.entry INSERT INTO vn.entry
SET id = 999, SET id = 999,
supplierFk = 791, supplierFk = 791,
isConfirmed = TRUE, isConfirmed = TRUE,
dated = CURDATE(), dated = CURDATE(),
travelFk = 99, travelFk = 99,
companyFk = 442; companyFk = 442;
INSERT INTO vn.ticket INSERT INTO vn.ticket
SET id = 999999, SET id = 999999,
clientFk = 2, clientFk = 2,
warehouseFk = 999, warehouseFk = 999,
shipped = CURDATE(), shipped = CURDATE(),
nickname = 'Cliente', nickname = 'Cliente',
addressFk = 1, addressFk = 1,
companyFk = 442, companyFk = 442,
agencyModeFk = 10, agencyModeFk = 10,
landed = CURDATE(); landed = CURDATE();
INSERT INTO vn.collection INSERT INTO vn.collection
SET id = 10101010, SET id = 10101010,
workerFk = 9; workerFk = 9;
INSERT IGNORE INTO vn.ticketCollection INSERT IGNORE INTO vn.ticketCollection
SET id = 10101010, SET id = 10101010,
ticketFk = 999999, ticketFk = 999999,
collectionFk = 10101010; collectionFk = 10101010;
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999991, SET id = 999991,
name = 'Palito para pinchos', name = 'Palito para pinchos',
`size` = 25, `size` = 25,
stems = NULL, stems = NULL,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palito para pinchos', longName = 'Palito para pinchos',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 6, weightByPiece = 6,
@ -3230,19 +3230,19 @@ INSERT INTO vn.sale
SET id = 99991, SET id = 99991,
itemFk = 999991, itemFk = 999991,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palito para pinchos', concept = 'Palito para pinchos',
quantity = 3, quantity = 3,
price = 1, price = 1,
discount = 0; discount = 0;
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999992, SET id = 999992,
name = 'Madera verde', name = 'Madera verde',
`size` = 10, `size` = 10,
stems = NULL, stems = NULL,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Madera verde', longName = 'Madera verde',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 50, weightByPiece = 50,
@ -3269,19 +3269,19 @@ INSERT INTO vn.sale
SET id = 99992, SET id = 99992,
itemFk = 999992, itemFk = 999992,
ticketFk = 999999, ticketFk = 999999,
concept = 'Madera Verde', concept = 'Madera Verde',
quantity = 10, quantity = 10,
price = 1, price = 1,
discount = 0; discount = 0;
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999993, SET id = 999993,
name = 'Madera Roja/Morada', name = 'Madera Roja/Morada',
`size` = 12, `size` = 12,
stems = 2, stems = 2,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Madera Roja/Morada', longName = 'Madera Roja/Morada',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 35, weightByPiece = 35,
@ -3305,30 +3305,30 @@ INSERT INTO vn.buy
weight = 25; weight = 25;
INSERT INTO vn.itemShelving INSERT INTO vn.itemShelving
SET id = 9931, SET id = 9931,
itemFk = 999993, itemFk = 999993,
shelvingFk = 'NCC', shelvingFk = 'NCC',
visible = 10, visible = 10,
`grouping` = 5, `grouping` = 5,
packing = 10; packing = 10;
INSERT INTO vn.sale INSERT INTO vn.sale
SET id = 99993, SET id = 99993,
itemFk = 999993, itemFk = 999993,
ticketFk = 999999, ticketFk = 999999,
concept = 'Madera Roja/Morada', concept = 'Madera Roja/Morada',
quantity = 15, quantity = 15,
price = 1, price = 1,
discount = 0; discount = 0;
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999994, SET id = 999994,
name = 'Madera Naranja', name = 'Madera Naranja',
`size` = 18, `size` = 18,
stems = 1, stems = 1,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Madera Naranja', longName = 'Madera Naranja',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 160, weightByPiece = 160,
@ -3355,19 +3355,19 @@ INSERT INTO vn.sale
SET id = 99994, SET id = 99994,
itemFk = 999994, itemFk = 999994,
ticketFk = 999999, ticketFk = 999999,
concept = 'Madera Naranja', concept = 'Madera Naranja',
quantity = 4, quantity = 4,
price = 1, price = 1,
discount = 0; discount = 0;
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999995, SET id = 999995,
name = 'Madera Amarilla', name = 'Madera Amarilla',
`size` = 11, `size` = 11,
stems = 5, stems = 5,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Madera Amarilla', longName = 'Madera Amarilla',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 78, weightByPiece = 78,
@ -3394,20 +3394,20 @@ INSERT INTO vn.sale
SET id = 99995, SET id = 99995,
itemFk = 999995, itemFk = 999995,
ticketFk = 999999, ticketFk = 999999,
concept = 'Madera Amarilla', concept = 'Madera Amarilla',
quantity = 5, quantity = 5,
price = 1, price = 1,
discount = 0; discount = 0;
-- Palito naranja -- Palito naranja
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999998, SET id = 999998,
name = 'Palito naranja', name = 'Palito naranja',
`size` = 11, `size` = 11,
stems = 1, stems = 1,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palito naranja', longName = 'Palito naranja',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 78, weightByPiece = 78,
@ -3434,20 +3434,20 @@ INSERT INTO vn.sale
SET id = 99998, SET id = 99998,
itemFk = 999998, itemFk = 999998,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palito naranja', concept = 'Palito naranja',
quantity = 60, quantity = 60,
price = 1, price = 1,
discount = 0; discount = 0;
-- Palito amarillo -- Palito amarillo
INSERT INTO vn.item INSERT INTO vn.item
SET id = 999999, SET id = 999999,
name = 'Palito amarillo', name = 'Palito amarillo',
`size` = 11, `size` = 11,
stems = 1, stems = 1,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palito amarillo', longName = 'Palito amarillo',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 78, weightByPiece = 78,
@ -3474,20 +3474,20 @@ INSERT INTO vn.sale
SET id = 99999, SET id = 99999,
itemFk = 999999, itemFk = 999999,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palito amarillo', concept = 'Palito amarillo',
quantity = 50, quantity = 50,
price = 1, price = 1,
discount = 0; discount = 0;
-- Palito azul -- Palito azul
INSERT INTO vn.item INSERT INTO vn.item
SET id = 1000000, SET id = 1000000,
name = 'Palito azul', name = 'Palito azul',
`size` = 10, `size` = 10,
stems = 1, stems = 1,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palito azul', longName = 'Palito azul',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 78, weightByPiece = 78,
@ -3514,20 +3514,20 @@ INSERT INTO vn.sale
SET id = 100000, SET id = 100000,
itemFk = 1000000, itemFk = 1000000,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palito azul', concept = 'Palito azul',
quantity = 50, quantity = 50,
price = 1, price = 1,
discount = 0; discount = 0;
-- Palito rojo -- Palito rojo
INSERT INTO vn.item INSERT INTO vn.item
SET id = 1000001, SET id = 1000001,
name = 'Palito rojo', name = 'Palito rojo',
`size` = 10, `size` = 10,
stems = NULL, stems = NULL,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palito rojo', longName = 'Palito rojo',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 78, weightByPiece = 78,
@ -3555,20 +3555,20 @@ INSERT INTO vn.sale
SET id = 100001, SET id = 100001,
itemFk = 1000001, itemFk = 1000001,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palito rojo', concept = 'Palito rojo',
quantity = 10, quantity = 10,
price = 1, price = 1,
discount = 0; discount = 0;
-- Previa -- Previa
INSERT IGNORE INTO vn.item INSERT IGNORE INTO vn.item
SET id = 999996, SET id = 999996,
name = 'Bolas de madera', name = 'Bolas de madera',
`size` = 2, `size` = 2,
stems = 4, stems = 4,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Bolas de madera', longName = 'Bolas de madera',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 20, weightByPiece = 20,
@ -3595,20 +3595,20 @@ INSERT vn.sale
SET id = 99996, SET id = 99996,
itemFk = 999996, itemFk = 999996,
ticketFk = 999999, ticketFk = 999999,
concept = 'Bolas de madera', concept = 'Bolas de madera',
quantity = 4, quantity = 4,
price = 7, price = 7,
discount = 0, discount = 0,
isPicked = TRUE; isPicked = TRUE;
INSERT IGNORE INTO vn.item INSERT IGNORE INTO vn.item
SET id = 999997, SET id = 999997,
name = 'Palitos de polo MIX', name = 'Palitos de polo MIX',
`size` = 14, `size` = 14,
stems = NULL, stems = NULL,
category = 'EXT', category = 'EXT',
typeFk = 999, typeFk = 999,
longName = 'Palitos de polo MIX', longName = 'Palitos de polo MIX',
itemPackingTypeFk = NULL, itemPackingTypeFk = NULL,
originFk = 1, originFk = 1,
weightByPiece = 20, weightByPiece = 20,
@ -3635,9 +3635,9 @@ INSERT vn.sale
SET id = 99997, SET id = 99997,
itemFk = 999997, itemFk = 999997,
ticketFk = 999999, ticketFk = 999999,
concept = 'Palitos de polo MIX', concept = 'Palitos de polo MIX',
quantity = 5, quantity = 5,
price = 7, price = 7,
discount = 0; discount = 0;
USE vn; USE vn;
@ -3670,38 +3670,38 @@ VALUES
-- Previous for Bolas de madera -- Previous for Bolas de madera
INSERT IGNORE INTO vn.sectorCollection INSERT IGNORE INTO vn.sectorCollection
SET id = 99, SET id = 99,
userFk = 1, userFk = 1,
sectorFk = 9992; sectorFk = 9992;
INSERT IGNORE INTO vn.saleGroup INSERT IGNORE INTO vn.saleGroup
SET id = 4, SET id = 4,
userFk = 1, userFk = 1,
parkingFk = 9, parkingFk = 9,
sectorFk = 9992; sectorFk = 9992;
INSERT IGNORE INTO vn.sectorCollectionSaleGroup INSERT IGNORE INTO vn.sectorCollectionSaleGroup
SET id = 9999, SET id = 9999,
sectorCollectionFk = 99, sectorCollectionFk = 99,
saleGroupFk = 999; saleGroupFk = 999;
INSERT vn.saleGroupDetail INSERT vn.saleGroupDetail
SET id = 99991, SET id = 99991,
saleFk = 99996, saleFk = 99996,
saleGroupFk = 999; saleGroupFk = 999;
INSERT INTO vn.saleTracking INSERT INTO vn.saleTracking
SET id = 7, SET id = 7,
saleFk = 99996, saleFk = 99996,
isChecked = TRUE, isChecked = TRUE,
workerFk = 103, workerFk = 103,
stateFk = 28; stateFk = 28;
INSERT IGNORE INTO vn.itemShelvingSale INSERT IGNORE INTO vn.itemShelvingSale
SET id = 991, SET id = 991,
itemShelvingFk = 9962, itemShelvingFk = 9962,
saleFk = 99996, saleFk = 99996,
quantity = 5, quantity = 5,
userFk = 1; userFk = 1;
UPDATE vn.ticket UPDATE vn.ticket
@ -3734,4 +3734,4 @@ UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
INSERT INTO vn.report (name) VALUES ('LabelCollection'); INSERT INTO vn.report (name) VALUES ('LabelCollection');
INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue) INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue)
VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL); VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);

4
db/versions/10881-greenHydrangea/01-notification.vn.sql
View File

@ -4,8 +4,8 @@ INSERT IGNORE INTO util.notification ( `name`,`description`)
SET @MaxId = LAST_INSERT_ID(); SET @MaxId = LAST_INSERT_ID();
INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk) INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
VALUES( VALUES(
@MaxId, (SELECT id from `account`.`user` where name = "system")); @MaxId, (SELECT id from `account`.`user` where name = "root"));
INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk) INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
SELECT @MaxId, (SELECT id from `account`.`role` where name = "system") FROM util.notification WHERE name= "zone-included"; SELECT @MaxId, (SELECT id from `account`.`role` where name = "root") FROM util.notification WHERE name= "zone-included";