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

Merge branch 'master' into 8169-itemTextureTag
gitea/salix/pipeline/pr-master This commit looks good Details

This commit is contained in:
Robert Ferrús 2024-11-13 09:45:23 +00:00
parent d925a5d7fa 1086981b53
commit 9b079a8bb2
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ BEGIN
LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
AND issw.warehouseFk = t.warehouseFk AND issw.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) < s.quantity WHERE IFNULL(v.visible, 0) < s.quantity
AND IFNULL(av.available, 0) < s.quantity AND IFNULL(av.available, 0) < 0
AND IFNULL(issw.visible, 0) < s.quantity AND IFNULL(issw.visible, 0) < s.quantity
AND NOT s.isPicked AND NOT s.isPicked
AND NOT s.reserved AND NOT s.reserved
@ -190,7 +190,7 @@ BEGIN
LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
AND issw.warehouseFk = t.warehouseFk AND issw.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible, 0) < s.quantity WHERE IFNULL(v.visible, 0) < s.quantity
AND IFNULL(av.available, 0) >= s.quantity AND IFNULL(av.available, 0) >= 0
AND IFNULL(issw.visible, 0) < s.quantity AND IFNULL(issw.visible, 0) < s.quantity
AND s.quantity > 0 AND s.quantity > 0
AND NOT s.isPicked AND NOT s.isPicked

10
db/routines/vn/procedures/ticket_splitItemPackingType.sql
View File

@ -14,7 +14,7 @@ proc:BEGIN
*/ */
DECLARE vDone INT DEFAULT FALSE; DECLARE vDone INT DEFAULT FALSE;
DECLARE vHasItemPackingType BOOL; DECLARE vHasItemPackingType BOOL;
DECLARE vItemPackingTypeFk INT; DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
DECLARE vNewTicketFk INT; DECLARE vNewTicketFk INT;
DECLARE vItemPackingTypes CURSOR FOR DECLARE vItemPackingTypes CURSOR FOR
@ -36,14 +36,10 @@ proc:BEGIN
) ENGINE=MEMORY ) ENGINE=MEMORY
SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk; SELECT vSelf ticketFk, vOriginalItemPackingTypeFk itemPackingTypeFk;
IF NOT vHasItemPackingType THEN
LEAVE proc;
END IF;
CREATE OR REPLACE TEMPORARY TABLE tSalesToMove ( CREATE OR REPLACE TEMPORARY TABLE tSalesToMove (
ticketFk INT, ticketFk INT,
saleFk INT, saleFk INT,
itemPackingTypeFk INT itemPackingTypeFk VARCHAR(1)
) ENGINE=MEMORY; ) ENGINE=MEMORY;
INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk) INSERT INTO tSalesToMove (saleFk, itemPackingTypeFk)
@ -55,7 +51,6 @@ proc:BEGIN
AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk; AND i.itemPackingTypeFk <> vOriginalItemPackingTypeFk;
OPEN vItemPackingTypes; OPEN vItemPackingTypes;
l: LOOP l: LOOP
SET vDone = FALSE; SET vDone = FALSE;
FETCH vItemPackingTypes INTO vItemPackingTypeFk; FETCH vItemPackingTypes INTO vItemPackingTypeFk;
@ -71,7 +66,6 @@ proc:BEGIN
WHERE itemPackingTypeFk = vItemPackingTypeFk; WHERE itemPackingTypeFk = vItemPackingTypeFk;
END LOOP; END LOOP;
CLOSE vItemPackingTypes; CLOSE vItemPackingTypes;
UPDATE sale s UPDATE sale s

2
db/versions/11251-navyChrysanthemum/01-firstScript.sql
View File

@ -1 +1 @@
-- ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity'; ALTER TABLE vn.sale MODIFY COLUMN originalQuantity decimal(10,2) DEFAULT 0.00 NOT NULL COMMENT 'Se utiliza para notificar a través de rocket los cambios de quantity';