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

Merge branch 'fix/maquina-padre-hijo-select' into 'main'

Browse Source 
Fix/maquina padre hijo select

See merge request jjimenez/safekat!835
This commit is contained in:
Alvaro
2025-05-30 14:58:49 +00:00
parent 784789841d 96bc9cde73
commit e9986dd3bb
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci4/app/Controllers/Produccion/Ordentrabajo.php
View File

@ -522,7 +522,8 @@ class Ordentrabajo extends BaseController
public function select_maquina_planning_plana()
{
$q = $this->request->getGet('q');
$result = $this->produccionService->querySelectMaquinaPlanningPlana($q);
$padreId = $this->request->getGet('padre_id');
$result = $this->produccionService->querySelectMaquinaPlanningPlana($q,$padreId);
return $this->response->setJSON($result);
}
public function select_maquina_padre_planning_plana()

5
ci4/app/Services/ProductionService.php
View File

@ -1353,7 +1353,7 @@ class ProductionService extends BaseService
}
return $query->get()->getResultArray();
}
public function querySelectMaquinaPlanningPlana($q)
public function querySelectMaquinaPlanningPlana($q,?string $padreId)
{
$query = $this->otModel->builder()->select([
"orden_trabajo_tareas.maquina_id as id",
@ -1370,6 +1370,9 @@ class ProductionService extends BaseService
if ($q) {
$query->like('lg_maquinas.nombre', $q);
}
if($padreId){
$query->where('lg_maquinas.padre_id',$padreId);
}
return $query->get()->getResultArray();
}
public function querySelectMaquinaPadrePlanningPlana($q)

7
httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js
View File

@ -104,8 +104,9 @@ class PlanningRotativa {
dropdownCssClass: "h-2"
}, $('body'));
this.papelImpresionFilter = new ClassSelect(this.tablePlanningRot.find(".planning-papel-select"), `/produccion/ordentrabajo/planning/select/papel/rotativa`, "Seleccione un papel", true, {}, $('body'));
this.maquinaSelectFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-maquina-select"), `/produccion/ordentrabajo/planning/select/maquina/plana`, "Seleccione una maquina", true, {}, $('body'));
this.maquinaPadreSelectFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-maquina-padre-select"), `/produccion/ordentrabajo/planning/select/maquina/padre/plana`, "Máquina padre", true, {}, $('body'));
this.maquinaSelectFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-maquina-select"), `/produccion/ordentrabajo/planning/select/maquina/plana`, "Seleccione una maquina", true, {
}, $('body'));
this.papelImpresionFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-papel-select"), `/produccion/ordentrabajo/planning/select/papel/plana`, "Seleccione un papel", true, {}, $('body'));
this.maquinaSelectFilter.config.dropdownParent = this.item
}
@ -139,6 +140,10 @@ class PlanningRotativa {
this.maquinaSelectFilterPlana.init()
this.papelImpresionFilterPlana.init()
this.maquinaPadreSelectFilterPlana.init();
this.maquinaPadreSelectFilterPlana.onChange(() => {
const params = {padre_id : this.maquinaPadreSelectFilterPlana.getVal()}
this.maquinaSelectFilterPlana.params = {...params}
})
this.checkAllMetros.on('change', () => {
let isChecked = this.checkAllMetros.prop('checked')
this.item.find(".metros-check").prop('checked', isChecked).trigger("change")