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

4590-Refactor-isBox-freightItemFk #1079

Merged
joan merged 13 commits from 4590-Refactor-isBox-freightItemFk into dev 2022-11-10 07:50:14 +00:00
Conversation 0 Commits 13 Files Changed 5 +15 -15
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dump/fixtures.sql
View File

@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
(3, 'Perdida', 'LOST'); (3, 'Perdida', 'LOST');
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`) INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`)
VALUES VALUES
(1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'), (1, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 15, 1, 18, 'UR9000006041', 94, 1, 'pc1'),
(2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL), (2, 1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 16, 2, 18, 'UR9000006041', 94, 1, NULL),

18
db/dump/structure.sql
View File

@ -27518,7 +27518,7 @@ CREATE TABLE `expedition` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`agencyModeFk` int(11) NOT NULL, `agencyModeFk` int(11) NOT NULL,
`ticketFk` int(10) NOT NULL, `ticketFk` int(10) NOT NULL,
`isBox` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk', `freightItemFk` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
`created` timestamp NULL DEFAULT current_timestamp(), `created` timestamp NULL DEFAULT current_timestamp(),
`isRefund__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022', `isRefund__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
`isPickUp__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022', `isPickUp__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
@ -27534,7 +27534,7 @@ CREATE TABLE `expedition` (
`hasNewRoute` bit(1) NOT NULL DEFAULT b'0', `hasNewRoute` bit(1) NOT NULL DEFAULT b'0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `index1` (`agencyModeFk`), KEY `index1` (`agencyModeFk`),
KEY `index2` (`isBox`), KEY `index2` (`freightItemFk`),
KEY `index3` (`created`), KEY `index3` (`created`),
KEY `index4` (`ticketFk`), KEY `index4` (`ticketFk`),
KEY `expedition_fk3_idx` (`packagingFk`), KEY `expedition_fk3_idx` (`packagingFk`),
@ -27567,7 +27567,7 @@ BEGIN
DECLARE vShipFk INT; DECLARE vShipFk INT;
IF NEW.isBox > 0 THEN IF NEW.freightItemFk > 0 THEN
UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk; UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
@ -27638,7 +27638,7 @@ DELIMITER ;;
BEGIN BEGIN
UPDATE ticket t UPDATE ticket t
SET packages = (SELECT COUNT(counter)-1 SET packages = (SELECT COUNT(counter)-1
FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.isBox) FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
WHERE t.id = OLD.ticketFk; WHERE t.id = OLD.ticketFk;
END */;; END */;;
@ -36287,7 +36287,7 @@ CREATE TABLE `sorter` (
`created` datetime NOT NULL, `created` datetime NOT NULL,
`routeFk` int(10) unsigned NOT NULL, `routeFk` int(10) unsigned NOT NULL,
`ticketFk` int(10) NOT NULL, `ticketFk` int(10) NOT NULL,
`isBox` int(11) DEFAULT 1, `freightItemFk` int(11) DEFAULT 1,
`itemFk` int(11) DEFAULT NULL, `itemFk` int(11) DEFAULT NULL,
`width` decimal(10,2) DEFAULT 0.00, `width` decimal(10,2) DEFAULT 0.00,
`depth` decimal(10,2) DEFAULT 0.00, `depth` decimal(10,2) DEFAULT 0.00,
@ -44956,7 +44956,7 @@ BEGIN
SELECT SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) INTO deliveryPrice SELECT SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) INTO deliveryPrice
FROM vn.ticket t FROM vn.ticket t
LEFT JOIN expedition e ON e.ticketFk = t.id LEFT JOIN expedition e ON e.ticketFk = t.id
JOIN expeditionBoxVol ebv ON ebv.boxFk = e.isBox JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
WHERE t.id = vTicketFk; WHERE t.id = vTicketFk;
END IF; END IF;
@ -46492,7 +46492,7 @@ BEGIN
LEFT JOIN item i ON i.id = b.itemFk LEFT JOIN item i ON i.id = b.itemFk
LEFT JOIN itemType it ON it.id = i.typeFk LEFT JOIN itemType it ON it.id = i.typeFk
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.freightItemFk
JOIN volumeConfig vc ON TRUE JOIN volumeConfig vc ON TRUE
WHERE b.id = vSelf; WHERE b.id = vSelf;
@ -53229,7 +53229,7 @@ BEGIN
INNER JOIN vn.ticketState ts ON ts.ticketFk = exp.ticketFk INNER JOIN vn.ticketState ts ON ts.ticketFk = exp.ticketFk
LEFT JOIN vn.address a ON t.addressFk = a.id LEFT JOIN vn.address a ON t.addressFk = a.id
LEFT JOIN vn.warehouse w ON t.warehouseFk = w.id LEFT JOIN vn.warehouse w ON t.warehouseFk = w.id
WHERE t.routeFk = vRouteFk AND exp.isBox > 0; WHERE t.routeFk = vRouteFk AND exp.freightItemFk > 0;
END ;; END ;;
DELIMITER ; DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ; /*!50003 SET sql_mode = @saved_sql_mode */ ;
@ -53760,7 +53760,7 @@ BEGIN
GROUP BY sub.ticketFk GROUP BY sub.ticketFk
) sub2 ON sub2.ticketFk = t.id ) sub2 ON sub2.ticketFk = t.id
LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk LEFT JOIN expeditionStateType est ON est.id = e.stateTypeFk
WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
ORDER BY r.created, t.priority DESC; ORDER BY r.created, t.priority DESC;
END ;; END ;;
DELIMITER ; DELIMITER ;

2
modules/entry/front/buy/index/index.html
View File

@ -91,7 +91,7 @@
url="Packagings" url="Packagings"
show-field="id" show-field="id"
value-field="id" value-field="id"
where="{isBox: true}" where="{freightItemFk: true}"
pau marked this conversation as resolved
joan commented 2022-10-13 12:59:46 +00:00
Review
Copy Link

Esta columna no pertece al modelo Expedition, esta no hay que cambiarla

Esta columna no pertece al modelo Expedition, esta no hay que cambiarla
ng-model="buy.packageFk" ng-model="buy.packageFk"
on-change="$ctrl.saveBuy(buy)"> on-change="$ctrl.saveBuy(buy)">
</vn-autocomplete> </vn-autocomplete>

4
modules/ticket/back/methods/expedition/filter.js
View File

@ -32,7 +32,7 @@ module.exports = Self => {
`SELECT `SELECT
e.id, e.id,
e.ticketFk, e.ticketFk,
e.isBox, e.freightItemFk,
e.workerFk, e.workerFk,
i1.name packageItemName, i1.name packageItemName,
e.counter, e.counter,
@ -51,7 +51,7 @@ module.exports = Self => {
FROM vn.expedition e FROM vn.expedition e
LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
LEFT JOIN vn.item i2 ON i2.id = e.itemFk LEFT JOIN vn.item i2 ON i2.id = e.itemFk
INNER JOIN vn.item i1 ON i1.id = e.isBox INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
LEFT JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.packaging p ON p.id = e.packagingFk
LEFT JOIN vn.item i3 ON i3.id = p.itemFk LEFT JOIN vn.item i3 ON i3.id = p.itemFk
LEFT JOIN account.user u ON u.id = e.workerFk LEFT JOIN account.user u ON u.id = e.workerFk

4
modules/ticket/back/models/expedition.json
View File

@ -16,7 +16,7 @@
"type": "number", "type": "number",
"description": "Identifier" "description": "Identifier"
}, },
"isBox": { "freightItemFk": {
pau marked this conversation as resolved
joan commented 2022-10-13 12:56:52 +00:00
Review
Copy Link

No es necesario especificar la propiedad, si ya existe una relación de la misma columna.

En este caso no hace falta que lo quites, simplemente para tenerlo en cuenta a futuro.

No es necesario especificar la propiedad, si ya existe una relación de la misma columna. En este caso no hace falta que lo quites, simplemente para tenerlo en cuenta a futuro.
"type": "number" "type": "number"
}, },
"created": { "created": {
@ -55,7 +55,7 @@
"freightItem": { "freightItem": {
"type": "belongsTo", "type": "belongsTo",
"model": "Item", "model": "Item",
"foreignKey": "isBox" "foreignKey": "freightItemFk"
}, },
"packaging": { "packaging": {
"type": "belongsTo", "type": "belongsTo",