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

añadido que solo compruebe el ancho en vertical si es rotativa

Browse Source
This commit is contained in:
Jaime Jimenez
2025-01-29 09:49:52 +01:00
parent 20442bb784
commit 5b89cc0c1d
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ci4/app/Models/Configuracion/PapelGenericoModel.php
View File

@ -129,16 +129,16 @@ class PapelGenericoModel extends \App\Models\BaseModel
return empty($search) return empty($search)
? $builder ? $builder
: $builder : $builder
->groupStart() ->groupStart()
->like("t1.id", $search) ->like("t1.id", $search)
->orLike("t1.nombre", $search) ->orLike("t1.nombre", $search)
->orLike("t1.code", $search) ->orLike("t1.code", $search)
->orLike("t1.code_ot", $search) ->orLike("t1.code_ot", $search)
->orLike("t1.id", $search) ->orLike("t1.id", $search)
->orLike("t1.nombre", $search) ->orLike("t1.nombre", $search)
->orLike("t1.code", $search) ->orLike("t1.code", $search)
->orLike("t1.code_ot", $search) ->orLike("t1.code_ot", $search)
->groupEnd(); ->groupEnd();
} }
@ -210,6 +210,10 @@ class PapelGenericoModel extends \App\Models\BaseModel
->where("t4.ancho_impresion >", $alto) ->where("t4.ancho_impresion >", $alto)
->where("t4.alto_impresion >", $ancho) ->where("t4.alto_impresion >", $ancho)
->groupEnd() ->groupEnd()
->orGroupStart()
->where("t4.ancho_impresion >", $alto)
->where("t4.is_rotativa", 1)
->groupEnd()
->groupEnd(); ->groupEnd();
if ($is_cubierta == true) { if ($is_cubierta == true) {
@ -308,6 +312,10 @@ class PapelGenericoModel extends \App\Models\BaseModel
->where("t4.ancho_impresion >", $alto) ->where("t4.ancho_impresion >", $alto)
->where("t4.alto_impresion >", $ancho) ->where("t4.alto_impresion >", $ancho)
->groupEnd() ->groupEnd()
->orGroupStart()
->where("t4.ancho_impresion >", $alto)
->where("t4.is_rotativa", 1)
->groupEnd()
->groupEnd(); ->groupEnd();
if ($is_cubierta == true) { if ($is_cubierta == true) {
@ -497,6 +505,10 @@ class PapelGenericoModel extends \App\Models\BaseModel
->where("t4.ancho_impresion >", $alto) ->where("t4.ancho_impresion >", $alto)
->where("t4.alto_impresion >", $ancho) ->where("t4.alto_impresion >", $ancho)
->groupEnd() ->groupEnd()
->orGroupStart()
->where("t4.ancho_impresion >", $alto)
->where("t4.is_rotativa", 1)
->groupEnd()
->groupEnd(); ->groupEnd();
if ($is_cubierta == true) { if ($is_cubierta == true) {