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

fix: refs #7781 prevent pallet merge #2792

Merged
pablone merged 13 commits from 7781-fixPalletMerge into master 2024-10-04 06:17:57 +00:00
Conversation 0 Commits 13 Files Changed 1 +57 -38
pablone commented 2024-07-25 13:05:12 +00:00
Member
Copy Link
No description provided.
pablone added 1 commit 2024-07-25 13:05:13 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
6845f1456e fix: refs #7781 prevent pallet merge
pablone requested review from pako 2024-07-25 13:05:19 +00:00
pablone requested review from alexm 2024-07-25 13:05:29 +00:00
pablone added 1 commit 2024-07-26 04:36:02 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
876e08b1da Merge branch 'master' into 7781-fixPalletMerge
alexm requested changes 2024-07-26 05:46:37 +00:00
Dismissed
db/routines/vn/procedures/expeditionPallet_build.sql Outdated
@ -89,0 +90,4 @@
IF vExpeditionWithPallet THEN
UPDATE arcRead
SET error = vExpeditionWithOutPallet
alexm commented 2024-07-26 05:46:35 +00:00
Member
Copy Link

Si dalt se ha fet IF NOT vExpeditionWithPallet no entrarà mai per el else.
Volies ficar vExpeditionWithOutPallet ?

Si dalt se ha fet `IF NOT vExpeditionWithPallet` no entrarà mai per el else. Volies ficar `vExpeditionWithOutPallet` ?
pablone commented 2024-07-26 10:38:36 +00:00
Author
Member
Copy Link

si

si
pablone marked this conversation as resolved
pablone added 2 commits 2024-07-26 10:39:09 +00:00
pablone added 1 commit 2024-08-06 15:00:15 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
9d49d23be8 Merge branch 'master' into 7781-fixPalletMerge
pablone added 1 commit 2024-08-08 10:46:16 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
9f2057fdd0 fix: refs #7781 pallet merge
pako approved these changes 2024-08-20 08:08:33 +00:00
Dismissed
db/routines/vn/procedures/expeditionPallet_build.sql Outdated
@ -55,2 +49,2 @@
) sub
LIMIT 1;
SELECT COUNT(palletFk) INTO vExpeditionWithPallet FROM tExpedition;
SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ') INTO vExpeditionWithOutPallet
pako commented 2024-07-25 14:47:21 +00:00
Member
Copy Link

La variable es tipo INT.... ¿ que sentido tiene el group_concat ?

La variable es tipo INT.... ¿ que sentido tiene el group_concat ?
pablone marked this conversation as resolved
pablone added 1 commit 2024-09-02 07:24:23 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
225060ff74 fix: refs #7781 varible asign value
pablone added 1 commit 2024-09-02 12:52:48 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
f30c0fb94d Merge branch 'master' into 7781-fixPalletMerge
pablone added 1 commit 2024-09-09 05:54:09 +00:00
gitea/salix/pipeline/pr-master Build queued... Details
25ff498a0b Merge branch 'master' into 7781-fixPalletMerge
pablone requested review from alexm 2024-09-10 06:35:00 +00:00
pablone requested review from pako 2024-09-10 06:35:03 +00:00
pablone added 1 commit 2024-09-10 06:35:09 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
fd1370f2e0 Merge branch 'master' into 7781-fixPalletMerge
alexm approved these changes 2024-09-10 06:36:57 +00:00
Dismissed
pako requested changes 2024-09-12 05:48:24 +00:00
Dismissed
db/routines/vn/procedures/expeditionPallet_build.sql
@ -79,3 +83,3 @@
SELECT expeditionFk, vPalletFk, vWorkerFk
FROM tExpedition
ON DUPLICATE KEY UPDATE palletFk = vPalletFk, workerFk = vWorkerFk;
WHERE palletFk IS NULL;
pako commented 2024-09-10 08:14:29 +00:00
Member
Copy Link

No entenc. Si ja existeix, no actualitza ?

I el WHERE no afecta al SELECT, sino a la taula... això funciona ?

No entenc. Si ja existeix, no actualitza ? I el WHERE no afecta al SELECT, sino a la taula... això funciona ?
pablone marked this conversation as resolved
pablone added 1 commit 2024-09-12 06:24:39 +00:00
pablone requested review from alexm 2024-09-12 06:25:03 +00:00
pablone requested review from pako 2024-09-12 06:25:06 +00:00
pako approved these changes 2024-09-12 06:33:27 +00:00
alexm approved these changes 2024-09-13 05:52:37 +00:00
pablone added 1 commit 2024-10-04 05:52:23 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
72bab95be1 fix: refs #7781 leave early before any updates on the proc
pablone added 1 commit 2024-10-04 05:52:48 +00:00
gitea/salix/pipeline/pr-master This commit looks good Details
c203d5d5e7 Merge branch 'master' into 7781-fixPalletMerge
pablone merged commit 98d22c5c59 into master 2024-10-04 06:17:57 +00:00
pablone deleted branch 7781-fixPalletMerge 2024-10-04 06:17:57 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
pako
alexm
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#2792
No description provided.
Delete Branch "7781-fixPalletMerge"

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?