verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 71 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +13 -4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c7b8212da - Show all commits

15
modules/ticket/back/methods/ticket/itemLackDetail.js
View File

@ -35,8 +35,14 @@ module.exports = Self => {
const myOptions = {}; const myOptions = {};
if (typeof options == 'object') Object.assign(myOptions, options); if (typeof options == 'object') Object.assign(myOptions, options);
const vDated = Date.vnNew(); const vDated = (Date.vnNew());
vDated.setHours(0, 0, 0, 0);
const scopeDays = filter.where.scopeDays ?? 2; const scopeDays = filter.where.scopeDays ?? 2;
let alertLevels = filter.where.alertLevelCode;
if (!alertLevels)
alertLevels = (await Self.app.models.AlertLevel.find({fields: ['code']})).map(({code}) => code);
const stmt = new ParameterizedSQL(` const stmt = new ParameterizedSQL(`
SELECT s.id, SELECT s.id,
st.code, st.code,
@ -89,7 +95,9 @@ module.exports = Self => {
WHERE t.warehouseFk = ? WHERE t.warehouseFk = ?
AND s.itemFk = ? AND s.itemFk = ?
AND s.quantity <> 0 AND s.quantity <> 0
AND t.shipped BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY)
AND t.shipped BETWEEN ? AND (? + INTERVAL ? DAY)
AND sgd.saleFk IS NULL AND sgd.saleFk IS NULL
AND (al.code IN (?) OR al.id IS NULL) AND (al.code IN (?) OR al.id IS NULL)
UNION ALL UNION ALL
@ -143,8 +151,9 @@ module.exports = Self => {
[ [
filter.where.warehouseFk, filter.where.warehouseFk,
itemFk, itemFk,
vDated, vDated,
scopeDays, scopeDays,
filter.where.alertLevelCode, alertLevels,
scopeDays, scopeDays,
vDated, vDated, vDated, vDated, vDated, vDated,
filter.where.warehouseFk, filter.where.warehouseFk,