alsmanager_lib 2.0.42 → 2.0.44
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 +4 -4
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -4571,12 +4571,12 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
|
|
|
4571
4571
|
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
4572
4572
|
query += "and (dc.id_consegna is null) ";
|
|
4573
4573
|
query += "and (ds.id_place is null ";
|
|
4574
|
-
query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <>
|
|
4574
|
+
query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
|
|
4575
4575
|
if (sel_type_str.trim() != '') {
|
|
4576
|
-
query += "and d.type =
|
|
4576
|
+
query += "and d.type = :dev_type ";
|
|
4577
4577
|
}
|
|
4578
4578
|
if (sel_maker_str.trim() != '') {
|
|
4579
|
-
query += "and d.manifacturer =
|
|
4579
|
+
query += "and d.manifacturer = :dev_manifacturer ";
|
|
4580
4580
|
}
|
|
4581
4581
|
if (ordered_by && ordered_by == "ID") {
|
|
4582
4582
|
query += "order by d.id desc";
|
|
@@ -4662,7 +4662,7 @@ function getDevicesAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, o
|
|
|
4662
4662
|
query += "left join site_destinations sd on ds.id_site = sd.id_site ";
|
|
4663
4663
|
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
4664
4664
|
query += "and (ds.id_place is not null ";
|
|
4665
|
-
query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and ds.id_site <> :id_site and ds.id_place <>
|
|
4665
|
+
query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and ds.id_site <> :id_site and ds.id_place <> :id_place)) ";
|
|
4666
4666
|
if (sel_type_str.trim() != '') {
|
|
4667
4667
|
query += "and d.type = :dev_type ";
|
|
4668
4668
|
}
|