Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
c254f31da2
|
@ -92,10 +92,12 @@ proc: BEGIN
|
|||
SELECT i.itemFk, IFNULL(i.availabled, i.landed), i.quantity
|
||||
FROM vn.itemEntryIn i
|
||||
JOIN itemRange ir ON ir.itemFk = i.itemFk
|
||||
LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk
|
||||
WHERE IFNULL(i.availabled, i.landed) >= vStartDate
|
||||
AND IFNULL(i.availabled, i.landed) <= vAvailabled
|
||||
AND (ir.ended IS NULL OR IFNULL(i.availabled, i.landed) <= ir.ended)
|
||||
AND i.warehouseInFk = vWarehouse
|
||||
AND wf.entryFk IS NULL
|
||||
UNION ALL
|
||||
SELECT i.itemFk, i.shipped, i.quantity
|
||||
FROM vn.itemEntryOut i
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE vn.volumeConfig
|
||||
MODIFY COLUMN palletM3 decimal(10,2) DEFAULT NULL NULL
|
||||
COMMENT 'metros cúbicos para el warehouse VNH (Se refactorizará en el redmine refs #8637)',
|
||||
ADD localPalletM3 decimal(10,2) NULL
|
||||
COMMENT 'metros cúbicos para el warehouse Algemesi (Se refactorizará en el redmine refs #8637)';
|
Loading…
Reference in New Issue