alsmanager_lib 3.0.201 → 3.0.202
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
|
@@ -5031,7 +5031,7 @@ function getDevicesSelectBySiteComboMySQL2(id_site, dev_type) {
|
|
|
5031
5031
|
var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
|
|
5032
5032
|
query += "case ";
|
|
5033
5033
|
query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
|
|
5034
|
-
query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,
|
|
5034
|
+
query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
|
|
5035
5035
|
query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
|
|
5036
5036
|
query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
|
|
5037
5037
|
query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
|
|
@@ -6807,7 +6807,7 @@ function getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_make
|
|
|
6807
6807
|
//query += "left join device_consegne dc on d.id = dc.id_device ";
|
|
6808
6808
|
query += "left join consegna_beni cb on d.id = cb.id_bene "
|
|
6809
6809
|
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
6810
|
-
query += "and ((
|
|
6810
|
+
query += "and ((cb.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
|
|
6811
6811
|
query += "and (ds.id_place is null ";
|
|
6812
6812
|
query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
|
|
6813
6813
|
if (sel_type_str.trim() != '') {
|