#6321 - Negative tickets #1945

Merged
jsegarra merged 146 commits from 6321_negative_tickets into dev 2025-02-11 08:45:33 +00:00
3 changed files with 13 additions and 5 deletions
Showing only changes of commit 64a4a78308 - Show all commits

View File

@ -66,7 +66,14 @@ BEGIN
ELSE 1 ELSE 1
END AS minQuantity, END AS minQuantity,
iss.visible located, iss.visible located,
b.price2 b.price,
b.price1,
b.price2,
b.price3,
a.price,
a.price1,
a.price2,
a.price3,
FROM vn.item i FROM vn.item i
JOIN cache.available a ON a.item_id = i.id JOIN cache.available a ON a.item_id = i.id
AND a.calc_id = vCalcFk AND a.calc_id = vCalcFk

View File

@ -25,9 +25,9 @@ module.exports = Self => {
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
// const where = filter.where; const where = filter.where;
// const query = [where.itemFk, where.warehouseFk, where.date ?? Date.now(), where.showType ?? true] ; const query = [where.itemFk, where.warehouseFk, where.date ?? Date.now(), where.showType ?? true];
// const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?)',, myOptions); const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?)', query, myOptions);
return [ return [
{ {
@ -51,7 +51,7 @@ module.exports = Self => {
'counter': 0, 'counter': 0,
'minQuantity': 1, 'minQuantity': 1,
'visible': null, 'visible': null,
'price2': null 'price2': 1
} }
]; ];

View File

@ -45,6 +45,7 @@ module.exports = Self => {
st.name stateName, st.name stateName,
st.id stateId, st.id stateId,
s.itemFk itemFk, s.itemFk itemFk,
s.price price,
al.code alertLevelCode, al.code alertLevelCode,
z.name zoneName, z.name zoneName,
z.hour theoreticalhour, z.hour theoreticalhour,
jgallego marked this conversation as resolved Outdated

yo estoy cambiando los alertLevel, no podemos poner numero en el codigo, si no hay ..null

yo estoy cambiando los alertLevel, no podemos poner numero en el codigo, si no hay ..null

ok, lo reviso

ok, lo reviso

Lo he valorado con otros compañeros y esto de momento lo dejamos así

Lo he valorado con otros compañeros y esto de momento lo dejamos así