alsmanager_lib 2.0.32 → 2.0.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/modules.js +2 -2
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -4524,7 +4524,7 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
|
|
|
4524
4524
|
query += "left join site_destinations sd on ds.id_site = sd.id_site ";
|
|
4525
4525
|
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
4526
4526
|
query += "and (ds.id_place is null ";
|
|
4527
|
-
query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + "))
|
|
4527
|
+
query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
|
|
4528
4528
|
if (sel_type_str.trim() != '') {
|
|
4529
4529
|
query += "and d.type = '" + sel_type_str.trim() + "' ";
|
|
4530
4530
|
}
|
|
@@ -4562,7 +4562,7 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
|
|
|
4562
4562
|
query += "left join site_destinations sd on ds.id_site = sd.id_site ";
|
|
4563
4563
|
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
4564
4564
|
query += "and (ds.id_place is null ";
|
|
4565
|
-
query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site))
|
|
4565
|
+
query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
|
|
4566
4566
|
if (sel_type_str.trim() != '') {
|
|
4567
4567
|
query += "and d.type = :dev_type ";
|
|
4568
4568
|
}
|