verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

SQL grouping quoted
gitea/salix/dev This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-11-21 12:01:21 +01:00
parent 0733ef8949
commit 30ac174b1e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/changes/10100-allSaints/02-catalog_componentCalculate.sql
View File

@ -56,7 +56,7 @@ proc: BEGIN
IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3, IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
IFNULL(pf.rate3, 0) AS minPrice, IFNULL(pf.rate3, 0) AS minPrice,
IFNULL(pf.packing, b.packing) packing, IFNULL(pf.packing, b.packing) packing,
IFNULL(pf.`grouping`, b.`grouping`) grouping, IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
ABS(IFNULL(pf.box, b.groupingMode)) groupingMode, ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
tl.buyFk, tl.buyFk,
i.typeFk, i.typeFk,
@ -201,7 +201,7 @@ proc: BEGIN
SELECT tcc.warehouseFk, SELECT tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
1 rate, 1 rate,
IF(tcc.groupingMode = 1, tcc.`grouping`, 1) grouping, IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price, CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc
@ -211,12 +211,12 @@ proc: BEGIN
AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0) AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
GROUP BY tcs.warehouseFk, tcs.itemFk; GROUP BY tcs.warehouseFk, tcs.itemFk;
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg) INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
SELECT SELECT
tcc.warehouseFk, tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
2 rate, 2 rate,
tcc.packing grouping, tcc.packing `grouping`,
SUM(tcs.sumCost) price, SUM(tcs.sumCost) price,
SUM(tcs.sumCost) / weightGrouping priceKg SUM(tcs.sumCost) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc
@ -226,12 +226,12 @@ proc: BEGIN
AND tcc.packing > 0 AND tcc.available >= tcc.packing) AND tcc.packing > 0 AND tcc.available >= tcc.packing)
GROUP BY tcs.warehouseFk, tcs.itemFk; GROUP BY tcs.warehouseFk, tcs.itemFk;
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg) INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
SELECT SELECT
tcc.warehouseFk, tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
3 rate, 3 rate,
tcc.available grouping, tcc.available `grouping`,
SUM(tcs.sumCost) price, SUM(tcs.sumCost) price,
SUM(tcs.sumCost) / weightGrouping priceKg SUM(tcs.sumCost) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc

12
db/changes/10100-allSaints/03-ticketComponentCalculate.sql
View File

@ -57,7 +57,7 @@ proc: BEGIN
IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3, IF((@rate3 := IFNULL(pf.rate3, b.price3)) < i.minPrice AND i.hasMinPrice, i.minPrice, @rate3) * 1.0 rate3,
IFNULL(pf.rate3, 0) AS minPrice, IFNULL(pf.rate3, 0) AS minPrice,
IFNULL(pf.packing, b.packing) packing, IFNULL(pf.packing, b.packing) packing,
IFNULL(pf.`grouping`, b.`grouping`) grouping, IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
ABS(IFNULL(pf.box, b.groupingMode)) groupingMode, ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
tl.buyFk, tl.buyFk,
i.typeFk, i.typeFk,
@ -204,7 +204,7 @@ proc: BEGIN
SELECT tcc.warehouseFk, SELECT tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
1 rate, 1 rate,
IF(tcc.groupingMode = 1, tcc.`grouping`, 1) grouping, IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`,
CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price, CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
CAST(SUM(tcs.sumCost) / weightGrouping AS DECIMAL(10,2)) priceKg CAST(SUM(tcs.sumCost) / weightGrouping AS DECIMAL(10,2)) priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc
@ -214,12 +214,12 @@ proc: BEGIN
AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0) AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0)
GROUP BY tcs.warehouseFk, tcs.itemFk; GROUP BY tcs.warehouseFk, tcs.itemFk;
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg) INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
SELECT SELECT
tcc.warehouseFk, tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
2 rate, 2 rate,
tcc.packing grouping, tcc.packing `grouping`,
SUM(tcs.sumCost) price, SUM(tcs.sumCost) price,
SUM(tcs.sumCost) / weightGrouping priceKg SUM(tcs.sumCost) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc
@ -229,12 +229,12 @@ proc: BEGIN
AND tcc.packing > 0 AND tcc.available >= tcc.packing) AND tcc.packing > 0 AND tcc.available >= tcc.packing)
GROUP BY tcs.warehouseFk, tcs.itemFk; GROUP BY tcs.warehouseFk, tcs.itemFk;
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, grouping, price, priceKg) INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
SELECT SELECT
tcc.warehouseFk, tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
3 rate, 3 rate,
tcc.available grouping, tcc.available `grouping`,
SUM(tcs.sumCost) price, SUM(tcs.sumCost) price,
SUM(tcs.sumCost) / weightGrouping priceKg SUM(tcs.sumCost) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc