diff --git a/ci4/app/Controllers/Produccion/Ordentrabajo.php b/ci4/app/Controllers/Produccion/Ordentrabajo.php index 43194ba9..2d3baeca 100755 --- a/ci4/app/Controllers/Produccion/Ordentrabajo.php +++ b/ci4/app/Controllers/Produccion/Ordentrabajo.php @@ -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() diff --git a/ci4/app/Services/ProductionService.php b/ci4/app/Services/ProductionService.php index ba3be5b5..8332b322 100755 --- a/ci4/app/Services/ProductionService.php +++ b/ci4/app/Services/ProductionService.php @@ -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) diff --git a/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js b/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js index ede9535b..ddec1f65 100644 --- a/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js +++ b/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js @@ -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")