Merge branch 'master' into 5699-hoFixClientsDisable
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
0fce8c755b
|
@ -20,8 +20,11 @@ BEGIN
|
||||||
|
|
||||||
SELECT barcodeToItem(vBarcode) INTO vItemFk;
|
SELECT barcodeToItem(vBarcode) INTO vItemFk;
|
||||||
|
|
||||||
SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
|
IF vPacking IS NULL
|
||||||
SET vQuantity = vQuantity * vPacking;
|
THEN
|
||||||
|
SET vPacking = itemPacking(vBarcode, vWarehouseFk);
|
||||||
|
SET vQuantity = vQuantity * vPacking;
|
||||||
|
END IF;
|
||||||
|
|
||||||
IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
|
IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue