3870-models #975

Merged
carlosjr merged 9 commits from 3870-models into dev 2022-05-23 12:42:31 +00:00
3 changed files with 41 additions and 10 deletions
Showing only changes of commit 9eae1f479c - Show all commits

View File

@ -99,7 +99,13 @@ INSERT INTO `account`.`mailForward`(`account`, `forwardTo`)
VALUES VALUES
(1, 'employee@domain.local'); (1, 'employee@domain.local');
INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk `) INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`)
VALUES
(1, 'printer1', 'path1', 0),
(2, 'printer2', 'path2', 1);
INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
VALUES VALUES
(1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL), (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106, NULL, NULL),
(1107, 'ANT', 'Hank' , 'Pym' , 1107, 19, 432978107, NULL, 1), (1107, 'ANT', 'Hank' , 'Pym' , 1107, 19, 432978107, NULL, 1),
@ -2552,12 +2558,13 @@ INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `IsVersionCrit
INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`) INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`)
VALUES VALUES
('RE-001', 'STILL', 'LTX-20', 60, 23, 'REMOLCADOR ELECTRICO', 'Arrastrar carros', 2020, 103, 442); ('RE-001', 'STILL', 'LTX-20', 60, 23, 'REMOLCADOR ELECTRICO', 'Arrastrar carros', 2020, 103, 442),
vicent marked this conversation as resolved Outdated

fixtures language is english by default

fixtures language is english by default
('RE-002', 'STILL', 'LTX-20', 60, 23, 'REMOLCADOR ELECTRICO', 'Arrastrar carros', 2020, 103, 442);
INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`) INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`)
VALUES VALUES
(1106, 1, CURDATE(), CURDATE()), (1106, 1, CURDATE(), CURDATE()),
(1106, 1, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (1106, 1, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY)),
(1106, 2, CURDATE(), NULL), (1106, 2, CURDATE(), NULL),
(1106, 2, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY)), (1106, 2, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY));

View File

@ -37460,6 +37460,31 @@ SET character_set_client = utf8;
) ENGINE=MyISAM */; ) ENGINE=MyISAM */;
SET character_set_client = @saved_cs_client; SET character_set_client = @saved_cs_client;
--
-- Temporary table structure for view `printer`
--
DROP TABLE IF EXISTS `printer`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `printer` (
`id` tinyint(3) unsigned NOT NULL,
`name` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`path` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`modelFk` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`macWifi` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`ipAddress` varchar(15) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`reference` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`isLabeler` tinyint(1) DEFAULT 0 COMMENT 'Indica si es impresora de etiquetas',
PRIMARY KEY (`id`),
UNIQUE KEY `printer_UN` (`reference`),
UNIQUE KEY `printer_UN1` (`macWifi`),
UNIQUE KEY `printer_UN2` (`name`),
KEY `printer_FK` (`modelFk`),
CONSTRAINT `printer_FK` FOREIGN KEY (`modelFk`) REFERENCES `printerModel` (`code`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
-- --
-- Table structure for table `printingQueueCheck` -- Table structure for table `printingQueueCheck`
-- --

View File

@ -60,7 +60,6 @@ IGNORETABLES=(
--ignore-table=vn.plantpassportAuthority__ --ignore-table=vn.plantpassportAuthority__
--ignore-table=vn.preparationException --ignore-table=vn.preparationException
--ignore-table=vn.priceFixed__ --ignore-table=vn.priceFixed__
--ignore-table=vn.printer
--ignore-table=vn.printingQueue --ignore-table=vn.printingQueue
--ignore-table=vn.printServerQueue__ --ignore-table=vn.printServerQueue__
--ignore-table=vn.promissoryNote --ignore-table=vn.promissoryNote