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

2024-09-24 11:29:09 +02:00 · 2024-09-24 11:29:09 +02:00 · ae97c8a035
parent 8c2e6558a3 ea06afb361
commit ae97c8a035
12 changed files with 65 additions and 38 deletions
--- a/db/routines/vn/procedures/catalog_calculate.sql
+++ b/db/routines/vn/procedures/catalog_calculate.sql
@ -126,7 +126,10 @@ BEGIN
 					AND a.available > 0
 					AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
 					AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
-					AND (itc.isReclining OR it.`size` IS NULL OR it.`size` < z.itemMaxSize OR z.itemMaxSize IS NULL)
+					AND (it.`size` IS NULL
+						OR IF(itc.isReclining,
+							it.size <= z.itemMaxLength OR z.itemMaxLength IS NULL,
+							it.size <= z.itemMaxSize OR z.itemMaxSize IS NULL))
 					AND cit.id IS NULL
 					AND zit.id IS NULL
 					AND ait.id IS NULL;
--- a/db/routines/vn/procedures/previousSticker_get.sql
+++ b/db/routines/vn/procedures/previousSticker_get.sql
@ -1,58 +1,64 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`previousSticker_get`(vSaleGroupFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`previousSticker_get`(
+	vSaleGroupFk INT
+)
 BEGIN
 /**
 * Devuelve los campos a imprimir en una etiqueta de preparación previa.
- * Actualiza el valor de vn.saleGroup.parkingFk en el caso de que exista un
+ * Actualiza el valor de saleGroup.parkingFk en el caso de que exista un
 * saleGroup del mismo ticket con parking, del mismo sector, para que todos se
 * pongan juntos.
 *
- * @param vSaleGroupFk Identificador de vn.saleGroup
+ * @param vSaleGroupFk Identificador de saleGroup
 */
 	DECLARE vTicketFk INT;
 	DECLARE vParkingFk INT;
 	DECLARE vSectorFk INT;
+	DECLARE vTicketLines INT;

-	SELECT s.ticketFk
-		INTO vTicketFk
+	WITH ticketData AS(
+		SELECT DISTINCT s.ticketFk 
 			FROM vn.saleGroupDetail sgd
 				JOIN vn.sale s ON s.id = sgd.saleFk
 			WHERE sgd.saleGroupFk = vSaleGroupFk
-		LIMIT 1;
+	)
+	SELECT COUNT(*), s.ticketFk INTO vTicketLines, vTicketFk 
+		FROM vn.sale s 
+			JOIN ticketData td ON td.ticketFk = s.ticketFk;

 	SELECT sg.parkingFk, sc.sectorFk
 		INTO vParkingFk, vSectorFk
-		FROM vn.saleGroup sg
-			JOIN vn.sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
-			JOIN vn.sectorCollection sc ON sc.id = scsg.sectorCollectionFk
-			JOIN vn.saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
-			JOIN vn.sale s ON s.id = sgd.saleFk
+		FROM saleGroup sg
+			JOIN sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
+			JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
+			JOIN saleGroupDetail sgd ON sgd.saleGroupFk = sg.id
+			JOIN sale s ON s.id = sgd.saleFk
 		WHERE s.ticketFk = vTicketFk
 			AND sg.parkingFk IS NOT NULL
 		LIMIT 1;

-	UPDATE vn.saleGroup sg
+	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
 		WHERE sg.id = vSaleGroupFk
 			AND sg.sectorFk = vSectorFk;

 	SELECT sgd.saleGroupFk,
 			t.id ticketFk,
-			p.code as location,
-			t.observations,
+			COUNT(*) previousLines,
 			IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) shippingHour,
 			IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) shippingMinute ,
 			IFNULL(MAX(i.itemPackingTypeFk),'H') itemPackingTypeFk ,
-			count(*) items,
+			vTicketLines ticketLines,
+			p.code `location`,
 			sc.description sector
-		FROM vn.sale s
-			JOIN vn.item i ON i.id = s.itemFk
-			JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
-			JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
-			JOIN vn.sector sc ON sc.id = sg.sectorFk
-			JOIN vn.ticket t ON t.id = s.ticketFk
-			LEFT JOIN vn.parking p ON p.id = sg.parkingFk
-			LEFT JOIN vn.`zone` z ON z.id = t.zoneFk
+		FROM sale s
+			JOIN item i ON i.id = s.itemFk
+			JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+			JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
+			JOIN sector sc ON sc.id = sg.sectorFk
+			JOIN ticket t ON t.id = s.ticketFk
+			LEFT JOIN parking p ON p.id = sg.parkingFk
+			LEFT JOIN `zone` z ON z.id = t.zoneFk
 		WHERE sgd.saleGroupFk = vSaleGroupFk;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/shelving_clean.sql
+++ b/db/routines/vn/procedures/shelving_clean.sql
@ -25,8 +25,9 @@ UPDATE shelving sh
 		AND (
 			sh.parked IS NULL
 			OR
-			sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+			sh.parked < util.VN_CURDATE() - INTERVAL 2 WEEK
 		)
+			
 		AND IF(code REGEXP '^[A-Za-z]{2}[0-9]', LEFT (code, 2) NOT IN (
 				SELECT DISTINCT LEFT(its.shelvingFk, 2)
 					FROM itemShelving its
--- a/db/routines/vn/procedures/ticket_splitItemPackingType.sql
+++ b/db/routines/vn/procedures/ticket_splitItemPackingType.sql
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_splitItemPacki
 	vSelf INT,
 	vOriginalItemPackingTypeFk VARCHAR(1)
 )
-proc: BEGIN
+BEGIN
 /**
 * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
 * Respeta el id inicial para el tipo propuesto.
--- a/db/versions/11248-azureOrchid/00-firstScript.sql
+++ b/db/versions/11248-azureOrchid/00-firstScript.sql
@ -0,0 +1,3 @@
+ALTER TABLE vn.`zone`
+	ADD COLUMN IF NOT EXISTS itemMaxLength int(11) NULL COMMENT 'Longitud maxima para articulos acostados que esa agencia puede transportar',
+	MODIFY COLUMN itemMaxSize int(11) DEFAULT NULL NULL COMMENT 'Altura maxima de los articulos que esa agencia puede transportar';
--- a/db/versions/11253-limeChico/00-firstScript.sql
+++ b/db/versions/11253-limeChico/00-firstScript.sql
@ -0,0 +1,3 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Postcode','*','WRITE','ALLOW','ROLE','administrative');
+
--- a/db/versions/11256-grayFern/00-firstScript.sql
+++ b/db/versions/11256-grayFern/00-firstScript.sql
@ -0,0 +1,6 @@
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Province','*','WRITE','ALLOW','ROLE','administrative');
+
+INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Town','*','WRITE','ALLOW','ROLE','administrative');
+
--- a/modules/item/back/methods/item-shelving/getListItemNewer.js
+++ b/modules/item/back/methods/item-shelving/getListItemNewer.js
@ -63,8 +63,7 @@ module.exports = Self => {
                    FROM tItemShelving ti
                        JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
                        JOIN vn.productionConfig pc
-                    WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created
-                    LIMIT 10;`,
+                    WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created;`,
        [shelvingFk, shelvingFk], myOptions);
        return result;
    };
--- a/modules/supplier/back/methods/supplier/filter.js
+++ b/modules/supplier/back/methods/supplier/filter.js
@ -92,10 +92,13 @@ module.exports = Self => {
                    s.payDay,
                    s.phone,
                    s.city,
+                    s.countryFk,
+                    c.name country,
                    pm.name AS payMethod,
                    pd.payDem AS payDem
                FROM vn.supplier s
                    LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+                    LEFT JOIN vn.country c ON c.id = s.countryFk
                    LEFT JOIN vn.payDem pd ON pd.id = s.payDemFk`
        );

--- a/modules/zone/back/models/zone.json
+++ b/modules/zone/back/models/zone.json
@ -42,6 +42,9 @@
 		},
 		"itemMaxSize": {
 			"type": "number"
+		},
+		"itemMaxLength": {
+			"type": "number"
 		}
 	},
 	"relations": {
--- a/print/templates/reports/previa-label/previa-label.html
+++ b/print/templates/reports/previa-label/previa-label.html
@ -19,7 +19,7 @@
                    <div class="packing">{{previa.itemPackingTypeFk}}</div>
                    <div class="dated">{{previa.shippingHour}}:{{previa.shippingMinute}}</div>
                </div>
-                <div class="size">{{previa.items}}</div>
+                <div class="size">{{previa.previousLines}}</div>
            </div>
        </div>
    </div>