7145-wordBreak #2247

Merged
pablone merged 2 commits from 7145-wordBreak into dev 2024-04-04 07:38:52 +00:00
3 changed files with 66 additions and 62 deletions

View File

@ -1,3 +1,9 @@
td{
overflow: hidden;
max-width: 100px;
text-overflow: ellipsis;
}
h1 { h1 {
text-align: center; text-align: center;
} }

View File

@ -1,5 +1,4 @@
SELECT SELECT r.id,
r.id,
r.m3, r.m3,
r.created, r.created,
r.time, r.time,
@ -7,8 +6,8 @@ SELECT
v.tradeMark vehicleTradeMark, v.tradeMark vehicleTradeMark,
v.model vehicleModel, v.model vehicleModel,
v.numberPlate plateNumber, v.numberPlate plateNumber,
IFNULL(s.name, am.name) AS agencyName IFNULL(s.name, am.name) agencyName
FROM route r FROM route r
LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN vehicle v ON v.id = r.vehicleFk
LEFT JOIN worker w ON w.id = r.workerFk LEFT JOIN worker w ON w.id = r.workerFk
LEFT JOIN account.user u ON u.id = w.id LEFT JOIN account.user u ON u.id = w.id
@ -16,4 +15,4 @@ FROM route r
LEFT JOIN agency a ON a.id = am.agencyFk LEFT JOIN agency a ON a.id = am.agencyFk
LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id LEFT JOIN supplierAgencyTerm sa ON sa.agencyFk = a.id
LEFT JOIN supplier s ON s.id = sa.supplierFk LEFT JOIN supplier s ON s.id = sa.supplierFk
WHERE r.id IN(?) WHERE r.id IN(?)

View File

@ -1,25 +1,24 @@
SELECT SELECT t.nickname addressName,
t.nickname addressName,
t.packages, t.packages,
t.priority, t.priority,
t.id, t.id,
t.clientFk, t.clientFk,
t.companyFk, t.companyFk,
t.routeFk, t.routeFk,
if(a.phone, a.phone, c.phone) AS phone, if(a.phone, a.phone, c.phone) phone,
if(a.mobile, a.mobile, c.mobile) AS mobile, if(a.mobile, a.mobile, c.mobile) mobile,
wh.name warehouseName, wh.name warehouseName,
a.city, a.city,
a.street, a.street,
a.postalCode, a.postalCode,
LPAD(a.id, 5, '0') AS addressFk, LPAD(a.id, 5, '0') addressFk,
p.name province, p.name province,
0 AS import, 0 import,
am.name ticketAgency, am.name ticketAgency,
tob.description, tob.description,
u.nickName salesPersonName, u.nickName salesPersonName,
ipkg.itemPackingTypes ipkg.itemPackingTypes
FROM route r FROM route r
JOIN ticket t ON t.routeFk = r.id JOIN ticket t ON t.routeFk = r.id
LEFT JOIN address a ON a.id = t.addressFk LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN client c ON c.id = t.clientFk LEFT JOIN client c ON c.id = t.clientFk
@ -39,5 +38,5 @@ FROM route r
WHERE r.id IN (?) WHERE r.id IN (?)
GROUP BY t.id GROUP BY t.id
) ipkg ON ipkg.ticketFk = t.id ) ipkg ON ipkg.ticketFk = t.id
WHERE r.id IN (?) WHERE r.id IN (?)
ORDER BY t.priority, t.id; ORDER BY t.priority, t.id;