refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
2f611391b9
commit
3d1c69be56
|
|
@ -168,55 +168,65 @@ module.exports = Self => {
|
|||
stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
|
||||
stmts.push(`SET SESSION optimizer_search_depth = 0`);
|
||||
|
||||
stmt = new ParameterizedSQL(
|
||||
`CREATE TEMPORARY TABLE tmp.filter
|
||||
stmt = new ParameterizedSQL(`
|
||||
CREATE TEMPORARY TABLE tmp.filter
|
||||
(PRIMARY KEY (id))
|
||||
ENGINE = MEMORY
|
||||
SELECT
|
||||
t.id,
|
||||
t.shipped,
|
||||
CAST(DATE(t.shipped) AS CHAR) AS shippedDate,
|
||||
t.nickname,
|
||||
t.refFk,
|
||||
t.routeFk,
|
||||
t.warehouseFk,
|
||||
t.clientFk,
|
||||
t.totalWithoutVat,
|
||||
t.totalWithVat,
|
||||
io.id AS invoiceOutId,
|
||||
a.provinceFk,
|
||||
p.name AS province,
|
||||
w.name AS warehouse,
|
||||
am.name AS agencyMode,
|
||||
am.id AS agencyModeFk,
|
||||
st.name AS state,
|
||||
wk.lastName AS salesPerson,
|
||||
ts.stateFk AS stateFk,
|
||||
ts.alertLevel AS alertLevel,
|
||||
ts.code AS alertLevelCode,
|
||||
u.name AS userName,
|
||||
c.salesPersonFk,
|
||||
c.credit,
|
||||
z.hour AS zoneLanding,
|
||||
z.name AS zoneName,
|
||||
z.id AS zoneFk,
|
||||
st.classColor,
|
||||
TIME_FORMAT(t.shipped, '%H:%i') AS preparationHour,
|
||||
TIME_FORMAT(z.hour, '%H:%i') AS theoreticalhour,
|
||||
TIME_FORMAT(zed.etc, '%H:%i') AS practicalHour
|
||||
FROM ticket t
|
||||
LEFT JOIN invoiceOut io ON t.refFk = io.ref
|
||||
LEFT JOIN zone z ON z.id = t.zoneFk
|
||||
LEFT JOIN address a ON a.id = t.addressFk
|
||||
LEFT JOIN province p ON p.id = a.provinceFk
|
||||
LEFT JOIN warehouse w ON w.id = t.warehouseFk
|
||||
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
|
||||
LEFT JOIN state st ON st.id = ts.stateFk
|
||||
LEFT JOIN client c ON c.id = t.clientFk
|
||||
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
|
||||
LEFT JOIN account.user u ON u.id = wk.id
|
||||
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
|
||||
SELECT t.id,
|
||||
t.shipped,
|
||||
CAST(DATE(t.shipped) AS CHAR) shippedDate,
|
||||
t.nickname,
|
||||
t.refFk,
|
||||
t.routeFk,
|
||||
t.warehouseFk,
|
||||
t.clientFk,
|
||||
t.totalWithoutVat,
|
||||
t.totalWithVat,
|
||||
io.id invoiceOutId,
|
||||
a.provinceFk,
|
||||
p.name province,
|
||||
w.name warehouse,
|
||||
am.name agencyMode,
|
||||
am.id agencyModeFk,
|
||||
st.name state,
|
||||
wk.lastName salesPerson,
|
||||
ts.stateFk stateFk,
|
||||
ts.alertLevel alertLevel,
|
||||
ts.code alertLevelCode,
|
||||
u.name userName,
|
||||
c.salesPersonFk,
|
||||
c.credit,
|
||||
z.hour zoneLanding,
|
||||
z.name zoneName,
|
||||
z.id zoneFk,
|
||||
st.classColor,
|
||||
TIME_FORMAT(t.shipped, '%H:%i') preparationHour,
|
||||
TIME_FORMAT(z.hour, '%H:%i') theoreticalhour,
|
||||
TIME_FORMAT(zed.etc, '%H:%i') practicalHour
|
||||
FROM ticket t
|
||||
LEFT JOIN invoiceOut io ON t.refFk = io.ref
|
||||
LEFT JOIN zone z ON z.id = t.zoneFk
|
||||
LEFT JOIN address a ON a.id = t.addressFk
|
||||
LEFT JOIN province p ON p.id = a.provinceFk
|
||||
LEFT JOIN warehouse w ON w.id = t.warehouseFk
|
||||
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
|
||||
LEFT JOIN state st ON st.id = ts.stateFk
|
||||
LEFT JOIN client c ON c.id = t.clientFk
|
||||
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
|
||||
LEFT JOIN account.user u ON u.id = wk.id
|
||||
LEFT JOIN (
|
||||
SELECT zoneFk,
|
||||
CAST(
|
||||
IFNULL(zoneClosureHour, zoneHour) +
|
||||
SUM(IF(hasToRecalcPrice, volume, 0)) * 60 /
|
||||
GREATEST(IFNULL(m3, 0), IFNULL(minSpeed, 0))
|
||||
AS time
|
||||
) etc
|
||||
FROM zoneEstimatedDelivery
|
||||
GROUP BY zoneFk
|
||||
) zed ON zed.zoneFk = t.zoneFk
|
||||
`);
|
||||
|
||||
if (args.orderFk) {
|
||||
stmt.merge({
|
||||
|
|
|
|||
|
|
@ -140,40 +140,56 @@ module.exports = Self => {
|
|||
const stmts = [];
|
||||
let stmt;
|
||||
|
||||
stmt = new ParameterizedSQL(
|
||||
`CREATE OR REPLACE TEMPORARY TABLE tmp.filter
|
||||
(INDEX (id))
|
||||
ENGINE = MEMORY
|
||||
SELECT
|
||||
o.id,
|
||||
o.total,
|
||||
o.date_send landed,
|
||||
o.date_make created,
|
||||
o.customer_id clientFk,
|
||||
o.agency_id agencyModeFk,
|
||||
o.address_id addressFk,
|
||||
o.company_id companyFk,
|
||||
o.source_app sourceApp,
|
||||
o.confirmed isConfirmed,
|
||||
c.name clientName,
|
||||
c.salesPersonFk,
|
||||
u.nickname workerNickname,
|
||||
u.name name,
|
||||
co.code companyCode,
|
||||
zed.zoneFk,
|
||||
zed.hourTheoretical,
|
||||
zed.hourEffective,
|
||||
am.name AS agencyName
|
||||
FROM hedera.order o
|
||||
LEFT JOIN address a ON a.id = o.address_id
|
||||
LEFT JOIN agencyMode am ON am.id = o.agency_id
|
||||
LEFT JOIN client c ON c.id = o.customer_id
|
||||
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
|
||||
LEFT JOIN account.user u ON u.id = wk.id
|
||||
LEFT JOIN company co ON co.id = o.company_id
|
||||
LEFT JOIN orderTicket ot ON ot.orderFk = o.id
|
||||
LEFT JOIN ticket t ON t.id = ot.ticketFk
|
||||
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
|
||||
stmt = new ParameterizedSQL(`
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.filter
|
||||
(INDEX (id))
|
||||
ENGINE = MEMORY
|
||||
SELECT o.id,
|
||||
o.total,
|
||||
o.date_send landed,
|
||||
o.date_make created,
|
||||
o.customer_id clientFk,
|
||||
o.agency_id agencyModeFk,
|
||||
o.address_id addressFk,
|
||||
o.company_id companyFk,
|
||||
o.source_app sourceApp,
|
||||
o.confirmed isConfirmed,
|
||||
c.name clientName,
|
||||
c.salesPersonFk,
|
||||
u.nickname workerNickname,
|
||||
u.name name,
|
||||
co.code companyCode,
|
||||
zed.zoneFk,
|
||||
zed.hourTheoretical,
|
||||
zed.hourEffective,
|
||||
am.name agencyName
|
||||
FROM hedera.order o
|
||||
LEFT JOIN address a ON a.id = o.address_id
|
||||
LEFT JOIN agencyMode am ON am.id = o.agency_id
|
||||
LEFT JOIN client c ON c.id = o.customer_id
|
||||
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
|
||||
LEFT JOIN account.user u ON u.id = wk.id
|
||||
LEFT JOIN company co ON co.id = o.company_id
|
||||
LEFT JOIN orderTicket ot ON ot.orderFk = o.id
|
||||
LEFT JOIN ticket t ON t.id = ot.ticketFk
|
||||
LEFT JOIN (
|
||||
SELECT zoneFk,
|
||||
CAST(
|
||||
util.VN_CURDATE() +
|
||||
INTERVAL HOUR(IFNULL(zoneClosureHour, zoneHour)) * 60 +
|
||||
MINUTE(IFNULL(zoneClosureHour, zoneHour)) MINUTE
|
||||
AS time
|
||||
) hourTheoretical,
|
||||
CAST(
|
||||
IFNULL(zoneClosureHour, zoneHour) +
|
||||
SUM(IF(hasToRecalcPrice, volume, 0)) * 60 /
|
||||
GREATEST(IFNULL(m3, 0), IFNULL(minSpeed, 0))
|
||||
AS time
|
||||
) hourEffective
|
||||
FROM zoneEstimatedDelivery
|
||||
GROUP BY zoneFk
|
||||
) zed ON zed.zoneFk = t.zoneFk
|
||||
`);
|
||||
|
||||
stmt.merge(conn.makeWhere(filter.where));
|
||||
stmt.merge(`GROUP BY id`);
|
||||
|
|
|
|||
|
|
@ -11,28 +11,24 @@
|
|||
"id": true,
|
||||
"type": "number"
|
||||
},
|
||||
"hourTheoretical": {
|
||||
"zoneClosureHour": {
|
||||
"type": "date"
|
||||
},
|
||||
"totalVolume": {
|
||||
"zoneHour": {
|
||||
"type": "date"
|
||||
},
|
||||
"volume": {
|
||||
"type": "number"
|
||||
},
|
||||
"remainingVolume": {
|
||||
"hasToRecalcPrice": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"m3": {
|
||||
"type": "number"
|
||||
},
|
||||
"speed": {
|
||||
"minSpeed": {
|
||||
"type": "number"
|
||||
},
|
||||
"hourEffective": {
|
||||
"type": "date"
|
||||
},
|
||||
"minutesLess": {
|
||||
"type": "date"
|
||||
},
|
||||
"etc": {
|
||||
"type": "date"
|
||||
}
|
||||
|
||||
},
|
||||
"relations": {
|
||||
"zone": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue