8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
1 changed files with 4 additions and 3 deletions
Showing only changes of commit bd54eacda1 - Show all commits

View File

@ -141,9 +141,10 @@ module.exports = Self => {
ORDER BY hasToIgnore, isBasket;`,
[itemFk, warehouseFk, 2, 2, warehouseFk, itemFk]);
// if (filter.where.alertLevel) {
// stmt.merge({
// sql: `AND ${filter.where.alertLevel ? '' : 'NOT'} ts.alertLevel=?`, params: [0]});
if (filter.where.stateFk) {
stmt.merge({
sql: `AND ts.alertLevel=?`, params: [filter.where.stateFk]});
}
// }
// stmt.merge(conn.makeWhere(filter.where));
const sql = ParameterizedSQL.join([stmt], ';');