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

fix: refs #7779 refactor collection #3021

Merged
carlosap merged 4 commits from 7779-refactor-collection into dev 2024-09-27 09:29:36 +00:00
Conversation 0 Commits 4 Files Changed 4 +220 -296
carlosap commented 2024-09-26 08:36:44 +00:00
Member
Copy Link
No description provided.
carlosap added 1 commit 2024-09-26 08:36:45 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
eb2a30f0d9 fix: refs #7779 refactor collection
carlosap requested review from jgallego 2024-09-26 08:37:03 +00:00
jgallego requested changes 2024-09-26 09:08:53 +00:00
Dismissed
db/routines/vn/procedures/collection_new.sql Outdated
@ -290,0 +245,4 @@
SELECT wagon INTO vFreeWagonFk
FROM tTrain
GROUP BY wagon
HAVING SUM(IFNULL(ticketFk, 0)) = 0
jgallego commented 2024-09-26 08:55:30 +00:00
Owner
Copy Link

HAVING COUNT(ticketFk) = 0 açò seria mes intuitiu

HAVING COUNT(ticketFk) = 0 açò seria mes intuitiu
jgallego marked this conversation as resolved
db/routines/vn/procedures/collection_new.sql Outdated
@ -319,0 +262,4 @@
JOIN (SELECT wagon
FROM tTrain
GROUP BY wagon
HAVING SUM(IFNULL(ticketFk, 0)) = 0
jgallego commented 2024-09-26 08:55:42 +00:00
Owner
Copy Link

HAVING COUNT(ticketFk) = 0

HAVING COUNT(ticketFk) = 0
jgallego marked this conversation as resolved
db/routines/vn/procedures/ticket_mergeSales.sql
@ -34,4 +44,0 @@
JOIN itemType it ON it.id = i.typeFk
WHERE s.ticketFk = vSelf
AND stp.id IS NULL
AND it.isMergeable;
jgallego commented 2024-09-26 09:04:39 +00:00
Owner
Copy Link

si no es gasta esta columna, estar segurs i la kkejem, no es gasta en altres llocs

si no es gasta esta columna, estar segurs i la kkejem, no es gasta en altres llocs
carlosap commented 2024-09-26 10:48:07 +00:00
Author
Member
Copy Link

Quina columna, isMergeable¿? Heu he llevat perque ja es fa més amunt en el codi, he canviat la logica pero deuria de ser el mateix resultat

Quina columna, isMergeable¿? Heu he llevat perque ja es fa més amunt en el codi, he canviat la logica pero deuria de ser el mateix resultat
carlosap added 1 commit 2024-09-26 10:48:21 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0851c6fb97 fix: refs #7779 refactor collection
carlosap requested review from jgallego 2024-09-26 10:49:17 +00:00
jgallego approved these changes 2024-09-26 11:00:50 +00:00
carlosap requested review from pako 2024-09-26 11:08:18 +00:00
pako requested changes 2024-09-26 12:39:15 +00:00
Dismissed
db/routines/vn/procedures/collection_new.sql
@ -295,38 +254,35 @@ BEGIN
SET ticketFk = vFirstTicketFk
pako commented 2024-09-26 12:38:19 +00:00
Member
Copy Link

No tinc clar que se estiga asegurant que el primer ticket sempre siga asignat... ho has comprovat ?

No tinc clar que se estiga asegurant que el primer ticket sempre siga asignat... ho has comprovat ?
carlosap commented 2024-09-26 15:50:50 +00:00
Author
Member
Copy Link

Sí, heu he provat en les dades de dev

Sí, heu he provat en les dades de dev
db/routines/vn/procedures/ticket_splitItemPackingType.sql
@ -90,3 +67,1 @@
INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
VALUES(vNewTicketFk, vItemPackingTypeFk);
END LOOP;
UPDATE tSalesToMove
pako commented 2024-09-26 12:39:07 +00:00
Member
Copy Link

No tinc clar que se estiga respectant el ticket original per al itemPackingType definit... ho has comprovat ?

No tinc clar que se estiga respectant el ticket original per al itemPackingType definit... ho has comprovat ?
carlosap commented 2024-09-26 15:51:56 +00:00
Author
Member
Copy Link

també està provat en dev, pero de totes maneres hi ha que fer proves quan estiga pujat i abans de que passe a producció

també està provat en dev, pero de totes maneres hi ha que fer proves quan estiga pujat i abans de que passe a producció
carlosap added 1 commit 2024-09-26 15:44:32 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0ad1d838d9 fix: refs #7779 refactor collection
carlosap added 1 commit 2024-09-26 15:53:57 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
5270db2abe fix: refs #7779 refactor collection
pako approved these changes 2024-09-27 05:41:41 +00:00
carlosap merged commit 4156a0f0fe into dev 2024-09-27 09:29:36 +00:00
carlosap deleted branch 7779-refactor-collection 2024-09-27 09:29:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
pako
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#3021
No description provided.
Delete Branch "7779-refactor-collection"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?