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 'main' into feat/view-maquinista

Browse Source
This commit is contained in:
amazuecos
2025-04-22 10:37:41 +02:00
parent 952500e10e 2cfe03b2ec
commit 288a3f02eb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_impresion", "presupuesto_linea.papel_impresion_id = lg_papel_impresion.id", "left")
->join("lg_papel_formato", "lg_papel_formato.id = presupuestos.papel_formato_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.deleted_at", null)
->where("orden_trabajo_tareas.presupuesto_linea_ ->where("orden_trabajo_tareas.presupuesto_linea_id IS NOT NULL", NULL, FALSE)
id IS NOT NULL", NULL, FALSE)
->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA) ->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA)
->groupBy('lg_papel_impresion.id'); ->groupBy('lg_papel_impresion.id');
if ($q) { if ($q) {
@ -1617,7 +1616,8 @@ class ProductionService extends BaseService
} }
return $this->isCorte; return $this->isCorte;
} }
public function getFileBarCode(){ public function getFileBarCode()
{
return $this->ot->getBarCodeFile(); return $this->ot->getBarCodeFile();
} }
} }

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

@ -238,9 +238,9 @@ class PlanningRotativa {
let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) 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.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")) 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.tablePlanningPlana.on("change", ".planning-maquina-padre-select", (event) => {
this.datatablePlanningPlana.ajax.reload(); this.datatablePlanningPlana.ajax.reload();