Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev Build queued...
Details
gitea/salix/pipeline/pr-dev Build queued...
Details
This commit is contained in:
commit
ec7dc390b9
|
|
@ -24,7 +24,7 @@ node {
|
|||
FROM_GIT = env.JOB_NAME.startsWith('gitea/')
|
||||
RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
|
||||
RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
|
||||
env.DEBUG = 'strong-remoting:shared-method'
|
||||
// env.DEBUG = 'strong-remoting:shared-method'
|
||||
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
||||
echo "NODE_NAME: ${env.NODE_NAME}"
|
||||
echo "WORKSPACE: ${env.WORKSPACE}"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ BEGIN
|
|||
WHERE sub.amountTaxableBase<>sub2.amountTaxableBase
|
||||
AND sub.amountTaxableBase/2 <> sub2.amountTaxableBase
|
||||
UNION ALL
|
||||
SELECT CONCAT('- Factura Duplicada: ', mc.Asiento)
|
||||
SELECT CONCAT('- Factura Duplicada: ', accountingEntryFk)
|
||||
FROM accountingEntryError
|
||||
)sub;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,138 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`available_traslate`(
|
||||
vWarehouseLanding INT,
|
||||
vDated DATE,
|
||||
vWarehouseShipment INT)
|
||||
proc: BEGIN
|
||||
/**
|
||||
* Calcular la disponibilidad dependiendo del almacen
|
||||
* de origen y destino según la fecha.
|
||||
*
|
||||
* @param vWarehouseLanding Almacén de llegada
|
||||
* @param vDated Fecha del calculo para la disponibilidad de articulos
|
||||
* @param vWarehouseShipment Almacén de destino
|
||||
*/
|
||||
DECLARE vDatedFrom DATE;
|
||||
DECLARE vDatedTo DATETIME;
|
||||
DECLARE vDatedReserve DATETIME;
|
||||
DECLARE vDatedInventory DATE;
|
||||
|
||||
IF vDated < util.VN_CURDATE() THEN
|
||||
LEAVE proc;
|
||||
END IF;
|
||||
|
||||
CALL item_getStock (vWarehouseLanding, vDated, NULL);
|
||||
|
||||
-- Calcula algunos parámetros necesarios.
|
||||
SET vDatedFrom = vDated;
|
||||
SET vDatedTo = util.dayEnd (vDated + INTERVAL 4 DAY);
|
||||
SELECT inventoried INTO vDatedInventory FROM config;
|
||||
SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
|
||||
FROM hedera.orderConfig;
|
||||
|
||||
-- Calcula el ultimo dia de vida para cada producto.
|
||||
CREATE OR REPLACE TEMPORARY TABLE tItemRange
|
||||
(PRIMARY KEY (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT c.itemFk, MAX(t.landed) dated
|
||||
FROM buy c
|
||||
JOIN entry e ON c.entryFk = e.id
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
JOIN warehouse w ON w.id = t.warehouseInFk
|
||||
WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
|
||||
AND t.warehouseInFk = vWarehouseLanding
|
||||
AND NOT e.isExcludedFromAvailable
|
||||
AND NOT e.isRaid
|
||||
GROUP BY c.itemFk;
|
||||
|
||||
-- Tabla con el ultimo dia de last_buy para cada producto
|
||||
-- que hace un replace de la anterior.
|
||||
CALL buyUltimate(vWarehouseShipment, util.VN_CURDATE());
|
||||
|
||||
INSERT INTO tItemRange
|
||||
SELECT t.itemFk, tr.landed
|
||||
FROM tmp.buyUltimate t
|
||||
JOIN buy b ON b.id = t.buyFk
|
||||
JOIN entry e ON e.id = b.entryFk
|
||||
JOIN travel tr ON tr.id = e.travelFk
|
||||
LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
|
||||
WHERE t.warehouseFk = vWarehouseShipment
|
||||
AND NOT e.isRaid
|
||||
ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
|
||||
tr.landed);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tItemRangeLive
|
||||
(PRIMARY KEY (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT ir.itemFk, util.dayEnd(ir.dated + INTERVAL it.life DAY) dated
|
||||
FROM tItemRange ir
|
||||
JOIN item i ON i.id = ir.itemFk
|
||||
JOIN itemType it ON it.id = i.typeFk
|
||||
HAVING dated >= vDatedFrom OR dated IS NULL;
|
||||
|
||||
-- Calcula el ATP.
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
|
||||
(INDEX (itemFk,warehouseFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT i.itemFk,
|
||||
vWarehouseLanding warehouseFk,
|
||||
i.shipped dated,
|
||||
i.quantity
|
||||
FROM itemTicketOut i
|
||||
JOIN tItemRangeLive ir ON ir.itemFK = i.itemFk
|
||||
WHERE i.shipped >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
||||
AND i.warehouseFk = vWarehouseLanding
|
||||
UNION ALL
|
||||
SELECT b.itemFk,
|
||||
vWarehouseLanding,
|
||||
t.landed,
|
||||
b.quantity
|
||||
FROM buy b
|
||||
JOIN entry e ON b.entryFk = e.id
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
|
||||
WHERE NOT e.isExcludedFromAvailable
|
||||
AND b.quantity <> 0
|
||||
AND NOT e.isRaid
|
||||
AND t.warehouseInFk = vWarehouseLanding
|
||||
AND t.landed >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR t.landed <= ir.dated)
|
||||
UNION ALL
|
||||
SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity
|
||||
FROM itemEntryOut i
|
||||
JOIN tItemRangeLive ir ON ir.itemFk = i.itemFk
|
||||
WHERE i.shipped >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
||||
AND i.warehouseOutFk = vWarehouseLanding
|
||||
UNION ALL
|
||||
SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount
|
||||
FROM hedera.order_row r
|
||||
JOIN hedera.`order` o ON o.id = r.order_id
|
||||
JOIN tItemRangeLive ir ON ir.itemFk = r.item_id
|
||||
WHERE r.shipment >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR r.shipment <= ir.dated)
|
||||
AND r.warehouse_id = vWarehouseLanding
|
||||
AND r.created >= vDatedReserve
|
||||
AND NOT o.confirmed;
|
||||
|
||||
CALL item_getAtp(vDated);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.availableTraslate
|
||||
(PRIMARY KEY (item_id))
|
||||
ENGINE = MEMORY
|
||||
SELECT t.item_id, SUM(stock) available
|
||||
FROM (
|
||||
SELECT ti.itemFk item_id, stock
|
||||
FROM tmp.itemList ti
|
||||
JOIN tItemRange ir ON ir.itemFk = ti.itemFk
|
||||
UNION ALL
|
||||
SELECT itemFk, quantity
|
||||
FROM tmp.itemAtp
|
||||
) t
|
||||
GROUP BY t.item_id
|
||||
HAVING available <> 0;
|
||||
|
||||
DROP TEMPORARY TABLE tmp.itemList, tItemRange, tItemRangeLive;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,217 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balance_create`(
|
||||
IN vStartingMonth INT,
|
||||
IN vEndingMonth INT,
|
||||
IN vCompany INT,
|
||||
IN vIsConsolidated BOOLEAN,
|
||||
IN vInterGroupSalesIncluded BOOLEAN)
|
||||
BEGIN
|
||||
/**
|
||||
* Crea un balance financiero para una empresa durante
|
||||
* un período de tiempo determinado.
|
||||
*
|
||||
* @param vStartingMonth Mes de inicio del período
|
||||
* @param vEndingMonth Mes de finalización del período
|
||||
* @param vCompany Identificador de la empresa
|
||||
* @param vIsConsolidated Indica si se trata de un balance consolidado
|
||||
* @param vInterGroupSalesIncluded Indica si se incluyen las ventas del grupo
|
||||
*/
|
||||
DECLARE intGAP INT DEFAULT 7;
|
||||
DECLARE vYears INT DEFAULT 2;
|
||||
DECLARE vYear TEXT;
|
||||
DECLARE vOneYearAgo TEXT;
|
||||
DECLARE vTwoYearsAgo TEXT;
|
||||
DECLARE vQuery TEXT;
|
||||
DECLARE vConsolidatedGroup INT;
|
||||
DECLARE vStartingDate DATE DEFAULT '2020-01-01';
|
||||
DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
|
||||
DECLARE vStartingYear INT DEFAULT vCurYear - 2;
|
||||
DECLARE vTable TEXT;
|
||||
|
||||
SET vTable = util.quoteIdentifier('balanceNestTree');
|
||||
SET vYear = util.quoteIdentifier(vCurYear);
|
||||
SET vOneYearAgo = util.quoteIdentifier(vCurYear-1);
|
||||
SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2);
|
||||
|
||||
-- Solicitamos la tabla tmp.nest, como base para el balance.
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.nest;
|
||||
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'CREATE TEMPORARY TABLE tmp.nest
|
||||
SELECT node.id
|
||||
,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1),
|
||||
node.name) name,
|
||||
node.lft,
|
||||
node.rgt,
|
||||
COUNT(parent.id) - 1 depth,
|
||||
CAST((node.rgt - node.lft - 1) / 2 AS DECIMAL) sons
|
||||
FROM ', vTable, ' node,
|
||||
', vTable, ' parent
|
||||
WHERE node.lft BETWEEN parent.lft AND parent.rgt
|
||||
GROUP BY node.id
|
||||
ORDER BY node.lft')
|
||||
USING intGAP;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.balance
|
||||
SELECT * FROM tmp.nest;
|
||||
|
||||
SELECT companyGroupFk INTO vConsolidatedGroup
|
||||
FROM company
|
||||
WHERE id = vCompany;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tCompanyReceiving
|
||||
SELECT id companyFk
|
||||
FROM company
|
||||
WHERE id = vCompany
|
||||
OR companyGroupFk = IF(vIsConsolidated, vConsolidatedGroup, NULL);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tCompanyIssuing
|
||||
SELECT id companyFk
|
||||
FROM supplier p;
|
||||
|
||||
IF NOT vInterGroupSalesIncluded THEN
|
||||
|
||||
DELETE ci
|
||||
FROM tCompanyIssuing ci
|
||||
JOIN company e on e.id = ci.companyFk
|
||||
WHERE e.companyGroupFk = vConsolidatedGroup;
|
||||
|
||||
END IF;
|
||||
|
||||
-- Se calculan las facturas que intervienen,
|
||||
-- para luego poder servir el desglose desde aqui.
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.balanceDetail
|
||||
SELECT cr.companyFk receivingId,
|
||||
ci.companyFk issuingId,
|
||||
YEAR(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `year`,
|
||||
MONTH(IFNULL(r.bookEntried,IFNULL(r.booked, r.issued))) `month`,
|
||||
expenseFk,
|
||||
SUM(taxableBase) amount
|
||||
FROM invoiceIn r
|
||||
JOIN invoiceInTax ri on ri.invoiceInFk = r.id
|
||||
JOIN tCompanyReceiving cr on cr.companyFk = r.companyFk
|
||||
JOIN tCompanyIssuing ci ON ci.companyFk = r.supplierFk
|
||||
WHERE COALESCE(r.bookEntried, r.booked, r.issued) >= vStartingDate
|
||||
AND r.isBooked
|
||||
GROUP BY expenseFk, `year`, `month`, ci.companyFk, cr.companyFk;
|
||||
|
||||
INSERT INTO tmp.balanceDetail(
|
||||
receivingId,
|
||||
issuingId,
|
||||
`year`,
|
||||
`month`,
|
||||
expenseFk,
|
||||
amount)
|
||||
SELECT em.companyFk,
|
||||
em.companyFk,
|
||||
`year`,
|
||||
`month`,
|
||||
expenseFk,
|
||||
SUM(em.amount)
|
||||
FROM expenseManual em
|
||||
JOIN tCompanyReceiving er ON er.companyFk = em.companyFk
|
||||
WHERE `year` >= vStartingYear
|
||||
AND `month` BETWEEN vStartingMonth AND vEndingMonth
|
||||
GROUP BY expenseFk, `year`, `month`, em.companyFk;
|
||||
|
||||
DELETE FROM tmp.balanceDetail
|
||||
WHERE `month` < vStartingMonth
|
||||
OR `month` > vEndingMonth;
|
||||
|
||||
-- Ahora el balance
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'ALTER TABLE tmp.balance
|
||||
ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL ,
|
||||
ADD COLUMN ', vOneYearAgo ,' INT(10) NULL ,
|
||||
ADD COLUMN ', vYear,' INT(10) NULL ,
|
||||
ADD COLUMN expenseFk VARCHAR(10) NULL,
|
||||
ADD COLUMN expenseName VARCHAR(45) NULL');
|
||||
|
||||
-- Añadimos los gastos, para facilitar el formulario
|
||||
UPDATE tmp.balance b
|
||||
JOIN balanceNestTree bnt on bnt.id = b.id
|
||||
JOIN expense e ON e.id = bnt.expenseFk COLLATE utf8_general_ci
|
||||
SET b.expenseFk = e.id COLLATE utf8_general_ci,
|
||||
b.expenseName = e.name COLLATE utf8_general_ci ;
|
||||
|
||||
-- Rellenamos los valores de primer nivel, los que corresponden
|
||||
-- a los gastos simples.
|
||||
WHILE vYears >= 0 DO
|
||||
SET vQuery = CONCAT(
|
||||
'UPDATE tmp.balance b
|
||||
JOIN (
|
||||
SELECT expenseFk, SUM(amount) amount
|
||||
FROM tmp.balanceDetail
|
||||
WHERE year = ?
|
||||
GROUP BY expenseFk
|
||||
) sub on sub.expenseFk = b.expenseFk COLLATE utf8_general_ci
|
||||
SET ', util.quoteIdentifier(vCurYear - vYears), ' = - amount');
|
||||
|
||||
EXECUTE IMMEDIATE vQuery
|
||||
USING vCurYear - vYears;
|
||||
|
||||
SET vYears = vYears - 1;
|
||||
END WHILE;
|
||||
|
||||
-- Añadimos las ventas.
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'UPDATE tmp.balance b
|
||||
JOIN (
|
||||
SELECT SUM(IF(year = ?, venta, 0)) y2,
|
||||
SUM(IF(year = ?, venta, 0)) y1,
|
||||
SUM(IF(year = ?, venta, 0)) y0,
|
||||
c.Gasto
|
||||
FROM bs.ventas_contables c
|
||||
JOIN tCompanyReceiving cr ON cr.companyFk = c.empresa_id
|
||||
WHERE month BETWEEN ? AND ?
|
||||
GROUP BY c.Gasto
|
||||
) sub ON sub.gasto = b.expenseFk COLLATE utf8_general_ci
|
||||
SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2,
|
||||
b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1,
|
||||
b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0')
|
||||
USING vCurYear-2,
|
||||
vCurYear-1,
|
||||
vCurYear,
|
||||
vStartingMonth,
|
||||
vEndingMonth;
|
||||
|
||||
-- Ventas intra grupo.
|
||||
IF NOT vInterGroupSalesIncluded THEN
|
||||
|
||||
SELECT lft, rgt INTO @groupLft, @groupRgt
|
||||
FROM tmp.balance b
|
||||
WHERE TRIM(b.`name`) = 'Grupo';
|
||||
|
||||
DELETE
|
||||
FROM tmp.balance
|
||||
WHERE lft BETWEEN @groupLft AND @groupRgt;
|
||||
|
||||
END IF;
|
||||
|
||||
-- Rellenamos el valor de los padres con la suma de los hijos.
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.balance_aux
|
||||
SELECT * FROM tmp.balance;
|
||||
|
||||
EXECUTE IMMEDIATE
|
||||
CONCAT('UPDATE tmp.balance b
|
||||
JOIN (
|
||||
SELECT b1.id,
|
||||
b1.name,
|
||||
SUM(b2.', vYear,') thisYear,
|
||||
SUM(b2.', vOneYearAgo,') oneYearAgo,
|
||||
SUM(b2.', vTwoYearsAgo,') twoYearsAgo
|
||||
FROM tmp.nest b1
|
||||
JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
|
||||
GROUP BY b1.id
|
||||
)sub ON sub.id = b.id
|
||||
SET b.', vYear, ' = thisYear,
|
||||
b.', vOneYearAgo, ' = oneYearAgo,
|
||||
b.', vTwoYearsAgo, ' = twoYearsAgo');
|
||||
|
||||
SELECT *, CONCAT('',IFNULL(expenseFk,'')) newgasto
|
||||
FROM tmp.balance;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tCompanyReceiving, tCompanyIssuing;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -19,10 +19,10 @@ BEGIN
|
|||
AND a.hasWeightVolumetric
|
||||
LIMIT 1;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.buysToCheck;
|
||||
DROP TEMPORARY TABLE tmp.buysToCheck;
|
||||
|
||||
IF hasVolumetricAgency THEN
|
||||
CALL util.throw('Some purchase line has an item without size or weight per stem in the volumetric agency.');
|
||||
IF hasVolumetricAgency THEN
|
||||
CALL util.throw('Item lacks size/weight in purchase line at agency');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -15,7 +15,7 @@ BEGIN
|
|||
FROM `entry`
|
||||
WHERE id = vSelf;
|
||||
|
||||
IF vIsBooked AND NOT @isModeInventory THEN
|
||||
IF vIsBooked AND NOT IFNULL(@isModeInventory, FALSE) THEN
|
||||
CALL util.throw('Entry is already booked');
|
||||
END IF;
|
||||
END$$
|
||||
|
|
|
|||
|
|
@ -68,19 +68,19 @@ BEGIN
|
|||
AND v.`visible`
|
||||
ON DUPLICATE KEY UPDATE visibleLanding = v.`visible`;
|
||||
|
||||
CALL vn2008.availableTraslate(vWarehouseOut, vDateShipped, NULL);
|
||||
CALL available_traslate(vWarehouseOut, vDateShipped, NULL);
|
||||
|
||||
INSERT INTO tItem(itemFk, available)
|
||||
SELECT a.item_id, a.available
|
||||
FROM vn2008.availableTraslate a
|
||||
FROM tmp.availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE available = a.available;
|
||||
|
||||
CALL vn2008.availableTraslate(vWarehouseIn, vDateLanded, vWarehouseOut);
|
||||
CALL available_traslate(vWarehouseIn, vDateLanded, vWarehouseOut);
|
||||
|
||||
INSERT INTO tItem(itemFk, availableLanding)
|
||||
SELECT a.item_id, a.available
|
||||
FROM vn2008.availableTraslate a
|
||||
FROM tmp.availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE availableLanding = a.available;
|
||||
ELSE
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ BEGIN
|
|||
LEAVE l;
|
||||
END IF;
|
||||
|
||||
CALL vn2008.buy_tarifas_entry(vEntryFk);
|
||||
CALL buy_recalcPricesByEntry(vEntryFk);
|
||||
END LOOP;
|
||||
|
||||
CLOSE vCur;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,14 @@ BEGIN
|
|||
DECLARE vCurrencyName VARCHAR(25);
|
||||
DECLARE vComission INT;
|
||||
|
||||
DECLARE EXIT HANDLER FOR SQLEXCEPTION
|
||||
BEGIN
|
||||
ROLLBACK;
|
||||
RESIGNAL;
|
||||
END;
|
||||
|
||||
START TRANSACTION;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision
|
||||
SELECT e.id
|
||||
FROM vn.entry e
|
||||
|
|
@ -28,12 +36,15 @@ BEGIN
|
|||
WHERE id = vCurrency;
|
||||
|
||||
CALL entry_recalc();
|
||||
|
||||
COMMIT;
|
||||
|
||||
SELECT util.notification_send(
|
||||
'entry-update-comission',
|
||||
JSON_OBJECT('currencyName', vCurrencyName, 'referenceCurrent', vComission),
|
||||
NULL
|
||||
);
|
||||
|
||||
DROP TEMPORARY TABLE tmp.recalcEntryCommision;
|
||||
DROP TEMPORARY TABLE tmp.recalcEntryCommision;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`recipe_Cook`(vItemFk INT, vBunchesQuantity INT, vDate DATE)
|
||||
BEGIN
|
||||
|
||||
DECLARE vCalc INT;
|
||||
DECLARE vWarehouseFk INT DEFAULT 1; -- Silla FV
|
||||
|
||||
SET @element := '';
|
||||
SET @counter := 0;
|
||||
|
||||
CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook;
|
||||
|
||||
CREATE TEMPORARY TABLE tmp.recipeCook
|
||||
SELECT *,
|
||||
@counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter,
|
||||
@element := element COLLATE utf8_general_ci
|
||||
FROM
|
||||
(
|
||||
SELECT i.id itemFk,
|
||||
CONCAT(i.longName, ' (ref: ',i.id,')') longName,
|
||||
i.size,
|
||||
i.inkFk,
|
||||
a.available,
|
||||
r.element,
|
||||
vBunchesQuantity * r.quantity as quantity,
|
||||
r.itemFk as bunchItemFk,
|
||||
IFNULL((i.inkFk = r.inkFk ) ,0)
|
||||
+ IFNULL((i.size = r.size) ,0)
|
||||
+ IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0)
|
||||
+ IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0)
|
||||
+ IFNULL((i.typeFk = r.typeFk),0) as matches,
|
||||
i.typeFk,
|
||||
rl.previousSelected
|
||||
FROM vn.recipe r
|
||||
JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0)
|
||||
OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0))
|
||||
OR i.typeFk <=> r.typeFk
|
||||
JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc
|
||||
LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected
|
||||
FROM vn.recipe_log
|
||||
GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk
|
||||
AND rl.log_element = r.element
|
||||
AND rl.selected_ItemFk = i.id
|
||||
WHERE r.itemFk = vItemFk
|
||||
AND a.available > vBunchesQuantity * r.quantity
|
||||
UNION ALL
|
||||
SELECT 100 itemFk,
|
||||
CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName,
|
||||
NULL,
|
||||
NULL,
|
||||
0,
|
||||
r.element,
|
||||
vBunchesQuantity * r.quantity as quantity,
|
||||
r.itemFk as bunchItemFk,
|
||||
-1 as matches,
|
||||
r.typeFk,
|
||||
NULL
|
||||
FROM vn.recipe r
|
||||
WHERE r.itemFk = vItemFk
|
||||
GROUP BY r.element
|
||||
) sub
|
||||
|
||||
ORDER BY element, matches DESC, previousSelected DESC;
|
||||
|
||||
SELECT *
|
||||
FROM tmp.recipeCook
|
||||
WHERE counter < 6
|
||||
OR itemFk = 100
|
||||
;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy`(v_date DATETIME, wh INT)
|
||||
BEGIN
|
||||
CALL vn.item_multipleBuy(v_date, wh);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy_date`(
|
||||
IN vDated DATETIME,
|
||||
IN vWarehouseFk TINYINT(3)
|
||||
)
|
||||
BEGIN
|
||||
CALL vn.item_multipleBuyByDate(vDated, vWarehouseFk);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`availableTraslate`(
|
||||
vWarehouseLanding INT,
|
||||
vDated DATE,
|
||||
vWarehouseShipment INT)
|
||||
proc: BEGIN
|
||||
DECLARE vDatedFrom DATE;
|
||||
DECLARE vDatedTo DATETIME;
|
||||
DECLARE vDatedReserve DATETIME;
|
||||
DECLARE vDatedInventory DATE;
|
||||
|
||||
IF vDated < util.VN_CURDATE() THEN
|
||||
LEAVE proc;
|
||||
END IF;
|
||||
|
||||
CALL vn.item_getStock (vWarehouseLanding, vDated, NULL);
|
||||
|
||||
-- Calcula algunos parámetros necesarios
|
||||
SET vDatedFrom = TIMESTAMP(vDated, '00:00:00');
|
||||
SET vDatedTo = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDated), '23:59:59');
|
||||
SELECT inventoried INTO vDatedInventory FROM vn.config;
|
||||
SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
|
||||
FROM hedera.orderConfig;
|
||||
|
||||
-- Calcula el ultimo dia de vida para cada producto
|
||||
DROP TEMPORARY TABLE IF EXISTS itemRange;
|
||||
CREATE TEMPORARY TABLE itemRange
|
||||
(PRIMARY KEY (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT c.itemFk, MAX(t.landed) dated
|
||||
FROM vn.buy c
|
||||
JOIN vn.entry e ON c.entryFk = e.id
|
||||
JOIN vn.travel t ON t.id = e.travelFk
|
||||
JOIN vn.warehouse w ON w.id = t.warehouseInFk
|
||||
WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
|
||||
AND t.warehouseInFk = vWarehouseLanding
|
||||
AND NOT e.isExcludedFromAvailable
|
||||
AND NOT e.isRaid
|
||||
GROUP BY c.itemFk;
|
||||
|
||||
-- Tabla con el ultimo dia de last_buy para cada producto que hace un replace de la anterior
|
||||
CALL vn.buyUltimate(vWarehouseShipment, util.VN_CURDATE());
|
||||
|
||||
INSERT INTO itemRange
|
||||
SELECT t.itemFk, tr.landed
|
||||
FROM tmp.buyUltimate t
|
||||
JOIN vn.buy b ON b.id = t.buyFk
|
||||
JOIN vn.entry e ON e.id = b.entryFk
|
||||
JOIN vn.travel tr ON tr.id = e.travelFk
|
||||
LEFT JOIN itemRange i ON t.itemFk = i.itemFk
|
||||
WHERE t.warehouseFk = vWarehouseShipment
|
||||
AND NOT e.isRaid
|
||||
ON DUPLICATE KEY UPDATE itemRange.dated = GREATEST(itemRange.dated, tr.landed);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS itemRangeLive;
|
||||
CREATE TEMPORARY TABLE itemRangeLive
|
||||
(PRIMARY KEY (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT ir.itemFk, TIMESTAMP(TIMESTAMPADD(DAY, it.life, ir.dated), '23:59:59') dated
|
||||
FROM itemRange ir
|
||||
JOIN vn.item i ON i.id = ir.itemFk
|
||||
JOIN vn.itemType it ON it.id = i.typeFk
|
||||
HAVING dated >= vDatedFrom OR dated IS NULL;
|
||||
|
||||
-- Calcula el ATP
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc;
|
||||
CREATE TEMPORARY TABLE tmp.itemCalc
|
||||
(INDEX (itemFk,warehouseFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity
|
||||
FROM vn.itemTicketOut i
|
||||
JOIN itemRangeLive ir ON ir.itemFK = i.itemFk
|
||||
WHERE i.shipped >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
||||
AND i.warehouseFk = vWarehouseLanding
|
||||
UNION ALL
|
||||
SELECT b.itemFk, vWarehouseLanding, t.landed, b.quantity
|
||||
FROM vn.buy b
|
||||
JOIN vn.entry e ON b.entryFk = e.id
|
||||
JOIN vn.travel t ON t.id = e.travelFk
|
||||
JOIN itemRangeLive ir ON ir.itemFk = b.itemFk
|
||||
WHERE NOT e.isExcludedFromAvailable
|
||||
AND b.quantity <> 0
|
||||
AND NOT e.isRaid
|
||||
AND t.warehouseInFk = vWarehouseLanding
|
||||
AND t.landed >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR t.landed <= ir.dated)
|
||||
UNION ALL
|
||||
SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity
|
||||
FROM vn.itemEntryOut i
|
||||
JOIN itemRangeLive ir ON ir.itemFk = i.itemFk
|
||||
WHERE i.shipped >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR i.shipped <= ir.dated)
|
||||
AND i.warehouseOutFk = vWarehouseLanding
|
||||
UNION ALL
|
||||
SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount
|
||||
FROM hedera.order_row r
|
||||
JOIN hedera.`order` o ON o.id = r.order_id
|
||||
JOIN itemRangeLive ir ON ir.itemFk = r.item_id
|
||||
WHERE r.shipment >= vDatedFrom
|
||||
AND (ir.dated IS NULL OR r.shipment <= ir.dated)
|
||||
AND r.warehouse_id = vWarehouseLanding
|
||||
AND r.created >= vDatedReserve
|
||||
AND NOT o.confirmed;
|
||||
|
||||
CALL vn.item_getAtp(vDated);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS availableTraslate;
|
||||
CREATE TEMPORARY TABLE availableTraslate
|
||||
(PRIMARY KEY (item_id))
|
||||
ENGINE = MEMORY
|
||||
SELECT t.item_id, SUM(stock) available
|
||||
FROM (
|
||||
SELECT ti.itemFk item_id, stock
|
||||
FROM tmp.itemList ti
|
||||
JOIN itemRange ir ON ir.itemFk = ti.itemFk
|
||||
UNION ALL
|
||||
SELECT itemFk, quantity
|
||||
FROM tmp.itemAtp
|
||||
) t
|
||||
GROUP BY t.item_id
|
||||
HAVING available <> 0;
|
||||
|
||||
DROP TEMPORARY TABLE tmp.itemList, itemRange, itemRangeLive;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,207 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`balance_create`(
|
||||
IN vStartingMonth INT,
|
||||
IN vEndingMonth INT,
|
||||
IN vCompany INT,
|
||||
IN vIsConsolidated BOOLEAN,
|
||||
IN vInterGroupSalesIncluded BOOLEAN)
|
||||
BEGIN
|
||||
DECLARE intGAP INT DEFAULT 7;
|
||||
DECLARE vYears INT DEFAULT 2;
|
||||
DECLARE vYear TEXT;
|
||||
DECLARE vOneYearAgo TEXT;
|
||||
DECLARE vTwoYearsAgo TEXT;
|
||||
DECLARE vQuery TEXT;
|
||||
DECLARE vConsolidatedGroup INT;
|
||||
DECLARE vStartingDate DATE DEFAULT '2020-01-01';
|
||||
DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE());
|
||||
DECLARE vStartingYear INT DEFAULT vCurYear - 2;
|
||||
DECLARE vTable TEXT;
|
||||
|
||||
SET vTable = util.quoteIdentifier('balance_nest_tree');
|
||||
SET vYear = util.quoteIdentifier(vCurYear);
|
||||
SET vOneYearAgo = util.quoteIdentifier(vCurYear-1);
|
||||
SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2);
|
||||
|
||||
-- Solicitamos la tabla tmp.nest, como base para el balance
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.nest;
|
||||
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'CREATE TEMPORARY TABLE tmp.nest
|
||||
SELECT node.id
|
||||
,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), node.name) AS name
|
||||
,node.lft
|
||||
,node.rgt
|
||||
,COUNT(parent.id) - 1 as depth
|
||||
,cast((node.rgt - node.lft - 1) / 2 as DECIMAL) as sons
|
||||
FROM ', vTable, ' AS node,
|
||||
', vTable, ' AS parent
|
||||
WHERE node.lft BETWEEN parent.lft AND parent.rgt
|
||||
GROUP BY node.id
|
||||
ORDER BY node.lft')
|
||||
USING intGAP;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.balance;
|
||||
CREATE TEMPORARY TABLE tmp.balance
|
||||
SELECT * FROM tmp.nest;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.empresas_receptoras;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.empresas_emisoras;
|
||||
|
||||
SELECT empresa_grupo INTO vConsolidatedGroup
|
||||
FROM empresa
|
||||
WHERE id = vCompany;
|
||||
|
||||
CREATE TEMPORARY TABLE tmp.empresas_receptoras
|
||||
SELECT id as empresa_id
|
||||
FROM vn2008.empresa
|
||||
WHERE id = vCompany
|
||||
OR empresa_grupo = IF(vIsConsolidated, vConsolidatedGroup, NULL);
|
||||
|
||||
CREATE TEMPORARY TABLE tmp.empresas_emisoras
|
||||
SELECT Id_Proveedor as empresa_id FROM vn2008.Proveedores p;
|
||||
|
||||
IF vInterGroupSalesIncluded = FALSE THEN
|
||||
|
||||
DELETE ee.*
|
||||
FROM tmp.empresas_emisoras ee
|
||||
JOIN vn2008.empresa e on e.id = ee.empresa_id
|
||||
WHERE e.empresa_grupo = vConsolidatedGroup;
|
||||
|
||||
END IF;
|
||||
|
||||
-- Se calculan las facturas que intervienen, para luego poder servir el desglose desde aqui
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.balance_desglose;
|
||||
CREATE TEMPORARY TABLE tmp.balance_desglose
|
||||
SELECT er.empresa_id receptora_id,
|
||||
ee.empresa_id emisora_id,
|
||||
year(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `year`,
|
||||
month(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `month`,
|
||||
gastos_id Id_Gasto,
|
||||
SUM(bi) importe
|
||||
FROM recibida r
|
||||
JOIN recibida_iva ri on ri.recibida_id = r.id
|
||||
JOIN tmp.empresas_receptoras er on er.empresa_id = r.empresa_id
|
||||
JOIN tmp.empresas_emisoras ee ON ee.empresa_id = r.proveedor_id
|
||||
WHERE IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha)) >= vStartingDate
|
||||
AND r.contabilizada
|
||||
GROUP BY Id_Gasto, year, month, emisora_id, receptora_id;
|
||||
|
||||
INSERT INTO tmp.balance_desglose(
|
||||
receptora_id,
|
||||
emisora_id,
|
||||
year,
|
||||
month,
|
||||
Id_Gasto,
|
||||
importe)
|
||||
SELECT gr.empresa_id,
|
||||
gr.empresa_id,
|
||||
year,
|
||||
month,
|
||||
Id_Gasto,
|
||||
SUM(importe)
|
||||
FROM gastos_resumen gr
|
||||
JOIN tmp.empresas_receptoras er on gr.empresa_id = er.empresa_id
|
||||
WHERE year >= vStartingYear
|
||||
AND month BETWEEN vStartingMonth AND vEndingMonth
|
||||
GROUP BY Id_Gasto, year, month, gr.empresa_id;
|
||||
|
||||
DELETE FROM tmp.balance_desglose
|
||||
WHERE month < vStartingMonth
|
||||
OR month > vEndingMonth;
|
||||
|
||||
-- Ahora el balance
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'ALTER TABLE tmp.balance
|
||||
ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL ,
|
||||
ADD COLUMN ', vOneYearAgo ,' INT(10) NULL ,
|
||||
ADD COLUMN ', vYear,' INT(10) NULL ,
|
||||
ADD COLUMN Id_Gasto VARCHAR(10) NULL,
|
||||
ADD COLUMN Gasto VARCHAR(45) NULL');
|
||||
|
||||
-- Añadimos los gastos, para facilitar el formulario
|
||||
UPDATE tmp.balance b
|
||||
JOIN vn2008.balance_nest_tree bnt on bnt.id = b.id
|
||||
JOIN (SELECT id Id_Gasto, name Gasto
|
||||
FROM vn.expense
|
||||
GROUP BY id) g ON g.Id_Gasto = bnt.Id_Gasto COLLATE utf8_general_ci
|
||||
SET b.Id_Gasto = g.Id_Gasto COLLATE utf8_general_ci
|
||||
, b.Gasto = g.Gasto COLLATE utf8_general_ci ;
|
||||
|
||||
-- Rellenamos los valores de primer nivel, los que corresponden a los gastos simples
|
||||
WHILE vYears >= 0 DO
|
||||
SET vQuery = CONCAT(
|
||||
'UPDATE tmp.balance b
|
||||
JOIN
|
||||
(SELECT Id_Gasto, SUM(Importe) as Importe
|
||||
FROM tmp.balance_desglose
|
||||
WHERE year = ?
|
||||
GROUP BY Id_Gasto
|
||||
) sub on sub.Id_Gasto = b.Id_Gasto COLLATE utf8_general_ci
|
||||
SET ', util.quoteIdentifier(vCurYear - vYears), ' = - Importe');
|
||||
|
||||
EXECUTE IMMEDIATE vQuery
|
||||
USING vCurYear - vYears;
|
||||
|
||||
SET vYears = vYears - 1;
|
||||
END WHILE;
|
||||
|
||||
-- Añadimos las ventas
|
||||
EXECUTE IMMEDIATE CONCAT(
|
||||
'UPDATE tmp.balance b
|
||||
JOIN (
|
||||
SELECT SUM(IF(year = ?, venta, 0)) y2,
|
||||
SUM(IF(year = ?, venta, 0)) y1,
|
||||
SUM(IF(year = ?, venta, 0)) y0,
|
||||
c.Gasto
|
||||
FROM bs.ventas_contables c
|
||||
JOIN tmp.empresas_receptoras er on er.empresa_id = c.empresa_id
|
||||
WHERE month BETWEEN ? AND ?
|
||||
GROUP BY c.Gasto
|
||||
) sub ON sub.Gasto = b.Id_Gasto COLLATE utf8_general_ci
|
||||
SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2,
|
||||
b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1,
|
||||
b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0')
|
||||
USING vCurYear-2,
|
||||
vCurYear-1,
|
||||
vCurYear,
|
||||
vStartingMonth,
|
||||
vEndingMonth;
|
||||
|
||||
-- Ventas intra grupo
|
||||
IF NOT vInterGroupSalesIncluded THEN
|
||||
|
||||
SELECT lft, rgt INTO @grupoLft, @grupoRgt
|
||||
FROM tmp.balance b
|
||||
WHERE TRIM(b.`name`) = 'Grupo';
|
||||
|
||||
DELETE
|
||||
FROM tmp.balance
|
||||
WHERE lft BETWEEN @grupoLft AND @grupoRgt;
|
||||
|
||||
END IF;
|
||||
|
||||
-- Rellenamos el valor de los padres con la suma de los hijos
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.balance_aux;
|
||||
CREATE TEMPORARY TABLE tmp.balance_aux
|
||||
SELECT * FROM tmp.balance;
|
||||
|
||||
EXECUTE IMMEDIATE
|
||||
CONCAT('UPDATE tmp.balance b
|
||||
JOIN (
|
||||
SELECT b1.id,
|
||||
b1.name,
|
||||
SUM(b2.', vYear,') thisYear,
|
||||
SUM(b2.', vOneYearAgo,') oneYearAgo,
|
||||
SUM(b2.', vTwoYearsAgo,') twoYearsAgo
|
||||
FROM tmp.nest b1
|
||||
JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt
|
||||
GROUP BY b1.id)sub ON sub.id = b.id
|
||||
SET b.', vYear, ' = thisYear,
|
||||
b.', vOneYearAgo, ' = oneYearAgo,
|
||||
b.', vTwoYearsAgo, ' = twoYearsAgo');
|
||||
|
||||
SELECT *, CONCAT('',ifnull(Id_Gasto,'')) newgasto
|
||||
FROM tmp.balance;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas`(vBuyFk INT)
|
||||
BEGIN
|
||||
CALL vn.buy_recalcPricesByBuy(vBuyFk);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas_entry`(IN vEntryFk INT(11))
|
||||
BEGIN
|
||||
/**
|
||||
* Recalcula los precios de una entrada
|
||||
*
|
||||
* @param vEntryFk
|
||||
*/
|
||||
CALL vn.buy_recalcPricesByEntry(vEntryFk);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
CREATE OR REPLACE PROCEDURE `vn`.`balance_create`() BEGIN END;
|
||||
CREATE OR REPLACE PROCEDURE `vn`.`buy_recalcPricesByEntry`() BEGIN END;
|
||||
CREATE OR REPLACE PROCEDURE `vn`.`buy_recalcPricesByBuy`() BEGIN END;
|
||||
|
||||
GRANT EXECUTE ON PROCEDURE vn.balance_create TO `financialBoss`, `hrBoss`;
|
||||
GRANT EXECUTE ON PROCEDURE vn.buy_recalcPricesByEntry TO `buyer`, `claimManager`, `employee`;
|
||||
GRANT EXECUTE ON PROCEDURE vn.buy_recalcPricesByBuy TO `buyer`, `entryEditor`, `claimManager`, `employee`;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
|
||||
CREATE OR REPLACE TABLE `vn`.`farmingDeliveryNote` (
|
||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`farmingFk` int(10) unsigned NOT NULL,
|
||||
`deliveryNoteFk` int(11) NOT NULL,
|
||||
`amount` decimal(10,2) DEFAULT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `farmingDeliveryNoteFk_FK` (`deliveryNoteFk`),
|
||||
KEY `farmingDeliveryNoteFk_FK_1` (`farmingFk`),
|
||||
CONSTRAINT `farmingDeliveryNoteFk_FK` FOREIGN KEY (`deliveryNoteFk`) REFERENCES `deliveryNote` (`id`),
|
||||
CONSTRAINT `farmingDeliveryNoteFk_FK_1` FOREIGN KEY (`farmingFk`) REFERENCES `farming` (`id`)
|
||||
);
|
||||
Loading…
Reference in New Issue