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

trabajando en preciopliego

Browse Source
This commit is contained in:
Jaime Jiménez
2023-09-25 13:47:49 +02:00
parent d9afa9a1ef
commit 089df469e7
5 changed files with 232 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,8 @@ class MaquinaModel extends \App\Models\GoBaseModel
->distinct('t1.id')
->select(
"t1.id AS maquina_id, t1.nombre AS maquina, t1.ancho_impresion AS ancho_impresion,
t1.alto_impresion AS alto_impresion, t1.is_rotativa AS is rotativa"
t1.alto_impresion AS alto_impresion, t1.ancho AS ancho, t1.alto AS alto,
t1.is_rotativa AS is rotativa"
)
->join("lg_maquinas_tarifas_impresion t2", "t1.id = t2.maquina_id", "left")
->join("lg_maquina_papel_impresion t3", "t1.id = t3.maquina_id", "left")

17
ci4/app/Models/Configuracion/MaquinasCallesModel.php
View File

@ -86,6 +86,23 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
->groupEnd();
}
public function getCallesForMaquina($maquina_id=-1, $num_formas = 0)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.formas AS formas,
t1.internas AS internas, t1.externas AS externas,"
);
//JJO
$builder->where('t1.maquina_id', $maquina_id);
$builder->where('t1.formas', $num_formas);
$builder->where("t1.is_deleted", 0);
return $builder->get()->getResultObject();
}
public function checkDuplicatedFormas($data = [], $id = null){
helper('general');

57
ci4/app/Models/Configuracion/PapelImpresionMargenModel.php
View File

@ -1,4 +1,5 @@
<?php
namespace App\Models\Configuracion;
class PapelImpresionMargenModel extends \App\Models\GoBaseModel
@ -86,27 +87,28 @@ class PapelImpresionMargenModel extends \App\Models\GoBaseModel
t1.paginas_max AS paginas_max, t1.margen AS margen"
);
//JJO
$builder->where('papel_impresion_id', $papel_impresion_id);
$builder->where('papel_impresion_id', $papel_impresion_id);
$builder->where("t1.is_deleted", 0);
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.margen", $search)
->orLike("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.margen", $search)
->groupEnd();
->groupStart()
->like("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.margen", $search)
->orLike("t1.paginas_min", $search)
->orLike("t1.paginas_max", $search)
->orLike("t1.margen", $search)
->groupEnd();
}
public function checkIntervals($data = [], $id_linea = null, $papel_impresion_id = null){
public function checkIntervals($data = [], $id_linea = null, $papel_impresion_id = null)
{
helper('general');
if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
if (floatval($data["paginas_min"]) >= floatval($data["paginas_max"])) {
return lang('PapelImpresionMargenes.validation.error_paginas_range');
}
@ -119,17 +121,38 @@ class PapelImpresionMargenModel extends \App\Models\GoBaseModel
foreach ($rows as $row) {
if (!is_null($id_linea)){
if($row->id == $id_linea){
if (!is_null($id_linea)) {
if ($row->id == $id_linea) {
continue;
}
}
if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
$row->paginas_min, $row->paginas_max)){
return lang('PapelImpresionMargenes.validation.error_paginas_overlap');
if (check_overlap(
floatval($data["paginas_min"]),
floatval($data["paginas_max"]),
$row->paginas_min,
$row->paginas_max
)) {
return lang('PapelImpresionMargenes.validation.error_paginas_overlap');
}
}
return "";
}
public function getMargenFormPags($papel_impresion_id = -1, $num_paginas = 0)
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.margen AS margen"
);
//JJO
$builder->where('papel_impresion_id', $papel_impresion_id);
$builder->where("t1.is_deleted", 0);
$builder->where("t1.paginas_min <=", $num_paginas);
$builder->where("t1.paginas_max >=", $num_paginas);
return $builder->get()->getResultArray();
}
}