db changes and acl for logistic boss on section item-botanical

db/changes/10290-invoiceIn/00-ACL.sql

@@ -2,4 +2,3 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
     VALUES 
         ('StarredModule', '*', '*', 'ALLOW', 'ROLE', 'employee'),
         ('ItemBotanical', '*', 'WRITE', 'ALLOW', 'ROLE', 'logisticBoss');
-

db/dump/structure.sql

@@ -10474,6 +10474,429 @@ proc: BEGIN
 
 	
 	
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode              = @saved_sql_mode */ ;
+/*!50003 SET character_set_client  = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection  = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh__` */;
+/*!50003 SET @saved_cs_client      = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results     = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client  = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection  = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
+/*!50003 SET sql_mode              = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh__`()
+proc: BEGIN
+ 
+	DECLARE vLanded DATETIME;
+	DECLARE done INT DEFAULT FALSE;
+	DECLARE vFreeId INT;
+	DECLARE vSupplyResponseFk INT;
+	DECLARE vLastInserted DATETIME;
+    DECLARE vIsAuctionDay BOOLEAN;
+    DECLARE vMaxNewItems INT DEFAULT 100000;
+   	DECLARE vStartingTime DATETIME;
+    
+	DECLARE cur1 CURSOR FOR 
+		SELECT id 
+			FROM edi.item_free;
+            
+	DECLARE cur2 CURSOR FOR 
+		SELECT srId 
+			FROM itemToInsert;
+            
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+	
+	SET vStartingTime = NOW();
+
+    -- CALL vn.clean_logiflora();
+    
+	-- Refresca las fotos de los items existentes, con prioridad baja (0.7 seg)
+    INSERT IGNORE INTO vn.itemImageQueue(itemFk, url,priority)
+		SELECT i.id, sr.PictureReference , 100
+			FROM edi.supplyResponse sr 
+				JOIN vn.item i ON i.supplyResponseFk = sr.ID 
+			WHERE i.image != edi.imageName(sr.PictureReference)
+			AND sr.NumberOfUnits > 0;
+    
+	DELETE itf.* 
+		FROM edi.item_free itf
+			JOIN vn.item i ON i.id = itf.id;
+	
+   -- -- select now(),'Tras borrar';
+ 	DROP TEMPORARY TABLE IF EXISTS tmp;
+	CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
+		SELECT 	t.*, 
+				IFNULL(idt.itemTypeFk, igo.itemTypeFk) itemTypeFk, 
+				igo.expenseFk , 
+				igo.intrastatFk , 
+				igo.originFk 
+			FROM (
+			SELECT *
+				FROM edi.supplyOffer 
+				ORDER BY NumberOfUnits DESC) t
+			JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id
+			LEFT JOIN edi.item_defaultType idt ON idt.item_id = t.Item_ArticleCode
+		GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price ;
+        
+																							 	-- -- select now(),'Antes de crear edi.offer';
+	DROP TEMPORARY TABLE IF EXISTS edi.offer;
+	CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY
+		SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value, 
+				ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value,
+				eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6
+			FROM tmp so
+				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
+					AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
+					AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
+					AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
+					AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL 
+				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
+					AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
+				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
+					AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
+				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
+				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
+				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
+				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
+				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
+				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
+			ORDER BY Price;
+
+	DROP TEMPORARY TABLE tmp;	
+
+		
+   	START TRANSACTION;	
+   
+	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
+	UPDATE IGNORE edi.offer o 
+			LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID
+			JOIN vn.item i 
+				ON i.name = o.product_name 
+				AND i.subname <=> o.company_name 
+				AND i.value5 <=> o.s1Value 
+                AND i.value6 <=> o.s2Value 
+				AND i.value7 <=> o.s3Value 
+                AND i.value8 <=> o.s4Value
+				AND i.value9 <=> o.s5Value 
+                AND i.value10 <=> o.s6Value
+                AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
+                AND i.EmbalageCode <=> o.EmbalageCode
+                AND i.quality <=> o.Quality
+            LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk
+            JOIN vn.itemType it ON it.id = i.typeFk
+		SET i.supplyResponseFk = o.srID
+		WHERE iExist.id IS NULL 
+			AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL)
+            AND it.isInventory
+        ;
+																					 	-- select now(),'Antes de crear ITO';
+	DROP TEMPORARY TABLE IF EXISTS itemToInsert;
+	CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
+		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
+			FROM edi.offer o 
+				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
+		WHERE i.id IS NULL
+	LIMIT vMaxNewItems;
+
+	-- Reciclado de nº de item
+	OPEN cur1;
+	OPEN cur2;
+	
+	read_loop: LOOP
+	 
+		FETCH cur2 INTO vSupplyResponseFk;
+		FETCH cur1 INTO vFreeId;
+
+		IF done THEN
+		  LEAVE read_loop;
+		END IF;
+
+		UPDATE itemToInsert
+			SET itemFk = vFreeId
+			WHERE srId = vSupplyResponseFk;
+		
+	END LOOP;
+
+	CLOSE cur1;
+	CLOSE cur2;
+
+	-- Insertamos todos los items en Articles de la oferta
+	INSERT INTO vn.item(	id, 
+							`name`,
+							longName,  
+                            subName,
+							expenceFk, 
+							typeFk, 
+							intrastatFk,
+							originFk,
+							supplyResponseFk,
+                            numberOfItemsPerCask,
+                            embalageCode,
+                            quality,
+                            isFloramondo) 
+		SELECT 	itemFk,
+				product_name,
+				product_name,
+                company_name,
+				expenseFk,
+				itemTypeFk,
+				intrastatFk,
+				originFk,
+				`srId`,
+				NumberOfItemsPerCask,
+                EmbalageCode,
+                Quality,
+                TRUE
+		FROM itemToInsert;
+   
+	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
+		SELECT i.id, PictureReference
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.srId
+			WHERE PictureReference IS NOT NULL;
+
+	INSERT INTO edi.log(tableName, fieldName,fieldValue) 
+		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
+			FROM vn.itemImageQueue 
+			WHERE attempts = 0;
+		
+	-- Inserta si se añadiesen tags nuevos
+	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
+		SELECT description, type_id FROM edi.type;
+
+	-- Inserta los tags sólo en los articulos nuevos
+
+	-- desabilita el trigger para recalcular los tags al final    
+	 SET @isTriggerDisabled = TRUE;
+	
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.product_name, 1	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Producto'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+                
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.Quality, 3
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Calidad'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , ii.company_name, 4
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.`name` = 'Productor'
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
+                
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s1Value, 5	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s1Value != '';
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s2Value, 6	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s2Value != '';
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s3Value, 7	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s3Value != '';    
+				
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s4Value, 8	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s4Value != '';
+							
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s5Value, 9	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s5Value != '';
+            
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id , s6Value, 10	
+			FROM itemToInsert ii
+				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+			WHERE s6Value != '';
+            
+	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
+		SELECT i.id, t.id, ink.name, 11	
+			FROM itemToInsert ii
+				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
+				JOIN vn.tag t ON t.`name` = 'Color'
+                JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
+                JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
+                JOIN vn.ink ON ink.dutchCode = f.feature_value;
+
+	UPDATE vn.item i
+			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
+			JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
+			JOIN vn.itemTag diameter ON diameter.itemFk = i.id
+			JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
+			JOIN vn.itemTag size ON size.itemFk = i.id
+			JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
+		SET i.`compression` = 
+					(PI() * POW(diameter.`value`/ 2, 2) * size.`value`) 
+						/ 
+					((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);   
+                    
+	DROP TABLE IF EXISTS tmp.item;
+	CREATE TABLE tmp.item
+		(PRIMARY KEY (id))
+		SELECT i.id FROM vn.item i 
+			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
+	
+	CALL vn.item_refreshTags();
+	
+	SET @isTriggerDisabled = FALSE; 
+    
+	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
+		FROM edi.supplyResponse sr 
+			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
+			JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+            JOIN vn.floramondoConfig fc
+		WHERE mp.isLatestOrderDateTimeRelevant
+			AND di.LatestOrderDateTime > IF(fc.MaxLatestOrderHour > HOUR(NOW()), CURDATE(), TIMESTAMPADD(DAY,1,CURDATE()));
+            
+    UPDATE vn.floramondoConfig 
+		SET nextLanded = vLanded
+		WHERE vLanded IS NOT NULL;
+   
+    
+	-- Elimina la oferta obsoleta
+	UPDATE vn.buy b
+			JOIN vn.entry e ON e.id = b.entryFk
+			JOIN vn.travel tr ON tr.id = e.travelFk 
+			JOIN vn.agencyMode am ON am.id = tr.agencyFk 
+			JOIN vn.item i ON i.id = b.itemFk
+			JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
+			LEFT JOIN edi.putOrder po ON b.deliveryFk = po.deliveryInformationID
+			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
+		SET b.quantity = 0
+		WHERE  (po.id IS NULL OR di.LatestOrderDateTime < NOW())
+			AND sr.ID IS NULL 
+			AND am.name = 'LOGIFLORA'
+			AND e.isRaid;
+		          
+	UPDATE vn.buy b
+		JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+		JOIN vn.item i ON i.id = b.itemFk
+		LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
+		SET b.quantity = 0
+		WHERE sr.ID IS NULL;
+
+	-- Localiza las entradas de cada almacen
+	UPDATE edi.warehouseFloramondo
+		SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
+	
+    IF vLanded IS NOT NULL THEN		
+			-- actualiza la oferta existente	
+		UPDATE vn.buy b
+			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+			JOIN vn.item i ON i.id = b.itemFk
+			JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
+			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
+				b.buyingValue = o.price
+			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
+
+		-- Se eliminan las ofertas ya incluidas en las entradas
+		DELETE o
+			FROM edi.offer o
+			JOIN vn.item i ON i.supplyResponseFk = o.srId
+			JOIN vn.buy b ON i.id = b.itemFk 
+			JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk;
+			
+		-- Se inserta el resto
+		SET vLastInserted := NOW();
+		
+		-- Inserta la oferta   
+		INSERT INTO vn.buy(entryFk, 
+							itemFk,
+							quantity, 
+							buyingValue, 
+							stickers, 
+							packing, 
+							`grouping`, 
+							groupingMode, 
+							packageFk,
+							deliveryFk)
+
+		SELECT  wf.entryFk,
+				i.id,
+				o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
+				o.Price,
+				o.NumberOfUnits as etiquetas,
+				o.NumberOfItemsPerCask as packing,
+				GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask as `grouping`,
+				2, -- Obliga al Packing
+				o.embalageCode,
+				o.diId
+			FROM edi.offer o
+				JOIN vn.item i ON i.supplyResponseFk = o.srId
+				JOIN vn.itemType it ON it.id = i.typeFk
+				JOIN edi.warehouseFloramondo wf ON wf.isFV = it.isFV OR wf.isFV IS NULL
+				JOIN vn.packaging p ON p.id LIKE o.embalageCode; -- llevar esta linea i mirar de crear els packages a temps real
+						
+			DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
+			
+			CREATE TEMPORARY TABLE tmp.buyRecalc
+			SELECT b.id 
+				FROM vn.buy b
+					JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+				WHERE b.created >= vLastInserted;
+				
+			CALL vn.buy_recalcPrices();
+	
+    END IF;
+    
+	DROP TEMPORARY TABLE 
+		edi.offer, 
+        itemToInsert;
+        
+	DROP TABLE tmp.item; 
+
+	COMMIT;		
+
+	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
+	UPDATE vn.item i
+		SET typeFk = 121
+		WHERE i.longName LIKE 'Rosa Garden %'
+			AND typeFk = 17;
+		
+	UPDATE vn.item i
+		SET typeFk = 156
+		WHERE i.longName LIKE 'Rosa ec %'
+			AND typeFk = 17;
+
+	INSERT INTO edi.log(tableName, fieldName,fieldValue) 
+		VALUES('floramondo_offerRefresh','Tiempo de proceso',TIMEDIFF(NOW(),vStartingTime));
+
+	
+	
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -33971,7 +34394,16 @@ DELIMITER ;;
 BEFORE INSERT
 ON receipt FOR EACH ROW
 BEGIN
+	DECLARE vIsAutoConciliated BOOLEAN;
 
+	IF NEW.isConciliate = FALSE THEN
+		SELECT isAutoConciliated INTO vIsAutoConciliated
+			FROM accounting a
+				JOIN accountingType at2 ON at2.id = a.accountingTypeFk
+			WHERE a.id = NEW.bankFk;
+	
+		SET NEW.isConciliate = vIsAutoConciliated;
+	END IF;
 END */;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;