diff --git a/ci4/app/Services/ProductionService.php b/ci4/app/Services/ProductionService.php index a82464e9..e59c4c8c 100755 --- a/ci4/app/Services/ProductionService.php +++ b/ci4/app/Services/ProductionService.php @@ -1146,8 +1146,7 @@ class ProductionService extends BaseService ->join("lg_papel_impresion", "presupuesto_linea.papel_impresion_id = lg_papel_impresion.id", "left") ->join("lg_papel_formato", "lg_papel_formato.id = presupuestos.papel_formato_id", "left") ->where("orden_trabajo_tareas.deleted_at", null) - ->where("orden_trabajo_tareas.presupuesto_linea_ - id IS NOT NULL", NULL, FALSE) + ->where("orden_trabajo_tareas.presupuesto_linea_id IS NOT NULL", NULL, FALSE) ->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA) ->groupBy('lg_papel_impresion.id'); if ($q) { @@ -1617,7 +1616,8 @@ class ProductionService extends BaseService } return $this->isCorte; } - public function getFileBarCode(){ + public function getFileBarCode() + { return $this->ot->getBarCodeFile(); } } 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 058aa4ba..eddacb06 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 @@ -238,9 +238,9 @@ class PlanningRotativa { let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) this.datatablePlanningPlana.column(columnIndex).search(this.maquinaSelectFilterPlana.getText()).draw() }) - this.tablePlanningPlana.on("change", ".planning-maquina-select", (event) => { + this.tablePlanningPlana.on("change", ".planning-papel-select", (event) => { let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) - this.datatablePlanningPlana.column(columnIndex).search(this.maquinaSelectFilterPlana.getText()).draw() + this.datatablePlanningPlana.column(columnIndex).search(this.papelImpresionFilterPlana.getText()).draw() }) this.tablePlanningPlana.on("change", ".planning-maquina-padre-select", (event) => { this.datatablePlanningPlana.ajax.reload();