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

fix: refs #7404 negative quantity #3214

Merged
pablone merged 2 commits from 7404-fixNegativeQuantity into master 2024-11-19 06:16:10 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33d9ba9b44 - Show all commits

2
db/routines/vn/procedures/stockBought_calculate.sql
View File

@ -80,7 +80,7 @@ proc: BEGIN
UPDATE stockBought s UPDATE stockBought s
JOIN tStockSold ts ON ts.workerFk = s.workerFk JOIN tStockSold ts ON ts.workerFk = s.workerFk
SET s.bought = IF(s.bought < ts.sold, ROUND(s.bought - ts.sold, 1), 0) SET s.bought = IF(s.bought < ABS(ts.sold), 0, ROUND(s.bought - ABS(ts.sold), 1))
WHERE s.dated = vDated; WHERE s.dated = vDated;
DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold; DROP TEMPORARY TABLE tCurrentData, tmp.item, tmp.buyUltimate, tStockSold;

7
modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
View File

@ -50,8 +50,11 @@ module.exports = Self => {
i.id itemFk, i.id itemFk,
i.name itemName, i.name itemName,
ti.quantity, ti.quantity,
ROUND((ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id)) ROUND((ac.conversionCoefficient *
jgallego commented 2024-11-19 05:46:44 +00:00
Review
Copy Link

si açò es hotfix ho pugem, pero fes-li test, que açò es prou crític.

si açò es hotfix ho pugem, pero fes-li test, que açò es prou crític.
pablone commented 2024-11-19 06:15:55 +00:00
Review
Copy Link

solo le he dado formato el sql y amplia el redondeo de 1 decimal a 2

solo le he dado formato el sql y amplia el redondeo de 1 decimal a 2
/ (vc.trolleyM3 * 1000000),1) volume, (ti.quantity / b.packing) *
buy_getVolume(b.id)
) / (vc.trolleyM3 * 1000000),
2) volume,
b.packagingFk packagingFk, b.packagingFk packagingFk,
b.packing b.packing
FROM tmp.item ti FROM tmp.item ti