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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

This commit is contained in:
Jorge Penadés 2024-11-11 16:08:43 +01:00
parent 72dcb84523 180b0b5b3f
commit e9df8e06c8
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2476,7 +2476,8 @@ INSERT INTO `vn`.`dmsType`
(20, 'Reclamación', 1, 1, 'claim'), (20, 'Reclamación', 1, 1, 'claim'),
(21, 'Entrada', 1, 1, 'entry'), (21, 'Entrada', 1, 1, 'entry'),
(22, 'Proveedor', 1, 1, 'supplier'), (22, 'Proveedor', 1, 1, 'supplier'),
(23, 'Termografos', 35, 35, 'thermograph'); (23, 'Termografos', 35, 35, 'thermograph'),
(24, 'Sello de calidad', 1, 1, 'qualitySeal');
INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`) INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
VALUES VALUES

2
db/routines/vn/procedures/clean.sql
View File

@ -56,7 +56,7 @@ BEGIN
AND ts.id IS NULL; AND ts.id IS NULL;
DELETE FROM claim WHERE ticketCreated < v4Years; DELETE FROM claim WHERE ticketCreated < v4Years;
-- Robert ubicacion anterior de travelLog comentario para debug -- Robert ubicacion anterior de travelLog comentario para debug
DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months; DELETE FROM zoneEvent WHERE dated < v2Months OR ended < v2Months;
DELETE b FROM buy b DELETE b FROM buy b
JOIN entryConfig e ON e.defaultEntry = b.entryFk JOIN entryConfig e ON e.defaultEntry = b.entryFk
WHERE b.created < v2Months; WHERE b.created < v2Months;

4
db/routines/vn/procedures/collection_new.sql
View File

@ -146,8 +146,6 @@ BEGIN
DELETE pb DELETE pb
FROM tmp.productionBuffer pb FROM tmp.productionBuffer pb
JOIN state s ON s.id = pb.state JOIN state s ON s.id = pb.state
JOIN agencyMode am ON am.id = pb.agencyModeFk
JOIN agency a ON a.id = am.agencyFk
LEFT JOIN ( LEFT JOIN (
SELECT pb.ticketFk, MAX(i.`size`) maxSize SELECT pb.ticketFk, MAX(i.`size`) maxSize
FROM tmp.productionBuffer pb FROM tmp.productionBuffer pb
@ -158,7 +156,7 @@ BEGIN
) sub ON sub.ticketFk = pb.ticketFk ) sub ON sub.ticketFk = pb.ticketFk
JOIN productionConfig pc JOIN productionConfig pc
WHERE pb.shipped <> util.VN_CURDATE() WHERE pb.shipped <> util.VN_CURDATE()
OR (pb.ubicacion IS NULL AND a.isOwn) OR pb.ubicacion IS NULL
OR (NOT s.isPreparable AND NOT s.isPrintable) OR (NOT s.isPreparable AND NOT s.isPrintable)
OR pb.collectionH IS NOT NULL OR pb.collectionH IS NOT NULL
OR pb.collectionV IS NOT NULL OR pb.collectionV IS NOT NULL

2
db/versions/11331-bronzeBirch/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.supplier ADD companySize ENUM('small', 'medium', 'big') NULL;

3
modules/supplier/back/methods/supplier/getSummary.js
View File

@ -43,7 +43,8 @@ module.exports = Self => {
'sageWithholdingFk', 'sageWithholdingFk',
'workerFk', 'workerFk',
'supplierActivityFk', 'supplierActivityFk',
'healthRegister' 'healthRegister',
'companySize'
], ],
include: [ include: [
{ {

3
modules/supplier/back/models/supplier.json
View File

@ -113,6 +113,9 @@
}, },
"isVies": { "isVies": {
"type": "boolean" "type": "boolean"
},
"companySize": {
"type": "string"
} }
}, },
"relations": { "relations": {