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

8179-testToMaster #3176

Merged
alexm merged 407 commits from 8179-testToMaster into master 2024-11-12 06:41:52 +00:00
Conversation 0 Commits 407 Files Changed 335 +16 -7
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 459f6601b7 - Show all commits

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

@ -26,12 +26,20 @@ module.exports = Self => {
Self.getStockBoughtDetail = async(workerFk, dated) => { Self.getStockBoughtDetail = async(workerFk, dated) => {
const models = Self.app.models; const models = Self.app.models;
await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated]); const myOptions = {};
const tx = await models.Collection.beginTransaction({}); let tx;
const options = {transaction: tx};
let result; let result;
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try { try {
await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], options); await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
result = await Self.rawSql( result = await Self.rawSql(
`SELECT b.entryFk entryFk, `SELECT b.entryFk entryFk,
i.id itemFk, i.id itemFk,
@ -53,13 +61,14 @@ module.exports = Self => {
JOIN volumeConfig vc JOIN volumeConfig vc
WHERE ic.display WHERE ic.display
AND w.id = ?`, AND w.id = ?`,
[workerFk], options [workerFk], myOptions
); );
await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], options); await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
if (tx) await tx.commit();
return result;
} catch (e) { } catch (e) {
await tx.rollback(); await tx.rollback();
throw e; throw e;
} }
return result;
}; };
}; };