db/routines/vn/procedures/collection_new.sql

@@ -167,7 +167,8 @@ BEGIN
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit
 				OR pb.m3 > vVolumeLimit
-				OR sub.maxSize > vSizeLimit;
+				OR sub.maxSize > vSizeLimit
+				OR pb.hasPlantTray;
 	END IF;
 
 	-- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede

db/routines/vn/procedures/creditInsurance_getRisk.sql

@@ -10,7 +10,7 @@ BEGIN
 			SELECT * FROM (
 					SELECT cc.client clientFk, ci.grade
 						FROM creditClassification cc
-							JOIN creditInsurance ci ON cc.id = ci.creditClassification
+							JOIN creditInsurance ci ON cc.id = ci.creditClassificationFk
 						WHERE dateEnd IS NULL
 					ORDER BY ci.creationDate DESC
 					LIMIT 10000000000000000000) t1

db/routines/vn/procedures/itemShelving_add.sql

@@ -46,7 +46,8 @@ BEGIN
 				AND buyFk = vBuyFk) THEN
 
 		UPDATE itemShelving
-			SET visible = visible + vQuantity
+			SET visible = visible + vQuantity,
+				available = available + vQuantity
 			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
 
 	ELSE

db/routines/vn/procedures/productionControl.sql

@@ -211,8 +211,6 @@ proc: BEGIN
 		salesInParkingCount INT DEFAULT 0)
 		ENGINE = MEMORY;
 
-	-- Insertamos todos los tickets que tienen productos parkineados
-	-- en sectores de previa, segun el sector
 	CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
 		(PRIMARY KEY(itemFk, sectorFk))
 		ENGINE = MEMORY
@@ -245,7 +243,6 @@ proc: BEGIN
 				AND s.quantity > 0
 			GROUP BY pb.ticketFk;
 
-	-- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
 	UPDATE tmp.ticketWithPrevia twp
 		JOIN (
 			SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
@@ -259,12 +256,28 @@ proc: BEGIN
 		) sub ON twp.ticketFk = sub.ticketFk
 		SET twp.salesInParkingCount = sub.salesInParkingCount;
 
-	-- Marcamos como pendientes aquellos que no coinciden las cantidades
 	UPDATE tmp.productionBuffer pb
 			JOIN tmp.ticketWithPrevia twp ON twp.ticketFk = pb.ticketFk
 		SET pb.previousWithoutParking = TRUE
 		WHERE twp.salesCount > twp.salesInParkingCount;
 
+	-- hasPlantTray
+	ALTER TABLE tmp.productionBuffer
+		ADD hasPlantTray BOOL DEFAULT FALSE;
+
+	UPDATE tmp.productionBuffer pb
+			JOIN sale s ON s.ticketFk = pb.ticketFk
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+			JOIN itemCategory ic ON ic.id = it.categoryFk
+			JOIN cache.last_buy lb ON lb.warehouse_id = vWarehouseFk AND lb.item_id = s.itemFk
+			JOIN buy b ON b.id = lb.buy_id
+			JOIN packaging p ON p.id = b.packagingFk
+			JOIN productionConfig pc
+		SET hasPlantTray = TRUE
+		WHERE ic.code = 'plant'
+			AND p.`depth` >= pc.minPlantTrayLength;		
+
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,
 		tmp.ticket,

db/routines/vn/procedures/productionSectorList.sql

@@ -55,7 +55,6 @@ BEGIN
 						i.itemPackingTypeFk,
 						isa.`size`,
 						isa.Estado,
-						isa.sectorProdPriority,
 						isa.available,
 						isa.sectorFk,
 						isa.matricula,

db/routines/vn/procedures/sale_boxPickingPrint.sql

@@ -160,7 +160,10 @@ w1:	WHILE vQuantity >= vPacking DO
 
 		UPDATE sale SET quantity = quantity - vPacking WHERE id = vSaleFk;
 
-		UPDATE itemShelving SET visible = visible - vPacking WHERE id = vItemShelvingFk;
+		UPDATE itemShelving 
+		SET visible = visible - vPacking,
+			available = available - vPacking
+		WHERE id = vItemShelvingFk;
 
 		SET vNewSaleFk = NULL;
 

db/routines/vn/triggers/creditInsurance_afterInsert.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_afterIn
 BEGIN
 	UPDATE `client` c
 		JOIN vn.creditClassification  cc ON cc.client = c.id
-        SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification;
+        SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassificationFk;
         
 END$$
 DELIMITER ;

db/routines/vn/triggers/creditInsurance_beforeInsert.sql

@@ -1,10 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
-	BEFORE INSERT ON `creditInsurance`
-	FOR EACH ROW
-BEGIN
-	IF NEW.creditClassificationFk THEN
-		SET NEW.creditClassification = NEW.creditClassificationFk;
-	END IF;
-END$$
-DELIMITER ;

db/routines/vn/triggers/solunionCAP_afterInsert.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`solunionCAP_afterInsert
 BEGIN
 	UPDATE client c
 		JOIN creditClassification cc ON cc.client = c.id
-		JOIN creditInsurance ci ON ci.creditClassification = cc.id
+		JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
 	SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance;
 END$$
 DELIMITER ;

db/routines/vn/triggers/solunionCAP_afterUpdate.sql

@@ -6,12 +6,12 @@ BEGIN
 	IF NEW.dateLeaving IS NOT NULL THEN
 		UPDATE client c
 			JOIN creditClassification cc ON cc.client = c.id
-			JOIN creditInsurance ci ON ci.creditClassification = cc.id
+			JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
 		SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance;
 	ELSE
 		UPDATE client c
 			JOIN creditClassification cc ON cc.client = c.id
-			JOIN creditInsurance ci ON ci.creditClassification = cc.id
+			JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
 		SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance;
 	END IF;
 END$$

db/routines/vn/triggers/solunionCAP_beforeDelete.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`solunionCAP_beforeDelet
 BEGIN
 	UPDATE client c
 		JOIN creditClassification cc ON cc.client = c.id
-		JOIN creditInsurance ci ON ci.creditClassification = cc.id
+		JOIN creditInsurance ci ON ci.creditClassificationFk = cc.id
 	SET creditInsurance = ci.credit  WHERE ci.id = OLD.creditInsurance;
 END$$
 DELIMITER ;

db/routines/vn/views/itemShelvingAvailable.sql

@@ -10,7 +10,6 @@ AS SELECT `s`.`id` AS `saleFk`,
 	`s`.`concept` AS `concept`,
 	`i`.`size` AS `size`,
 	`st`.`name` AS `Estado`,
-	`st`.`sectorProdPriority` AS `sectorProdPriority`,
 	`stock`.`visible` AS `available`,
 	`stock`.`sectorFk` AS `sectorFk`,
 	`stock`.`shelvingFk` AS `matricula`,

db/routines/vn2008/views/state.sql

@@ -6,7 +6,6 @@ AS SELECT `s`.`id` AS `id`,
 	`s`.`order` AS `order`,
 	`s`.`alertLevel` AS `alert_level`,
 	`s`.`code` AS `code`,
-	`s`.`sectorProdPriority` AS `sectorProdPriority`,
 	`s`.`nextStateFk` AS `nextStateFk`,
 	`s`.`isPreviousPreparable` AS `isPreviousPreparable`,
 	`s`.`isPicked` AS `isPicked`

db/versions/11113-bronzeDendro/00-firstScript.sql

@@ -0,0 +1,16 @@
+ALTER TABLE IF EXISTS `vn`.`payrollWorker`
+	MODIFY COLUMN IF EXISTS `nss__` varchar(23) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codpuesto__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codcontrato__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `FAntiguedad__` date NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `grupotarifa__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `codcategoria__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `ContratoTemporal__` tinyint(1) NOT NULL DEFAULT 0 COMMENT '@deprecated 2024-03-15';
+
+ALTER TABLE IF EXISTS `vn`.`payrollWorkCenter`
+	MODIFY COLUMN IF EXISTS `Centro__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `nss_cotizacion__` varchar(15) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `domicilio__` varchar(255) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `poblacion__` varchar(45) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `cp__` varchar(5) NOT NULL COMMENT '@deprecated 2024-03-15',
+	MODIFY COLUMN IF EXISTS `empresa_id__` int(10) NOT NULL COMMENT '@deprecated 2024-03-15';

db/versions/11222-azureCordyline/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.state DROP COLUMN sectorProdPriority;

db/versions/11224-whiteMastic/00-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.creditInsurance DROP FOREIGN KEY CreditInsurance_Fk1;
+ALTER TABLE vn.creditInsurance
+    CHANGE creditClassification creditClassification__ int(11) DEFAULT NULL COMMENT '@deprecated 2024-09-11';

db/versions/11229-salmonAsparagus/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig ADD minPlantTrayLength INT DEFAULT 53 NOT NULL 
+COMMENT 'minimum length for plant tray restriction. Avoid to make collection of the ticket with this kind of item';

modules/worker/back/methods/worker-dms/filter.js

@@ -8,19 +8,19 @@ module.exports = Self => {
         accepts: [
             {
                 arg: 'id',
-                type: 'Number',
+                type: 'number',
                 description: 'The worker id',
                 http: {source: 'path'}
             },
             {
                 arg: 'filter',
-                type: 'Object',
+                type: 'object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
                 http: {source: 'query'}
             }
         ],
         returns: {
-            type: ['Object'],
+            type: ['object'],
             root: true
         },
         http: {
@@ -36,6 +36,7 @@ module.exports = Self => {
 
         // Get ids alloweds
         const account = await models.VnUser.findById(userId);
+
         const stmt = new ParameterizedSQL(
             `SELECT d.id, d.id dmsFk
                 FROM workerDms wd
@@ -45,30 +46,40 @@ module.exports = Self => {
                         AND rr.role = ?
                 `, [account.roleFk]
         );
-        const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
+        const yourOwnDms = {
-        const where = {
+            or: [
-            or: [yourOwnDms, {
+                {and: [
+                    {isReadableByWorker: true},
+                    {'wd.workerFk': userId}
+                ]},
+                {
                     role: {
                         neq: null
                     }
                 }]
         };
-        stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));
 
-        // Get workerDms alloweds
+        const where = mergeWhere(filter.where, yourOwnDms);
+        stmt.merge(conn.makeSuffix({where}));
         const dmsIds = await conn.executeStmt(stmt);
+
         const allowedIds = dmsIds.map(dms => dms.id);
         const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
-        let workerDms = await models.WorkerDms.find(allowedFilter);
 
-        // Get docuware info
+        const workerDms = await models.WorkerDms.find(allowedFilter);
-        const docuware = await models.Docuware.findOne({
+
+        const workerDocuware = filter.skip ? [] : await getDocuware(ctx, id);
+        return workerDms.concat(workerDocuware);
+
+        async function getDocuware(ctx, id) {
+            const {dmsTypeFk} = await models.Docuware.findOne({
                 fields: ['dmsTypeFk'],
                 where: {code: 'hr', action: 'find'}
             });
-        const docuwareDmsType = docuware.dmsTypeFk;
+
+            if (!await models.DmsType.hasReadRole(ctx, dmsTypeFk)) return [];
+
             let workerDocuware = [];
-        if (!filter.skip && (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType)))) {
             const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
             const docuwareParse = {
                 'Filename': 'dmsFk',
@@ -106,7 +117,7 @@ module.exports = Self => {
                 };
                 Object.assign(document, defaultData);
             }
+            return workerDocuware;
         }
-        return workerDms.concat(workerDocuware);
     };
 };

myt.config.yml

@@ -2,6 +2,7 @@ code: vn-database
 versionSchema: util
 replace: true
 sumViews: false
+defaultDefiner: vn@localhost
 mockDate: '2001-01-01 12:00:00'
 subdir: db
 schemas:

package.json

@@ -60,7 +60,7 @@
         "@babel/register": "^7.7.7",
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@verdnatura/myt": "^1.6.9",
+        "@verdnatura/myt": "^1.6.11",
         "angular-mocks": "^1.7.9",
         "babel-jest": "^26.0.1",
         "babel-loader": "^8.2.4",

pnpm-lock.yaml

@@ -143,8 +143,8 @@ devDependencies:
     specifier: ^19.1.0
     version: 19.1.0
   '@verdnatura/myt':
-    specifier: ^1.6.9
+    specifier: ^1.6.11
-    version: 1.6.9
+    version: 1.6.11
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -2846,8 +2846,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.9:
+  /@verdnatura/myt@1.6.11:
-    resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
+    resolution: {integrity: sha512-uqdbSJSznBBzAoRkvBt600nUMEPL1PJ2v73eWMZbaoGUMiZiNAehYjs4gIrObP1cxC85JOx97XoLpG0BzPsaig==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5
@@ -3306,6 +3306,7 @@ packages:
 
   /are-we-there-yet@1.1.7:
     resolution: {integrity: sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==}
+    deprecated: This package is no longer supported.
     dependencies:
       delegates: 1.0.0
       readable-stream: 2.3.8
@@ -6593,6 +6594,7 @@ packages:
 
   /gauge@2.7.4:
     resolution: {integrity: sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==}
+    deprecated: This package is no longer supported.
     dependencies:
       aproba: 1.2.0
       console-control-strings: 1.1.0
@@ -10814,6 +10816,7 @@ packages:
 
   /npmlog@4.1.2:
     resolution: {integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==}
+    deprecated: This package is no longer supported.
     dependencies:
       are-we-there-yet: 1.1.7
       console-control-strings: 1.1.0
@@ -11055,6 +11058,7 @@ packages:
 
   /osenv@0.1.5:
     resolution: {integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==}
+    deprecated: This package is no longer supported.
     dependencies:
       os-homedir: 1.0.2
       os-tmpdir: 1.0.2