jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

modificacion hecha

Browse Source
This commit is contained in:
Jaime Jiménez
2024-01-07 20:19:54 +01:00
parent 2f5c205902
commit 55f26c85b8
21 changed files with 537 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ci4/app/Models/Configuracion/MaquinaModel.php
View File

@ -48,7 +48,7 @@ class MaquinaModel extends \App\Models\GoBaseModel
"orden_planning",
"is_rotativa",
"precio_tinta_negro",
"is_tinta",
"is_inkjet",
"precio_tinta_color",
"velocidad_corte",
"precio_hora_corte",
@ -253,7 +253,7 @@ class MaquinaModel extends \App\Models\GoBaseModel
return $result;
}
public function getIdMaquinasForPapelImpresion($papel_impresion_id, $rotativa)
public function getIdMaquinasForPapelImpresion($papel_impresion_id, $rotativa , $inkjet)
{
$builder = $this->db
->table($this->table . " t1")
@ -261,6 +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);
return $builder;
}
@ -294,7 +295,13 @@ class MaquinaModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.nombre AS nombre, t1.is_padre AS is_padre, t1.tipo AS tipo, t1.velocidad AS velocidad, t1.ancho AS ancho, t1.alto AS alto, t1.ancho_impresion AS ancho_impresion, t1.alto_impresion AS alto_impresion, t1.alto_click AS alto_click, t1.min AS min, t1.max AS max, t1.duracion_jornada AS duracion_jornada, t1.orden_planning AS orden_planning, t1.is_rotativa AS is_rotativa, t1.precio_tinta_negro AS precio_tinta_negro, t1.is_tinta AS is_tinta, t1.precio_tinta_color AS precio_tinta_color, t1.velocidad_corte AS velocidad_corte, t1.precio_hora_corte AS precio_hora_corte, t1.metrosxminuto AS metrosxminuto, t1.forzar_num_formas_horizontales_cubierta AS forzar_num_formas_horizontales_cubierta, t1.forzar_num_formas_verticales_cubierta AS forzar_num_formas_verticales_cubierta, t1.observaciones AS observaciones, t2.nombre AS padre"
"t1.id AS id, t1.nombre AS nombre, t1.is_padre AS is_padre, t1.tipo AS tipo, t1.velocidad AS velocidad, t1.ancho AS ancho, t1.alto AS alto, t1.ancho_impresion AS ancho_impresion, t1.alto_impresion AS alto_impresion, t1.alto_click AS alto_click, t1.min AS min, t1.max AS max, t1.duracion_jornada AS duracion_jornada,
t1.orden_planning AS orden_planning, t1.is_rotativa AS is_rotativa, t1.precio_tinta_negro AS precio_tinta_negro,
t1.is_inkjet AS is_inkjet, t1.precio_tinta_color AS precio_tinta_color, t1.velocidad_corte AS velocidad_corte,
t1.precio_hora_corte AS precio_hora_corte, t1.metrosxminuto AS metrosxminuto,
t1.forzar_num_formas_horizontales_cubierta AS forzar_num_formas_horizontales_cubierta,
t1.forzar_num_formas_verticales_cubierta AS forzar_num_formas_verticales_cubierta,
t1.observaciones AS observaciones, t2.nombre AS padre"
);
$builder->join("lg_maquinas t2", "t1.padre_id = t2.id", "left");
@ -367,7 +374,7 @@ class MaquinaModel extends \App\Models\GoBaseModel
->select(
"t1.id AS maquina_id, t1.nombre AS maquina, t1.ancho_impresion AS ancho_impresion,
t1.alto_impresion AS alto_impresion, t1.ancho AS ancho, t1.alto AS alto,
t1.is_rotativa AS is_rotativa, t1.is_tinta AS is_tinta, t1.alto_click AS alto_click, t1.velocidad AS velocidad,
t1.is_rotativa AS is_rotativa, t1.is_inkjet AS is_inkjet, t1.alto_click AS alto_click, t1.velocidad AS velocidad,
t1.precio_tinta_negro AS precio_tinta_negro, t1.precio_tinta_color AS precio_tinta_color,
t1.velocidad_corte AS velocidad_corte, t1.precio_hora_corte AS precio_hora_corte,
t1.forzar_num_formas_horizontales_cubierta AS forzar_num_formas_horizontales_cubierta,

6
ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php
View File

@ -144,7 +144,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
}
public function getInitData($isRotativa = 0, $tarifas = [], $maquina_id = -1)
public function getInitData($isRotativa = 0, $isInkjet=0, $tarifas = [], $maquina_id = -1)
{
$builder = $this->db
->table($this->table . " t1")
@ -158,6 +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("t1.active", 1);
$isFirst = true;
@ -195,7 +196,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel
// Funcion para obtener todas las máquinas seleccionadas para un papel
public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa)
public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa=false, $isInkjet=false)
{
$builder = $this->db
->table($this->table . " t1")
@ -210,6 +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);
return $builder;
}

9
ci4/app/Models/Configuracion/PapelImpresionModel.php
View File

@ -20,8 +20,9 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
4 => "t1.color",
5 => "t1.cubierta",
6 => "t1.sobrecubierta",
7 => "t1.rotativa",
8 => "t1.isActivo"
7 => "t1.inkjet",
8 => "t1.rotativa",
9 => "t1.isActivo"
];
@ -38,6 +39,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"color",
"cubierta",
"sobrecubierta",
"inkjet",
"rotativa",
"isActivo",
"deleted_at",
@ -144,7 +146,8 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
->select(
"t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.mano AS mano,
t1.espesor AS espesor, t1.gramaje AS gramaje, t1.precio_tonelada AS precio_tonelada,
t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.rotativa AS rotativa,
t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta,
t1.inkjet AS inkjet, t1.rotativa AS rotativa,
t1.isActivo AS isActivo, t2.nombre AS papel_generico_id"
);