mirror of
https://git.imnavajas.es/jjimenez/safekat.git
synced 2025-07-25 22:52:08 +00:00
arreglado bug que solo mostraba inkjet en los papeles
This commit is contained in:
@ -261,7 +261,7 @@ class MaquinaModel extends \App\Models\GoBaseModel
|
||||
"'" . $papel_impresion_id . "'" . " as papel_impresion_id, t1.id AS maquina_id, '0' as active"
|
||||
);
|
||||
$builder->where("t1.is_rotativa", $rotativa);
|
||||
$builder->where("t1.is_inkjet", $inkjet);
|
||||
//$builder->where("t1.is_inkjet", $inkjet);
|
||||
|
||||
return $builder;
|
||||
}
|
||||
|
||||
@ -158,7 +158,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
|
||||
$builder->where("t2.is_deleted", 0);
|
||||
$builder->where("t2.isActivo", 1);
|
||||
$builder->where("t2.rotativa", $isRotativa);
|
||||
$builder->where("t2.inkjet", $isInkjet);
|
||||
//$builder->where("t2.inkjet", $isInkjet);
|
||||
$builder->where("t1.active", 1);
|
||||
|
||||
$isFirst = true;
|
||||
@ -211,7 +211,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
|
||||
|
||||
// Se aplican las condiciones que tienen que cumplir
|
||||
$builder->where("t2.is_rotativa", $isRotativa);
|
||||
$builder->where("t2.is_inkjet", $isInkjet);
|
||||
//$builder->where("t2.is_inkjet", $isInkjet);
|
||||
|
||||
return $builder;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user