verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba58746a03 - Show all commits

2
db/dump/fixtures.before.sql
View File

@ -1465,7 +1465,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
(103, 88, 58, 'ammo box', 2), (103, 88, 58, 'ammo box', 2),
(104, 88, 27, '100cm', 3), (104, 88, 27, '100cm', 3),
(105, 88, 36, 'Stark Industries', 4), (105, 88, 36, 'Stark Industries', 4),
(106, 88, 1, 'Green', 5), (106, 88, 1, 'White', 5),
(107, 88, 67, 'supply', 6), (107, 88, 67, 'supply', 6),
(108, 88, 23, '13', 7); (108, 88, 23, '13', 7);

4
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -86,7 +86,7 @@ module.exports = Self => {
LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
LEFT JOIN department d ON d.id = wd.departmentFk LEFT JOIN department d ON d.id = wd.departmentFk
LEFT JOIN ( LEFT JOIN (
SELECT co.clientFk, IF(COUNT(*) > 0, FALSE, TRUE) hasObservation SELECT co.clientFk, COUNT(*) hasObservation
FROM clientObservation co FROM clientObservation co
JOIN observationType ot ON ot.id = co.observationTypeFk JOIN observationType ot ON ot.id = co.observationTypeFk
WHERE ot.code = 'substitution' WHERE ot.code = 'substitution'
@ -134,7 +134,7 @@ module.exports = Self => {
LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
LEFT JOIN department d ON d.id = wd.departmentFk LEFT JOIN department d ON d.id = wd.departmentFk
LEFT JOIN ( LEFT JOIN (
SELECT co.clientFk, IF(COUNT(*) > 0, FALSE, TRUE) hasObservation SELECT co.clientFk, COUNT(*) hasObservation
FROM clientObservation co FROM clientObservation co
JOIN observationType ot ON ot.id = co.observationTypeFk JOIN observationType ot ON ot.id = co.observationTypeFk
WHERE ot.code = 'substitution' WHERE ot.code = 'substitution'