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

refactor: refs #6609 sectorType description to code #2008

Merged
guillermo merged 5 commits from 6609-sectorType into dev 2024-02-08 11:19:39 +00:00
Conversation 0 Commits 5 Files Changed 6 +7 -7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e009b6f25 - Show all commits

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

@ -184,8 +184,8 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
(13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0), (13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0),
(60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0); (60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0);
INSERT INTO `vn`.`sectorType` (id,description) INSERT INTO `vn`.`sectorType` (`id`, `code`)
VALUES (1,'First type'); VALUES (1,'normal');
INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`) INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`)
VALUES VALUES

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

@ -70,9 +70,9 @@ BEGIN
ish.created, ish.created,
ish.visible, ish.visible,
IFNULL( IFNULL(
IF(st.description = 'previousByPacking', ish.packing, g.`grouping`), IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
1) `grouping`, 1) `grouping`,
st.description = 'previousPrepared' isPreviousPrepared, st.code = 'previousPrepared' isPreviousPrepared,
iss.id itemShelvingSaleFk, iss.id itemShelvingSaleFk,
ts.ticketFk, ts.ticketFk,
iss.id, iss.id,

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

@ -207,7 +207,7 @@ proc: BEGIN
ENGINE = MEMORY ENGINE = MEMORY
SELECT ish.itemFk, SELECT ish.itemFk,
p.sectorFk, p.sectorFk,
st.description = 'previousPrepared' isPreviousPrepared, st.code = 'previousPrepared' isPreviousPrepared,
sc.itemPackingTypeFk sc.itemPackingTypeFk
FROM itemShelving ish FROM itemShelving ish
JOIN shelving sh ON sh.code = ish.shelvingFk JOIN shelving sh ON sh.code = ish.shelvingFk

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

@ -85,7 +85,7 @@ BEGIN
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk
JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
JOIN packagingConfig pc JOIN packagingConfig pc
WHERE IF(st.description = 'previousByPacking', WHERE IF(st.code = 'previousByPacking',
i.`size` > pc.previousPreparationMinimumSize i.`size` > pc.previousPreparationMinimumSize
AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ), AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
TRUE) TRUE)

2
db/routines/vn/views/itemShelvingStock.sql
View File

@ -15,7 +15,7 @@ AS SELECT `ish`.`itemFk` AS `itemFk`,
`sh`.`parkingFk` AS `parkingFk`, `sh`.`parkingFk` AS `parkingFk`,
`ish`.`id` AS `itemShelvingFk`, `ish`.`id` AS `itemShelvingFk`,
`ish`.`created` AS `created`, `ish`.`created` AS `created`,
`st`.`description` = 'previousPrepared' AS `isPreviousPrepared` `st`.`code` = 'previousPrepared' AS `isPreviousPrepared`
FROM ( FROM (
( (
( (