From 2fe279ed47f3a54dcfad9e9b44865a4f7abd82e0 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 24 May 2024 07:20:27 +0200
Subject: [PATCH] feat: refs #7438 Requested changes and little changes

---
 ...nventory.sql => item_valuateInventory.sql} | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)
 rename db/routines/vn/procedures/{item_ValuateInventory.sql => item_valuateInventory.sql} (89%)

diff --git a/db/routines/vn/procedures/item_ValuateInventory.sql b/db/routines/vn/procedures/item_valuateInventory.sql
similarity index 89%
rename from db/routines/vn/procedures/item_ValuateInventory.sql
rename to db/routines/vn/procedures/item_valuateInventory.sql
index 137f76654..18aefdf7b 100644
--- a/db/routines/vn/procedures/item_ValuateInventory.sql
+++ b/db/routines/vn/procedures/item_valuateInventory.sql
@@ -17,8 +17,7 @@ BEGIN
 	SELECT tr.landed INTO vInventoried
 		FROM travel tr
 			JOIN `entry` e ON e.travelFk = tr.id
-			JOIN entryConfig ec
-		WHERE landed <= vDateDayEnd
+		WHERE tr.landed <= vDateDayEnd
 			AND e.supplierFk = vInventorySupplierFk
 		ORDER BY tr.landed DESC
 		LIMIT 1;
@@ -29,8 +28,7 @@ BEGIN
 		SELECT landed INTO vInventoryClone
 			FROM travel tr
 				JOIN `entry` e ON e.travelFk = tr.id
-				JOIN entryConfig ec
-			WHERE landed >= vDated
+			WHERE tr.landed >= vDated
 				AND e.supplierFk = vInventorySupplierFk
 			ORDER BY landed ASC
 			LIMIT 1;
@@ -63,9 +61,8 @@ BEGIN
 					JOIN `entry` e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 					JOIN itemType t ON t.id = i.typeFk
-					JOIN warehouse w ON w.id = warehouseInFk
-					JOIN entryConfig ec 
-				WHERE landed = vDateDayEnd
+					JOIN warehouse w ON w.id = tr.warehouseInFk
+				WHERE tr.landed = vDateDayEnd
 					AND e.supplierFk = vInventorySupplierFk
 					AND w.valuatedInventory
 					AND t.isInventory
@@ -81,9 +78,8 @@ BEGIN
 					JOIN `entry` e ON e.id = b.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 					JOIN itemType t ON t.id = i.typeFk
-					JOIN warehouse w ON w.id = warehouseInFk
-					JOIN entryConfig ec 
-				WHERE landed = vInventoried
+					JOIN warehouse w ON w.id = tr.warehouseInFk
+				WHERE tr.landed = vInventoried
 					AND e.supplierFk = vInventorySupplierFk
 					AND w.valuatedInventory
 					AND t.isInventory
@@ -102,7 +98,6 @@ BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				JOIN itemType t ON t.id = i.typeFk
 				JOIN warehouse w ON w.id = tr.warehouseInFk
-				JOIN entryConfig ec
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
 				AND NOT e.isRaid
@@ -188,19 +183,16 @@ BEGIN
 		
 	CALL buyUltimate(NULL, vDateDayEnd);
 
-	UPDATE tInventory i
-			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
-			JOIN buy b ON b.id = bu.buyFk
-		SET total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
-			cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)
-		WHERE i.quantity;
-
 	DELETE FROM tInventory WHERE quantity IS NULL OR NOT quantity;
 
 	UPDATE tInventory i
-		JOIN itemCost ic ON ic.itemFk = i.itemFk
-			AND ic.warehouseFk = i.warehouseFk
-		SET i.volume = i.quantity * ic.cm3delivery / 1000000;
+			JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
+			JOIN buy b ON b.id = bu.buyFk
+			LEFT JOIN itemCost ic ON ic.itemFk = i.itemFk
+				AND ic.warehouseFk = i.warehouseFk
+		SET i.total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
+			i.cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0),
+			i.volume = i.quantity * ic.cm3delivery / 1000000;
 
 	SELECT ti.warehouseFk,
 			i.id,