db/routines/vn/procedures/stockBought_calculate.sql

@@ -7,13 +7,13 @@ proc: BEGIN
  * Calculate the stock of the auction warehouse from the inventory date to vDated
  * without taking into account the outputs of the same day vDated
  *
- * @param vDated Date to calculate the stock
+ * @param vDated Date to calculate the stock.
  */
 	IF vDated < util.VN_CURDATE() THEN
 		LEAVE proc;
 	END IF;
 
-	CREATE OR REPLACE TEMPORARY TABLE tCurrentData
+	CREATE OR REPLACE TEMPORARY TABLE tStockBought
 		SELECT workerFk, reserve
 			FROM stockBought
 			WHERE dated = vDated
@@ -21,28 +21,15 @@ proc: BEGIN
 
 	DELETE FROM stockBought WHERE dated = vDated;
 
-	CREATE OR REPLACE TEMPORARY TABLE tStockSold
-		SELECT it.workerFk,
-				SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000) sold
-			FROM itemTicketOut ito
-				JOIN item i ON i.id = ito.itemFk
-				JOIN itemType it ON it.id = i.typeFk
-				JOIN ticket t ON t.id = ito.ticketFk
-				JOIN warehouse wh ON wh.id = t.warehouseFk
-				JOIN itemCost ic ON ic.itemFk = ito.itemFk
-					AND ic.warehouseFk = t.warehouseFk
-				JOIN volumeConfig vc
-			WHERE ito.shipped BETWEEN vDated AND util.dayEnd(vDated)
-				AND wh.code = 'VNH'
-			GROUP BY it.workerFk;
-
 	CALL item_calculateStock(vDated);
 
-	CREATE OR REPLACE TEMPORARY TABLE tStockBought
+	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT it.workerFk,
-				SUM((ti.quantity / b.packing) *
+				ROUND(SUM(
-					buy_getVolume(b.id)
+						(ti.quantity / b.packing) *
-				) / vc.palletM3 / 1000000 bought
+						buy_getVolume(b.id)
+					) / vc.palletM3 / 1000000, 1) bought,
+				vDated
 			FROM itemType it
 				JOIN item i ON i.typeFk = it.id
 				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
@@ -56,33 +43,20 @@ proc: BEGIN
 			GROUP BY it.workerFk
 			HAVING bought;
 
-	
-	INSERT INTO stockBought(workerFk, bought, dated)
-		SELECT tb.workerFk, 
-				ROUND(GREATEST(tb.bought - IFNULL(ts.sold, 0), 0), 1), 
-				vDated
-			FROM tStockBought tb 
-				LEFT JOIN tStockSold ts ON ts.workerFk = tb.workerFk;
-
 	UPDATE stockBought s
-			JOIN tCurrentData ts ON ts.workerFk = s.workerFk
+			JOIN tStockBought ts ON ts.workerFk = s.workerFk
 				SET s.reserve = ts.reserve
 		WHERE s.dated = vDated;
 
 	INSERT INTO stockBought (workerFk, reserve, dated)
 		SELECT ts.workerFk, ts.reserve, vDated
-			FROM tCurrentData ts
+			FROM tStockBought ts
 			WHERE ts.workerFk NOT IN (
 				SELECT workerFk
 					FROM stockBought
 					WHERE dated = vDated
 			);
 
-	UPDATE stockBought s
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
-			JOIN tStockSold ts ON ts.workerFk = s.workerFk
-				SET s.bought = IF(s.bought < ts.sold, ROUND(s.bought - ts.sold, 1), 0)
-		WHERE s.dated = vDated;
-
-	DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold;
 END$$
 DELIMITER ;

db/versions/11251-navyChrysanthemum/01-firstScript.sql

@@ -1 +1 @@
--- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';
+ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';