7253-devToTest_2418 #2350
|
@ -0,0 +1,13 @@
|
||||||
|
# EditorConfig helps developers define and maintain consistent
|
||||||
|
# coding styles between different editors and IDEs
|
||||||
|
# http://editorconfig.org
|
||||||
|
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
indent_style = tab
|
||||||
|
indent_size = 4
|
||||||
|
end_of_line = lf
|
||||||
|
charset = utf-8
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
insert_final_newline = true
|
|
@ -10,6 +10,7 @@ proc: BEGIN
|
||||||
LEAVE proc;
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
INSERT INTO orderRecalc SET orderFk = vSelf;
|
-- #4409 Deprecated by MyCDC
|
||||||
|
-- INSERT INTO orderRecalc SET orderFk = vSelf;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterDel
|
||||||
AFTER DELETE ON `orderRow`
|
AFTER DELETE ON `orderRow`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
CALL stock.log_add('orderRow', NULL, OLD.id);
|
CALL order_requestRecalc(OLD.orderFk);
|
||||||
CALL order_requestRecalc(OLD.orderFk);
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -3,7 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterIns
|
||||||
AFTER INSERT ON `orderRow`
|
AFTER INSERT ON `orderRow`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
CALL stock.log_add('orderRow', NEW.id, NULL);
|
CALL order_requestRecalc(NEW.orderFk);
|
||||||
CALL order_requestRecalc(NEW.orderFk);
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -3,8 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterUpd
|
||||||
AFTER UPDATE ON `orderRow`
|
AFTER UPDATE ON `orderRow`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
CALL stock.log_add('orderRow', NEW.id, OLD.id);
|
CALL order_requestRecalc(OLD.orderFk);
|
||||||
CALL order_requestRecalc(OLD.orderFk);
|
CALL order_requestRecalc(NEW.orderFk);
|
||||||
CALL order_requestRecalc(NEW.orderFk);
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -2,23 +2,21 @@ DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterUpdate`
|
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`order_afterUpdate`
|
||||||
AFTER UPDATE ON `order`
|
AFTER UPDATE ON `order`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
CALL stock.log_add('order', NEW.id, OLD.id);
|
IF !(OLD.address_id <=> NEW.address_id)
|
||||||
|
OR !(OLD.company_id <=> NEW.company_id)
|
||||||
IF !(OLD.address_id <=> NEW.address_id)
|
OR !(OLD.customer_id <=> NEW.customer_id) THEN
|
||||||
OR !(OLD.company_id <=> NEW.company_id)
|
CALL order_requestRecalc(NEW.id);
|
||||||
OR !(OLD.customer_id <=> NEW.customer_id) THEN
|
END IF;
|
||||||
CALL order_requestRecalc(NEW.id);
|
|
||||||
END IF;
|
IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
|
||||||
|
-- Fallo que se actualiza no se sabe como tickets en este cliente
|
||||||
IF !(OLD.address_id <=> NEW.address_id) AND NEW.address_id = 2850 THEN
|
CALL vn.mail_insert(
|
||||||
-- Fallo que se actualiza no se sabe como tickets en este cliente
|
'jgallego@verdnatura.es',
|
||||||
CALL vn.mail_insert(
|
'noreply@verdnatura.es',
|
||||||
'jgallego@verdnatura.es',
|
'Actualizada order al address 2850',
|
||||||
'noreply@verdnatura.es',
|
CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
|
||||||
'Actualizada order al address 2850',
|
);
|
||||||
CONCAT(account.myUser_getName(), ' ha creado la order ',NEW.id)
|
END IF;
|
||||||
);
|
|
||||||
END IF;
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_addPick`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_addPick`(
|
||||||
vSelf INT,
|
vSelf INT,
|
||||||
vOutboundFk INT,
|
vOutboundFk INT,
|
||||||
vQuantity INT
|
vQuantity INT
|
||||||
)
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
INSERT INTO inboundPick
|
INSERT INTO inboundPick
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_removePick`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_removePick`(
|
||||||
vSelf INT,
|
vSelf INT,
|
||||||
vOutboundFk INT,
|
vOutboundFk INT,
|
||||||
vQuantity INT,
|
vQuantity INT,
|
||||||
vTotalQuantity INT
|
vTotalQuantity INT
|
||||||
)
|
)
|
||||||
BEGIN
|
BEGIN
|
||||||
IF vQuantity < vTotalQuantity THEN
|
IF vQuantity < vTotalQuantity THEN
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_requestQuantity`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`inbound_requestQuantity`(
|
||||||
vSelf INT,
|
vSelf INT,
|
||||||
vRequested INT,
|
vRequested INT,
|
||||||
vDated DATETIME,
|
vDated DATETIME,
|
||||||
OUT vSupplied INT)
|
OUT vSupplied INT)
|
||||||
BEGIN
|
BEGIN
|
||||||
/**
|
/**
|
||||||
* Disassociates inbound picks after the given date until the
|
* Disassociates inbound picks after the given date until the
|
||||||
|
@ -29,7 +29,7 @@ BEGIN
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND
|
DECLARE CONTINUE HANDLER FOR NOT FOUND
|
||||||
SET vDone = TRUE;
|
SET vDone = TRUE;
|
||||||
|
|
||||||
SET vSupplied = 0;
|
SET vSupplied = 0;
|
||||||
|
|
||||||
OPEN vPicks;
|
OPEN vPicks;
|
||||||
|
@ -45,7 +45,7 @@ BEGIN
|
||||||
SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity);
|
SET vPickGranted = LEAST(vRequested - vSupplied, vPickQuantity);
|
||||||
SET vSupplied = vSupplied + vPickGranted;
|
SET vSupplied = vSupplied + vPickGranted;
|
||||||
CALL inbound_removePick(vSelf, vOutboundFk, vPickGranted, vPickQuantity);
|
CALL inbound_removePick(vSelf, vOutboundFk, vPickGranted, vPickQuantity);
|
||||||
|
|
||||||
UPDATE outbound
|
UPDATE outbound
|
||||||
SET isSync = FALSE,
|
SET isSync = FALSE,
|
||||||
lack = lack + vPickGranted
|
lack = lack + vPickGranted
|
||||||
|
|
|
@ -23,7 +23,7 @@ BEGIN
|
||||||
SELECT id, lack, lack < quantity
|
SELECT id, lack, lack < quantity
|
||||||
FROM outbound
|
FROM outbound
|
||||||
WHERE warehouseFk = vWarehouse
|
WHERE warehouseFk = vWarehouse
|
||||||
AND itemFk = vItem
|
AND itemFk = vItem
|
||||||
AND dated >= vDated
|
AND dated >= vDated
|
||||||
AND (vExpired IS NULL OR dated < vExpired)
|
AND (vExpired IS NULL OR dated < vExpired)
|
||||||
ORDER BY dated, created;
|
ORDER BY dated, created;
|
||||||
|
@ -51,8 +51,8 @@ BEGIN
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SET vSupplied = LEAST(vAvailable, vLack);
|
SET vSupplied = LEAST(vAvailable, vLack);
|
||||||
|
|
||||||
IF vSupplied > 0 THEN
|
IF vSupplied > 0 THEN
|
||||||
SET vAvailable = vAvailable - vSupplied;
|
SET vAvailable = vAvailable - vSupplied;
|
||||||
UPDATE outbound
|
UPDATE outbound
|
||||||
SET lack = lack - vSupplied
|
SET lack = lack - vSupplied
|
||||||
|
@ -64,8 +64,8 @@ BEGIN
|
||||||
SET vSupplied = vSupplied + vSuppliedFromRequest;
|
SET vSupplied = vSupplied + vSuppliedFromRequest;
|
||||||
SET vAvailable = vAvailable - vSuppliedFromRequest;
|
SET vAvailable = vAvailable - vSuppliedFromRequest;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF vSupplied > 0 THEN
|
IF vSupplied > 0 THEN
|
||||||
CALL inbound_addPick(vSelf, vOutboundFk, vSupplied);
|
CALL inbound_addPick(vSelf, vOutboundFk, vSupplied);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_add`(IN `vTableName` VARCHAR(255), IN `vNewId` VARCHAR(255), IN `vOldId` VARCHAR(255))
|
|
||||||
proc: BEGIN
|
|
||||||
-- XXX: Disabled while testing
|
|
||||||
LEAVE proc;
|
|
||||||
|
|
||||||
IF vOldId IS NOT NULL AND !(vOldId <=> vNewId) THEN
|
|
||||||
INSERT IGNORE INTO `log` SET
|
|
||||||
tableName = vTableName,
|
|
||||||
tableId = vOldId,
|
|
||||||
operation = 'delete';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF vNewId IS NOT NULL THEN
|
|
||||||
INSERT IGNORE INTO `log` SET
|
|
||||||
tableName = vTableName,
|
|
||||||
tableId = vNewId,
|
|
||||||
operation = 'insert';
|
|
||||||
END IF;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -10,7 +10,7 @@ BEGIN
|
||||||
DO RELEASE_LOCK('stock.log_sync');
|
DO RELEASE_LOCK('stock.log_sync');
|
||||||
RESIGNAL;
|
RESIGNAL;
|
||||||
END;
|
END;
|
||||||
|
|
||||||
IF !GET_LOCK('stock.log_sync', 30) THEN
|
IF !GET_LOCK('stock.log_sync', 30) THEN
|
||||||
CALL util.throw('Lock timeout exceeded');
|
CALL util.throw('Lock timeout exceeded');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshBuy`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshBuy`(
|
||||||
`vTableName` VARCHAR(255),
|
`vTableName` VARCHAR(255),
|
||||||
`vTableId` INT)
|
`vTableId` INT)
|
||||||
BEGIN
|
BEGIN
|
||||||
DROP TEMPORARY TABLE IF EXISTS tValues;
|
DROP TEMPORARY TABLE IF EXISTS tValues;
|
||||||
CREATE TEMPORARY TABLE tValues
|
CREATE TEMPORARY TABLE tValues
|
||||||
|
@ -11,7 +11,7 @@ BEGIN
|
||||||
e.id entryFk,
|
e.id entryFk,
|
||||||
t.id travelFk,
|
t.id travelFk,
|
||||||
b.itemFk,
|
b.itemFk,
|
||||||
e.isRaid,
|
e.isRaid,
|
||||||
ADDTIME(t.shipped,
|
ADDTIME(t.shipped,
|
||||||
IFNULL(t.shipmentHour, '00:00:00')) shipped,
|
IFNULL(t.shipmentHour, '00:00:00')) shipped,
|
||||||
t.warehouseOutFk,
|
t.warehouseOutFk,
|
||||||
|
@ -24,7 +24,7 @@ BEGIN
|
||||||
ABS(b.quantity) quantity,
|
ABS(b.quantity) quantity,
|
||||||
b.created,
|
b.created,
|
||||||
b.quantity > 0 isIn,
|
b.quantity > 0 isIn,
|
||||||
t.shipped < vn.getInventoryDate() lessThanInventory
|
t.shipped < vn.getInventoryDate() lessThanInventory
|
||||||
FROM vn.buy b
|
FROM vn.buy b
|
||||||
JOIN vn.entry e ON e.id = b.entryFk
|
JOIN vn.entry e ON e.id = b.entryFk
|
||||||
JOIN vn.travel t ON t.id = e.travelFk
|
JOIN vn.travel t ON t.id = e.travelFk
|
||||||
|
@ -52,7 +52,7 @@ BEGIN
|
||||||
quantity,
|
quantity,
|
||||||
IF(isIn, isReceived, isDelivered) AND !isRaid
|
IF(isIn, isReceived, isDelivered) AND !isRaid
|
||||||
FROM tValues
|
FROM tValues
|
||||||
WHERE isIn OR !lessThanInventory;
|
WHERE isIn OR !lessThanInventory;
|
||||||
|
|
||||||
REPLACE INTO outbound (
|
REPLACE INTO outbound (
|
||||||
tableName, tableId, warehouseFk, dated,
|
tableName, tableId, warehouseFk, dated,
|
||||||
|
@ -67,7 +67,7 @@ BEGIN
|
||||||
quantity,
|
quantity,
|
||||||
IF(isIn, isDelivered, isReceived) AND !isRaid
|
IF(isIn, isDelivered, isReceived) AND !isRaid
|
||||||
FROM tValues
|
FROM tValues
|
||||||
WHERE !isIn OR !lessThanInventory;
|
WHERE !isIn OR !lessThanInventory;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tValues;
|
DROP TEMPORARY TABLE tValues;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshOrder`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshOrder`(
|
||||||
`vTableName` VARCHAR(255),
|
`vTableName` VARCHAR(255),
|
||||||
`vTableId` INT)
|
`vTableId` INT)
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE vExpireTime INT DEFAULT 20;
|
DECLARE vExpireTime INT DEFAULT 20;
|
||||||
DECLARE vExpired DATETIME DEFAULT TIMESTAMPADD(MINUTE, -vExpireTime, util.VN_NOW());
|
DECLARE vExpired DATETIME DEFAULT TIMESTAMPADD(MINUTE, -vExpireTime, util.VN_NOW());
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tValues;
|
DROP TEMPORARY TABLE IF EXISTS tValues;
|
||||||
CREATE TEMPORARY TABLE tValues
|
CREATE TEMPORARY TABLE tValues
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT
|
SELECT
|
||||||
r.id rowFk,
|
r.id rowFk,
|
||||||
|
@ -23,24 +23,24 @@ BEGIN
|
||||||
OR (vTableName = 'order' AND o.id = vTableId)
|
OR (vTableName = 'order' AND o.id = vTableId)
|
||||||
OR (vTableName = 'orderRow' AND r.id = vTableId)
|
OR (vTableName = 'orderRow' AND r.id = vTableId)
|
||||||
)
|
)
|
||||||
AND !o.confirmed
|
AND !o.confirmed
|
||||||
AND r.shipment >= vn.getInventoryDate()
|
AND r.shipment >= vn.getInventoryDate()
|
||||||
AND r.created >= vExpired
|
AND r.created >= vExpired
|
||||||
AND r.amount != 0;
|
AND r.amount != 0;
|
||||||
|
|
||||||
REPLACE INTO outbound (
|
REPLACE INTO outbound (
|
||||||
tableName, tableId, warehouseFk, dated,
|
tableName, tableId, warehouseFk, dated,
|
||||||
itemFk, created, expired, quantity
|
itemFk, created, expired, quantity
|
||||||
)
|
)
|
||||||
SELECT 'orderRow',
|
SELECT 'orderRow',
|
||||||
rowFk,
|
rowFk,
|
||||||
warehouseFk,
|
warehouseFk,
|
||||||
shipped,
|
shipped,
|
||||||
itemFk,
|
itemFk,
|
||||||
created,
|
created,
|
||||||
TIMESTAMPADD(MINUTE, vExpireTime, created),
|
TIMESTAMPADD(MINUTE, vExpireTime, created),
|
||||||
quantity
|
quantity
|
||||||
FROM tValues;
|
FROM tValues;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tValues;
|
DROP TEMPORARY TABLE tValues;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshSale`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`log_refreshSale`(
|
||||||
`vTableName` VARCHAR(255),
|
`vTableName` VARCHAR(255),
|
||||||
`vTableId` INT)
|
`vTableId` INT)
|
||||||
BEGIN
|
BEGIN
|
||||||
DROP TEMPORARY TABLE IF EXISTS tValues;
|
DROP TEMPORARY TABLE IF EXISTS tValues;
|
||||||
CREATE TEMPORARY TABLE tValues
|
CREATE TEMPORARY TABLE tValues
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT
|
SELECT
|
||||||
m.id saleFk,
|
m.id saleFk,
|
||||||
|
@ -14,7 +14,7 @@ BEGIN
|
||||||
t.shipped,
|
t.shipped,
|
||||||
ABS(m.quantity) quantity,
|
ABS(m.quantity) quantity,
|
||||||
m.created,
|
m.created,
|
||||||
TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
|
TIMESTAMPADD(DAY, tp.life, t.shipped) expired,
|
||||||
m.quantity < 0 isIn,
|
m.quantity < 0 isIn,
|
||||||
m.isPicked OR s.alertLevel > 1 isPicked
|
m.isPicked OR s.alertLevel > 1 isPicked
|
||||||
FROM vn.sale m
|
FROM vn.sale m
|
||||||
|
@ -32,33 +32,33 @@ BEGIN
|
||||||
|
|
||||||
REPLACE INTO inbound (
|
REPLACE INTO inbound (
|
||||||
tableName, tableId, warehouseFk, dated,
|
tableName, tableId, warehouseFk, dated,
|
||||||
itemFk, expired, quantity, isPicked
|
itemFk, expired, quantity, isPicked
|
||||||
)
|
)
|
||||||
SELECT 'sale',
|
SELECT 'sale',
|
||||||
saleFk,
|
saleFk,
|
||||||
warehouseFk,
|
warehouseFk,
|
||||||
shipped,
|
shipped,
|
||||||
itemFk,
|
itemFk,
|
||||||
expired,
|
expired,
|
||||||
quantity,
|
quantity,
|
||||||
isPicked
|
isPicked
|
||||||
FROM tValues
|
FROM tValues
|
||||||
WHERE isIn;
|
WHERE isIn;
|
||||||
|
|
||||||
REPLACE INTO outbound (
|
REPLACE INTO outbound (
|
||||||
tableName, tableId, warehouseFk, dated,
|
tableName, tableId, warehouseFk, dated,
|
||||||
itemFk, created, quantity, isPicked
|
itemFk, created, quantity, isPicked
|
||||||
)
|
)
|
||||||
SELECT 'sale',
|
SELECT 'sale',
|
||||||
saleFk,
|
saleFk,
|
||||||
warehouseFk,
|
warehouseFk,
|
||||||
shipped,
|
shipped,
|
||||||
itemFk,
|
itemFk,
|
||||||
created,
|
created,
|
||||||
quantity,
|
quantity,
|
||||||
isPicked
|
isPicked
|
||||||
FROM tValues
|
FROM tValues
|
||||||
WHERE !isIn;
|
WHERE !isIn;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tValues;
|
DROP TEMPORARY TABLE tValues;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -7,7 +7,7 @@ BEGIN
|
||||||
* @param vSelf The outbound reference
|
* @param vSelf The outbound reference
|
||||||
*/
|
*/
|
||||||
DECLARE vDated DATETIME;
|
DECLARE vDated DATETIME;
|
||||||
DECLARE vItem INT;
|
DECLARE vItem INT;
|
||||||
DECLARE vWarehouse INT;
|
DECLARE vWarehouse INT;
|
||||||
DECLARE vLack INT;
|
DECLARE vLack INT;
|
||||||
DECLARE vSupplied INT;
|
DECLARE vSupplied INT;
|
||||||
|
@ -21,7 +21,7 @@ BEGIN
|
||||||
SELECT id, available, available < quantity
|
SELECT id, available, available < quantity
|
||||||
FROM inbound
|
FROM inbound
|
||||||
WHERE warehouseFk = vWarehouse
|
WHERE warehouseFk = vWarehouse
|
||||||
AND itemFk = vItem
|
AND itemFk = vItem
|
||||||
AND dated <= vDated
|
AND dated <= vDated
|
||||||
AND (expired IS NULL OR expired > vDated)
|
AND (expired IS NULL OR expired > vDated)
|
||||||
ORDER BY dated;
|
ORDER BY dated;
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`visible_log`(
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `stock`.`visible_log`(
|
||||||
vIsPicked BOOL,
|
vIsPicked BOOL,
|
||||||
vWarehouseFk INT,
|
vWarehouseFk INT,
|
||||||
vItemFk INT,
|
vItemFk INT,
|
||||||
vQuantity INT
|
vQuantity INT
|
||||||
)
|
)
|
||||||
proc: BEGIN
|
proc: BEGIN
|
||||||
IF !vIsPicked THEN
|
IF !vIsPicked THEN
|
||||||
LEAVE proc;
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
INSERT INTO visible
|
INSERT INTO visible
|
||||||
SET itemFk = vItemFk,
|
SET itemFk = vItemFk,
|
||||||
warehouseFk = vWarehouseFk,
|
warehouseFk = vWarehouseFk,
|
||||||
quantity = vQuantity
|
quantity = vQuantity
|
||||||
|
|
|
@ -12,11 +12,11 @@ BEGIN
|
||||||
DELETE FROM inboundPick
|
DELETE FROM inboundPick
|
||||||
WHERE inboundFk = OLD.id;
|
WHERE inboundFk = OLD.id;
|
||||||
|
|
||||||
CALL visible_log(
|
CALL visible_log(
|
||||||
OLD.isPicked,
|
OLD.isPicked,
|
||||||
OLD.warehouseFk,
|
OLD.warehouseFk,
|
||||||
OLD.itemFk,
|
OLD.itemFk,
|
||||||
-OLD.quantity
|
-OLD.quantity
|
||||||
);
|
);
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -4,12 +4,12 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`inbound_beforeInse
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
|
SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
|
||||||
|
|
||||||
CALL visible_log(
|
CALL visible_log(
|
||||||
NEW.isPicked,
|
NEW.isPicked,
|
||||||
NEW.warehouseFk,
|
NEW.warehouseFk,
|
||||||
NEW.itemFk,
|
NEW.itemFk,
|
||||||
NEW.quantity
|
NEW.quantity
|
||||||
);
|
);
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -12,11 +12,11 @@ BEGIN
|
||||||
DELETE FROM inboundPick
|
DELETE FROM inboundPick
|
||||||
WHERE outboundFk = OLD.id;
|
WHERE outboundFk = OLD.id;
|
||||||
|
|
||||||
CALL visible_log(
|
CALL visible_log(
|
||||||
OLD.isPicked,
|
OLD.isPicked,
|
||||||
OLD.warehouseFk,
|
OLD.warehouseFk,
|
||||||
OLD.itemFk,
|
OLD.itemFk,
|
||||||
OLD.quantity
|
OLD.quantity
|
||||||
);
|
);
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -5,12 +5,12 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `stock`.`outbound_beforeIns
|
||||||
BEGIN
|
BEGIN
|
||||||
SET NEW.lack = NEW.quantity;
|
SET NEW.lack = NEW.quantity;
|
||||||
SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
|
SET NEW.isPicked = NEW.isPicked OR NEW.dated < util.VN_CURDATE();
|
||||||
|
|
||||||
CALL visible_log(
|
CALL visible_log(
|
||||||
NEW.isPicked,
|
NEW.isPicked,
|
||||||
NEW.warehouseFk,
|
NEW.warehouseFk,
|
||||||
NEW.itemFk,
|
NEW.itemFk,
|
||||||
-NEW.quantity
|
-NEW.quantity
|
||||||
);
|
);
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -10,6 +10,7 @@ proc: BEGIN
|
||||||
LEAVE proc;
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
INSERT INTO ticketRecalc SET ticketFk = vSelf;
|
-- #4409 Deprecated by MyCDC
|
||||||
|
-- INSERT INTO ticketRecalc SET ticketFk = vSelf;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -3,19 +3,14 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterDelete`
|
||||||
AFTER DELETE ON `buy`
|
AFTER DELETE ON `buy`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
trig: BEGIN
|
trig: BEGIN
|
||||||
DECLARE vValues VARCHAR(255);
|
|
||||||
|
|
||||||
IF @isModeInventory OR @isTriggerDisabled THEN
|
IF @isModeInventory OR @isTriggerDisabled THEN
|
||||||
LEAVE trig;
|
LEAVE trig;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
CALL stock.log_add('buy', NULL, OLD.id);
|
|
||||||
|
|
||||||
INSERT INTO entryLog
|
INSERT INTO entryLog
|
||||||
SET `action` = 'delete',
|
SET `action` = 'delete',
|
||||||
`changedModel` = 'Buy',
|
`changedModel` = 'Buy',
|
||||||
`changedModelId` = OLD.id,
|
`changedModelId` = OLD.id,
|
||||||
`userFk` = account.myUser_getId();
|
`userFk` = account.myUser_getId();
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -7,8 +7,6 @@ trig: BEGIN
|
||||||
LEAVE trig;
|
LEAVE trig;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
CALL stock.log_add('buy', NEW.id, NULL);
|
|
||||||
|
|
||||||
CALL buy_afterUpsert(NEW.id);
|
CALL buy_afterUpsert(NEW.id);
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
|
@ -12,14 +12,6 @@ trig: BEGIN
|
||||||
LEAVE trig;
|
LEAVE trig;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF !(NEW.id <=> OLD.id)
|
|
||||||
OR !(NEW.entryFk <=> OLD.entryFk)
|
|
||||||
OR !(NEW.itemFk <=> OLD.itemFk)
|
|
||||||
OR !(NEW.quantity <=> OLD.quantity)
|
|
||||||
OR !(NEW.created <=> OLD.created) THEN
|
|
||||||
CALL stock.log_add('buy', NEW.id, OLD.id);
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
CALL buy_afterUpsert(NEW.id);
|
CALL buy_afterUpsert(NEW.id);
|
||||||
|
|
||||||
SELECT w.isBuyerToBeEmailed, t.landed
|
SELECT w.isBuyerToBeEmailed, t.landed
|
||||||
|
|
|
@ -3,24 +3,17 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_afterUpdate`
|
||||||
AFTER UPDATE ON `entry`
|
AFTER UPDATE ON `entry`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
IF NOT(NEW.id <=> OLD.id)
|
|
||||||
OR NOT(NEW.travelFk <=> OLD.travelFk)
|
|
||||||
OR NOT(NEW.isRaid <=> OLD.isRaid) THEN
|
|
||||||
CALL stock.log_add('entry', NEW.id, OLD.id);
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
|
IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
|
||||||
CALL travel_requestRecalc(OLD.travelFk);
|
CALL travel_requestRecalc(OLD.travelFk);
|
||||||
CALL travel_requestRecalc(NEW.travelFk);
|
CALL travel_requestRecalc(NEW.travelFk);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
|
|
||||||
IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
|
IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||||
SELECT b.id
|
SELECT b.id
|
||||||
FROM buy b
|
FROM buy b
|
||||||
WHERE b.entryFk = NEW.id;
|
WHERE b.entryFk = NEW.id;
|
||||||
|
|
||||||
CALL buy_checkItem();
|
CALL buy_checkItem();
|
||||||
END IF;
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
|
|
|
@ -12,7 +12,6 @@ BEGIN
|
||||||
`changedModelId` = OLD.id,
|
`changedModelId` = OLD.id,
|
||||||
`userFk` = account.myUser_getId();
|
`userFk` = account.myUser_getId();
|
||||||
|
|
||||||
CALL stock.log_add('sale', NULL, OLD.id);
|
|
||||||
CALL ticket_requestRecalc(OLD.ticketFk);
|
CALL ticket_requestRecalc(OLD.ticketFk);
|
||||||
|
|
||||||
SELECT account.myUser_getName() INTO vUserRole;
|
SELECT account.myUser_getName() INTO vUserRole;
|
||||||
|
|
|
@ -7,7 +7,6 @@ BEGIN
|
||||||
CALL util.throw('Cannot insert a service item into a ticket');
|
CALL util.throw('Cannot insert a service item into a ticket');
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
CALL stock.log_add('sale', NEW.id, NULL);
|
|
||||||
CALL ticket_requestRecalc(NEW.ticketFk);
|
CALL ticket_requestRecalc(NEW.ticketFk);
|
||||||
|
|
||||||
IF NEW.quantity > 0 THEN
|
IF NEW.quantity > 0 THEN
|
||||||
|
|
|
@ -6,15 +6,6 @@ BEGIN
|
||||||
DECLARE vIsToSendMail BOOL;
|
DECLARE vIsToSendMail BOOL;
|
||||||
DECLARE vUserRole VARCHAR(255);
|
DECLARE vUserRole VARCHAR(255);
|
||||||
|
|
||||||
IF !(NEW.id <=> OLD.id)
|
|
||||||
OR !(NEW.ticketFk <=> OLD.ticketFk)
|
|
||||||
OR !(NEW.itemFk <=> OLD.itemFk)
|
|
||||||
OR !(NEW.quantity <=> OLD.quantity)
|
|
||||||
OR !(NEW.created <=> OLD.created)
|
|
||||||
OR !(NEW.isPicked <=> OLD.isPicked) THEN
|
|
||||||
CALL stock.log_add('sale', NEW.id, OLD.id);
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF !(NEW.price <=> OLD.price)
|
IF !(NEW.price <=> OLD.price)
|
||||||
OR !(NEW.ticketFk <=> OLD.ticketFk)
|
OR !(NEW.ticketFk <=> OLD.ticketFk)
|
||||||
OR !(NEW.itemFk <=> OLD.itemFk)
|
OR !(NEW.itemFk <=> OLD.itemFk)
|
||||||
|
|
|
@ -3,13 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterUpdate`
|
||||||
AFTER UPDATE ON `ticket`
|
AFTER UPDATE ON `ticket`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
||||||
IF !(NEW.id <=> OLD.id)
|
|
||||||
OR !(NEW.warehouseFk <=> OLD.warehouseFk)
|
|
||||||
OR !(NEW.shipped <=> OLD.shipped) THEN
|
|
||||||
CALL stock.log_add('ticket', NEW.id, OLD.id);
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF !(NEW.clientFk <=> OLD.clientFk)
|
IF !(NEW.clientFk <=> OLD.clientFk)
|
||||||
OR !(NEW.addressFk <=> OLD.addressFk)
|
OR !(NEW.addressFk <=> OLD.addressFk)
|
||||||
OR !(NEW.companyFk <=> OLD.companyFk) THEN
|
OR !(NEW.companyFk <=> OLD.companyFk) THEN
|
||||||
|
@ -17,7 +10,7 @@ BEGIN
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
IF NEW.routeFk <> OLD.routeFk THEN
|
IF NEW.routeFk <> OLD.routeFk THEN
|
||||||
UPDATE expedition
|
UPDATE expedition
|
||||||
SET hasNewRoute = TRUE
|
SET hasNewRoute = TRUE
|
||||||
WHERE ticketFk = NEW.id;
|
WHERE ticketFk = NEW.id;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
|
@ -3,10 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterUpdate`
|
||||||
AFTER UPDATE ON `travel`
|
AFTER UPDATE ON `travel`
|
||||||
FOR EACH ROW
|
FOR EACH ROW
|
||||||
BEGIN
|
BEGIN
|
||||||
CALL stock.log_add('travel', NEW.id, OLD.id);
|
|
||||||
|
|
||||||
IF NOT(NEW.shipped <=> OLD.shipped) THEN
|
IF NOT(NEW.shipped <=> OLD.shipped) THEN
|
||||||
UPDATE entry
|
UPDATE entry
|
||||||
SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
|
SET commission = entry_getCommission(travelFk, currencyFk,supplierFk)
|
||||||
WHERE travelFk = NEW.id;
|
WHERE travelFk = NEW.id;
|
||||||
END IF;
|
END IF;
|
||||||
|
@ -15,11 +13,11 @@ BEGIN
|
||||||
IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
|
IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
|
||||||
SELECT b.id
|
SELECT b.id
|
||||||
FROM entry e
|
FROM entry e
|
||||||
JOIN buy b ON b.entryFk = e.id
|
JOIN buy b ON b.entryFk = e.id
|
||||||
JOIN item i ON i.id = b.itemFk
|
JOIN item i ON i.id = b.itemFk
|
||||||
WHERE e.travelFk = NEW.id;
|
WHERE e.travelFk = NEW.id;
|
||||||
|
|
||||||
CALL buy_checkItem();
|
CALL buy_checkItem();
|
||||||
END IF;
|
END IF;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
Loading…
Reference in New Issue