verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 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 +8 -5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 225060ff74 - Show all commits

13
db/routines/vn/procedures/expeditionPallet_build.sql
View File

@ -52,7 +52,7 @@ BEGIN
FROM tExpedition FROM tExpedition
WHERE palletFk IS NULL; WHERE palletFk IS NULL;
SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ') INTO vExpeditionWithPallet SELECT COUNT(expeditionFk) INTO vExpeditionWithPallet
FROM tExpedition FROM tExpedition
WHERE palletFk; WHERE palletFk;
@ -60,7 +60,6 @@ BEGIN
CALL util.throw ('NO_FREE_EXPEDITIONS'); CALL util.throw ('NO_FREE_EXPEDITIONS');
END IF; END IF;
SELECT roadmapStopFk INTO vTruckFk SELECT roadmapStopFk INTO vTruckFk
FROM ( FROM (
SELECT rm.roadmapStopFk, count(*) n SELECT rm.roadmapStopFk, count(*) n
@ -91,12 +90,16 @@ BEGIN
INSERT INTO expeditionState(expeditionFk, typeFk) INSERT INTO expeditionState(expeditionFk, typeFk)
SELECT expeditionFk, vExpeditionStateTypeFk SELECT expeditionFk, vExpeditionStateTypeFk
FROM tExpedition FROM tExpedition
pablone marked this conversation as resolved Outdated
alexm commented 2024-07-26 05:46:35 +00:00
Outdated
Review
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
Outdated
Review
Copy Link

si

si
WHERE palletFk IS NULL; WHERE palletFk IS NULL;
IF vExpeditionWithPallet THEN IF vExpeditionWithPallet THEN
UPDATE arcRead UPDATE arcRead
SET error = vExpeditionWithPallet SET error = (
SELECT GROUP_CONCAT(expeditionFk SEPARATOR ', ')
FROM tExpedition
WHERE palletFk
)
WHERE id = vArcId; WHERE id = vArcId;
ELSE ELSE
UPDATE arcRead SET error = NULL WHERE id = vArcId; UPDATE arcRead SET error = NULL WHERE id = vArcId;