refs #6769 Changes, with error no database selected
This commit is contained in:
parent
a7895ab0a4
commit
cf7de14de6
|
@ -61,29 +61,11 @@ BEGIN
|
||||||
JOIN itemType it ON it.id = i.typeFk
|
JOIN itemType it ON it.id = i.typeFk
|
||||||
HAVING ended >= COALESCE(vDated, vDateInventory) OR life IS NULL;
|
HAVING ended >= COALESCE(vDated, vDateInventory) OR life IS NULL;
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE tItemDiary(
|
CREATE OR REPLACE TEMPORARY TABLE tItemDiary
|
||||||
shipped DATE,
|
ENGINE = MEMORY
|
||||||
`in` INT(11),
|
|
||||||
`out` INT(11),
|
|
||||||
alertLevel INT(11),
|
|
||||||
stateName VARCHAR(20),
|
|
||||||
`name` VARCHAR(50),
|
|
||||||
reference VARCHAR(50),
|
|
||||||
origin INT(11),
|
|
||||||
clientFk INT(11),
|
|
||||||
isPicked INT(11),
|
|
||||||
isTicket TINYINT(1),
|
|
||||||
lineFk INT(11),
|
|
||||||
`order` TINYINT(3) UNSIGNED,
|
|
||||||
clientType VARCHAR(20),
|
|
||||||
claimFk INT(10) UNSIGNED,
|
|
||||||
inventorySupplierFk INT(10),
|
|
||||||
orderFk INT(10) UNSIGNED
|
|
||||||
) ENGINE = MEMORY;
|
|
||||||
|
|
||||||
INSERT INTO tItemDiary
|
|
||||||
WITH entriesIn AS (
|
WITH entriesIn AS (
|
||||||
SELECT tr.landed shipped,
|
SELECT 'entry' `type`,
|
||||||
|
tr.landed shipped,
|
||||||
b.quantity `in`,
|
b.quantity `in`,
|
||||||
NULL `out`,
|
NULL `out`,
|
||||||
st.alertLevel ,
|
st.alertLevel ,
|
||||||
|
@ -98,13 +80,12 @@ BEGIN
|
||||||
NULL `order`,
|
NULL `order`,
|
||||||
NULL clientType,
|
NULL clientType,
|
||||||
NULL claimFk,
|
NULL claimFk,
|
||||||
vSupplierInventoryFk inventorySupplierFk,
|
vSupplierInventoryFk inventorySupplierFk
|
||||||
NULL orderFk
|
|
||||||
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 tr ON tr.id = e.travelFk
|
JOIN vn.travel tr ON tr.id = e.travelFk
|
||||||
JOIN vn.supplier s ON s.id = e.supplierFk
|
JOIN vn.supplier s ON s.id = e.supplierFk
|
||||||
JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE()
|
JOIN vn.state st ON st.`code` = IF(tr.landed < util.VN_CURDATE()
|
||||||
OR (util.VN_CURDATE() AND tr.isReceived),
|
OR (util.VN_CURDATE() AND tr.isReceived),
|
||||||
'DELIVERED',
|
'DELIVERED',
|
||||||
'FREE')
|
'FREE')
|
||||||
|
@ -116,7 +97,8 @@ BEGIN
|
||||||
AND NOT e.isRaid
|
AND NOT e.isRaid
|
||||||
),
|
),
|
||||||
entriesOut AS (
|
entriesOut AS (
|
||||||
SELECT tr.shipped,
|
SELECT 'entry',
|
||||||
|
tr.shipped,
|
||||||
NULL,
|
NULL,
|
||||||
b.quantity,
|
b.quantity,
|
||||||
st.alertLevel,
|
st.alertLevel,
|
||||||
|
@ -131,8 +113,7 @@ BEGIN
|
||||||
NULL `order`,
|
NULL `order`,
|
||||||
NULL clientType,
|
NULL clientType,
|
||||||
NULL claimFk,
|
NULL claimFk,
|
||||||
vSupplierInventoryFk,
|
vSupplierInventoryFk
|
||||||
NULL orderFk
|
|
||||||
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 tr ON tr.id = e.travelFk
|
JOIN vn.travel tr ON tr.id = e.travelFk
|
||||||
|
@ -180,7 +161,8 @@ BEGIN
|
||||||
AND s.itemFk = vItemFk
|
AND s.itemFk = vItemFk
|
||||||
AND vWarehouseFk = t.warehouseFk
|
AND vWarehouseFk = t.warehouseFk
|
||||||
)
|
)
|
||||||
SELECT s.shipped,
|
SELECT 'ticket',
|
||||||
|
s.shipped,
|
||||||
NULL `in`,
|
NULL `in`,
|
||||||
s.quantity,
|
s.quantity,
|
||||||
s.alertLevel,
|
s.alertLevel,
|
||||||
|
@ -195,8 +177,7 @@ BEGIN
|
||||||
s.`order`,
|
s.`order`,
|
||||||
s.typeFk,
|
s.typeFk,
|
||||||
s.claimFk,
|
s.claimFk,
|
||||||
NULL,
|
NULL
|
||||||
NULL orderFk
|
|
||||||
FROM itemSales s
|
FROM itemSales s
|
||||||
LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
|
LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
|
||||||
LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk
|
LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk
|
||||||
|
@ -204,23 +185,23 @@ BEGIN
|
||||||
GROUP BY s.saleFk
|
GROUP BY s.saleFk
|
||||||
),
|
),
|
||||||
orders AS (
|
orders AS (
|
||||||
SELECT r.shipment,
|
SELECT 'order' `type`,
|
||||||
|
r.shipment,
|
||||||
NULL 'in',
|
NULL 'in',
|
||||||
r.amount,
|
r.amount,
|
||||||
NULL alertLevel,
|
NULL alertLevel,
|
||||||
NULL stateName,
|
NULL stateName,
|
||||||
NULL,
|
c.name,
|
||||||
NULL invoiceNumber,
|
NULL invoiceNumber,
|
||||||
NULL entryFk,
|
o.id origin,
|
||||||
NULL supplierFk,
|
c.id,
|
||||||
FALSE,
|
FALSE,
|
||||||
FALSE isTicket,
|
FALSE isTicket,
|
||||||
NULL buyFk,
|
NULL buyFk,
|
||||||
NULL 'order',
|
NULL 'order',
|
||||||
c.typeFk,
|
c.typeFk,
|
||||||
NULL claimFk,
|
NULL claimFk,
|
||||||
NULL inventorySupplierFk,
|
NULL
|
||||||
o.id
|
|
||||||
FROM hedera.orderRow r
|
FROM hedera.orderRow r
|
||||||
JOIN hedera.`order` o ON o.id = r.orderFk
|
JOIN hedera.`order` o ON o.id = r.orderFk
|
||||||
JOIN tItemRange ir ON ir.itemFk = r.itemFk
|
JOIN tItemRange ir ON ir.itemFk = r.itemFk
|
||||||
|
@ -252,7 +233,8 @@ BEGIN
|
||||||
SET @currentLineFk := 0;
|
SET @currentLineFk := 0;
|
||||||
SET @shipped := '';
|
SET @shipped := '';
|
||||||
|
|
||||||
SELECT DATE(@shipped:= t.shipped) shipped,
|
SELECT t.type,
|
||||||
|
DATE(@shipped:= t.shipped) shipped,
|
||||||
t.alertLevel,
|
t.alertLevel,
|
||||||
t.stateName,
|
t.stateName,
|
||||||
t.origin,
|
t.origin,
|
||||||
|
@ -271,8 +253,7 @@ BEGIN
|
||||||
t.isPicked,
|
t.isPicked,
|
||||||
t.clientType,
|
t.clientType,
|
||||||
t.claimFk,
|
t.claimFk,
|
||||||
t.`order`,
|
t.`order`
|
||||||
t.orderFk
|
|
||||||
FROM tItemDiary t
|
FROM tItemDiary t
|
||||||
LEFT JOIN alertLevel a ON a.id = t.alertLevel;
|
LEFT JOIN alertLevel a ON a.id = t.alertLevel;
|
||||||
ELSE
|
ELSE
|
||||||
|
@ -280,26 +261,27 @@ BEGIN
|
||||||
FROM tItemDiary
|
FROM tItemDiary
|
||||||
WHERE shipped < vDated;
|
WHERE shipped < vDated;
|
||||||
|
|
||||||
SELECT vDated shipped,
|
SELECT NULL `type`,
|
||||||
0 alertLevel,
|
vDated shipped,
|
||||||
0 stateName,
|
NULL alertLevel,
|
||||||
0 origin,
|
NULL stateName,
|
||||||
'' reference,
|
NULL origin,
|
||||||
0 clientFk,
|
NULL reference,
|
||||||
|
NULL clientFk,
|
||||||
'Inventario calculado',
|
'Inventario calculado',
|
||||||
@a invalue,
|
@a invalue,
|
||||||
NULL `out`,
|
NULL `out`,
|
||||||
@a balance,
|
@a balance,
|
||||||
0 lastPreparedLineFk,
|
NULL lastPreparedLineFk,
|
||||||
0 isTicket,
|
NULL isTicket,
|
||||||
0 lineFk,
|
NULL lineFk,
|
||||||
0 isPicked,
|
NULL isPicked,
|
||||||
0 clientType,
|
NULL clientType,
|
||||||
0 claimFk,
|
NULL claimFk,
|
||||||
NULL `order`,
|
NULL `order`
|
||||||
0 orderFk
|
|
||||||
UNION ALL
|
UNION ALL
|
||||||
SELECT shipped,
|
SELECT `type`,
|
||||||
|
shipped,
|
||||||
alertlevel,
|
alertlevel,
|
||||||
stateName,
|
stateName,
|
||||||
origin,
|
origin,
|
||||||
|
@ -314,8 +296,7 @@ BEGIN
|
||||||
isPicked,
|
isPicked,
|
||||||
clientType,
|
clientType,
|
||||||
claimFk,
|
claimFk,
|
||||||
`order`,
|
`order`
|
||||||
orderFk
|
|
||||||
FROM tItemDiary
|
FROM tItemDiary
|
||||||
WHERE shipped >= vDated;
|
WHERE shipped >= vDated;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
Loading…
Reference in New Issue