refs #6281 feat:buyFk in itemShelving

db/routines/vn/procedures/itemShelvingTransfer.sql

@@ -24,6 +24,7 @@ BEGIN
 				ON ish2.itemFk = ish.itemFk
 				AND ish2.packing = ish.packing
 				AND date(ish2.created) = date(ish.created)
+				AND ish2.buyFk = ish.buyFk
 		WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci;
 
 	IF vNewItemShelvingFk THEN

db/routines/vn/procedures/itemShelving_add.sql

@@ -1,8 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
 BEGIN
-	
-
 /**
  * Añade registro o lo actualiza si ya existe.
  *
@@ -15,12 +13,24 @@ BEGIN
  * @param vWarehouseFk indica el sector
  * 
  **/
-
 	DECLARE vItemFk INT;
+	DECLARE vBuyFk INT;
 
-	SELECT barcodeToItem(vBarcode) INTO vItemFk;
+	SELECT id INTO vBuyFk 
+		FROM buy WHERE id = vBarcode;
+	
+	SELECT  barcodeToItem(vBarcode) INTO vItemFk;
+	
+	IF vBuyFk IS NULL THEN
+		CALL cache.last_buy_refresh(FALSE);
+	
+		SELECT buy_id INTO vBuyFk
+			FROM cache.last_buy 
+			WHERE item_id = vItemFk 
+				AND warehouse_id = vWarehouseFk;
+	END IF;
 
-	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
+	IF NOT (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) THEN
 
 		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
 		INSERT INTO shelving(code, parkingFk) 
@@ -31,33 +41,37 @@ BEGIN
 	END IF;
 
 	IF (SELECT COUNT(*) FROM itemShelving 
-			WHERE shelvingFk COLLATE utf8_unicode_ci  = vShelvingFk 
-				AND itemFk  = vItemFk 
-				AND packing  = vPacking) = 1 THEN
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk 
+				AND itemFk = vItemFk 
+				AND packing = vPacking
+				AND buyFk = vBuyFk) THEN
 
 		UPDATE itemShelving
-			SET visible = visible+vQuantity
-			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking; 
+			SET visible = visible + vQuantity
+			WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk 
+				AND itemFk = vItemFk 
+				AND packing = vPacking
+				AND buyFk = vBuyFk;
 
 	ELSE
-		CALL cache.last_buy_refresh(FALSE);
-		INSERT INTO itemShelving(   itemFk,
-                                    shelvingFk,
-                                    visible,
-                                    grouping,
-                                    packing,
-                                    packagingFk)
 
-		SELECT  vItemFk,
-                vShelvingFk,
-                vQuantity,
-                IFNULL(vGrouping, b.grouping),
-                IFNULL(vPacking, b.packing),
-                IFNULL(vPackagingFk, b.packagingFk)
-            FROM item i
-				LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
-				LEFT JOIN buy b ON b.id = lb.buy_id
-			WHERE i.id = vItemFk;
+		INSERT INTO itemShelving(
+					itemFk,
+					shelvingFk,
+					visible,
+					grouping,
+					packing,
+					packagingFk,
+					buyFk)
+			SELECT vItemFk,
+					vShelvingFk,
+					vQuantity,
+					IFNULL(vGrouping, b.grouping),
+					IFNULL(vPacking, b.packing),
+					IFNULL(vPackagingFk, b.packagingFk),
+					id
+				FROM buy b
+				WHERE id = vBuyFk;
 	END IF;
 END$$
 DELIMITER ;