diff --git a/ci4/app/Services/ProductionService.php b/ci4/app/Services/ProductionService.php index 6f9ea0c6..60de7e20 100644 --- a/ci4/app/Services/ProductionService.php +++ b/ci4/app/Services/ProductionService.php @@ -28,8 +28,8 @@ use Dompdf\Dompdf; */ class ProductionService extends BaseService { - public array $TIPOS_PLANA = ['lp_bn','lp_color','lp_colorhq']; - public array $TIPOS_ROTATIVA = ['lp_rot_bn','lp_rot_color']; + public array $TIPOS_PLANA = ['lp_bn', 'lp_color', 'lp_colorhq']; + public array $TIPOS_ROTATIVA = ['lp_rot_bn', 'lp_rot_color']; protected OrdenTrabajoModel $otModel; @@ -86,7 +86,7 @@ class ProductionService extends BaseService $this->ot = $this->otModel->find($orden_trabajo_id); $pedido = $this->ot->pedido(); $this->setPedido($pedido); - $this->defaultMaquinaCorte = $this->maquinaModel->where('nombre',$this->defaultMaquinaCorteName)->first(); + $this->defaultMaquinaCorte = $this->maquinaModel->where('nombre', $this->defaultMaquinaCorteName)->first(); return $this; } /** @@ -162,7 +162,7 @@ class ProductionService extends BaseService "fecha_entrega_externo" => $this->pedido->fecha_entrega_externo, ]; $otDateId = $this->otDate->insert($data); - $this->otDate->updateUserDateMap($this->ot->id,$data); + $this->otDate->updateUserDateMap($this->ot->id, $data); return $otDateId; } protected function storeOrdenTrabajoUsers(): int|bool|string @@ -219,7 +219,7 @@ class ProductionService extends BaseService protected function storeTareaCorte(PresupuestoLineaEntity $pLinea): ?OrdenTrabajoTareaEntity { $otCorte = null; - if($pLinea->isRotativa()){ + if ($pLinea->isRotativa()) { $tareaId = $this->otTarea->insert([ 'orden_trabajo_id' => $this->ot->id, 'presupuesto_linea_id' => $pLinea->id, @@ -241,16 +241,15 @@ class ProductionService extends BaseService $p_linea_maquinas = $p_linea->maquinas(); $ot_tareas = []; if (count($p_linea_maquinas) > 0) { - foreach ($p_linea_maquinas as $key => $linea) { - $ot_tareas["orden_trabajo_id"] = $this->ot->id; - $ot_tareas["presupuesto_acabado_id"] = $p_linea->id; - $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; - $ot_tareas["orden"] = $linea->orden_planning ?? 0; - $ot_tareas["maquina_id"] = $linea->id; - $ot_tareas["imposicion_id"] = null; - $this->otTarea->insert($ot_tareas); - $ot_tareas = []; - } + $linea_maquina = $p_linea_maquinas[0]; //Se obtiene la primera máquina aunque tenga varias + $ot_tareas["orden_trabajo_id"] = $this->ot->id; + $ot_tareas["presupuesto_acabado_id"] = $p_linea->id; + $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; + $ot_tareas["orden"] = $linea_maquina->orden_planning ?? 0; + $ot_tareas["maquina_id"] = $linea_maquina->id; + $ot_tareas["imposicion_id"] = null; + $this->otTarea->insert($ot_tareas); + $ot_tareas = []; } else { $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_acabado_id"] = $p_linea->id; @@ -267,16 +266,15 @@ class ProductionService extends BaseService $p_linea_maquinas = $p_linea->maquinas(); $ot_tareas = []; if (count($p_linea_maquinas) > 0) { - foreach ($p_linea_maquinas as $key => $linea) { - $ot_tareas["orden_trabajo_id"] = $this->ot->id; - $ot_tareas["presupuesto_manipulado_id"] = $p_linea->id; - $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; - $ot_tareas["orden"] = $linea->orden_planning ?? 0; - $ot_tareas["maquina_id"] = $linea->id; - $ot_tareas["imposicion_id"] = null; - $this->otTarea->insert($ot_tareas); - $ot_tareas = []; - } + $linea_maquina = $p_linea_maquinas[0]; //Se obtiene la primera máquina aunque tenga varias + $ot_tareas["orden_trabajo_id"] = $this->ot->id; + $ot_tareas["presupuesto_manipulado_id"] = $p_linea->id; + $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; + $ot_tareas["orden"] = $linea_maquina->orden_planning ?? 0; + $ot_tareas["maquina_id"] = $linea_maquina->id; + $ot_tareas["imposicion_id"] = null; + $this->otTarea->insert($ot_tareas); + $ot_tareas = []; } else { $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_manipulado_id"] = $p_linea->id; @@ -293,16 +291,15 @@ class ProductionService extends BaseService $p_linea_maquinas = $p_linea->maquinas(); $ot_tareas = []; if (count($p_linea_maquinas) > 0) { - foreach ($p_linea_maquinas as $key => $linea) { + $linea_maquina = $p_linea_maquinas[0]; //Se obtiene la primera máquina aunque tenga varias $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_preimpresion_id"] = $p_linea->id; $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; - $ot_tareas["orden"] = $linea->orden_planning ?? 0; - $ot_tareas["maquina_id"] = $linea->id; + $ot_tareas["orden"] = $linea_maquina->orden_planning ?? 0; + $ot_tareas["maquina_id"] = $linea_maquina->id; $ot_tareas["imposicion_id"] = null; $this->otTarea->insert($ot_tareas); $ot_tareas = []; - } } else { $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_preimpresion_id"] = $p_linea->id; @@ -319,16 +316,15 @@ class ProductionService extends BaseService $p_linea_maquinas = $p_linea->maquinas(); $ot_tareas = []; if (count($p_linea_maquinas) > 0) { - foreach ($p_linea_maquinas as $key => $linea) { + $linea_maquina = $p_linea_maquinas[0]; //Se obtiene la primera máquina aunque tenga varias $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_encuadernado_id"] = $p_linea->id; $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; - $ot_tareas["orden"] = $linea->orden_planning ?? 0; - $ot_tareas["maquina_id"] = $linea->id; + $ot_tareas["orden"] = $linea_maquina->orden_planning ?? 0; + $ot_tareas["maquina_id"] = $linea_maquina->id; $ot_tareas["imposicion_id"] = null; $this->otTarea->insert($ot_tareas); $ot_tareas = []; - } } else { $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_encuadernado_id"] = $p_linea->id; @@ -345,16 +341,15 @@ class ProductionService extends BaseService $p_linea_maquinas = $p_linea->maquinas(); $ot_tareas = []; if (count($p_linea_maquinas) > 0) { - foreach ($p_linea_maquinas as $key => $linea) { + $linea_maquina = $p_linea_maquinas[0]; //Se obtiene la primera máquina aunque tenga varias $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_extra_id"] = $p_linea->id; $ot_tareas["nombre"] = $p_linea->tarifa()->nombre; - $ot_tareas["orden"] = $linea->orden_planning; - $ot_tareas["maquina_id"] = $linea->id; + $ot_tareas["orden"] = $linea_maquina->orden_planning; + $ot_tareas["maquina_id"] = $linea_maquina->id; $ot_tareas["imposicion_id"] = null; $this->otTarea->insert($ot_tareas); $ot_tareas = []; - } } else { $ot_tareas["orden_trabajo_id"] = $this->ot->id; $ot_tareas["presupuesto_extra_id"] = $p_linea->id; @@ -459,12 +454,12 @@ class ProductionService extends BaseService ->join("lg_imposiciones", "lg_imposiciones.id = orden_trabajo_tareas.imposicion_id", "left") // ->where("orden_trabajo_tareas.orden_trabajo_id", $this->ot->id) ->whereIn("presupuesto_linea.tipo", $this->TIPOS_ROTATIVA) - ->where('lg_maquinas.is_rotativa',true) + ->where('lg_maquinas.is_rotativa', true) ->where("orden_trabajo_tareas.deleted_at", null) ->orderBy("orden_trabajo_tareas.orden", "ASC"); return $q; } - /** + /** * Query para mostrar en datatable * * @return BaseBuilder @@ -500,7 +495,7 @@ class ProductionService extends BaseService ->join("lg_imposiciones", "lg_imposiciones.id = orden_trabajo_tareas.imposicion_id", "left") // ->where("orden_trabajo_tareas.orden_trabajo_id", $this->ot->id) ->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA) - ->where('lg_maquinas.is_rotativa',false) + ->where('lg_maquinas.is_rotativa', false) ->where("orden_trabajo_tareas.deleted_at", null) ->orderBy("orden_trabajo_tareas.orden", "ASC"); return $q; @@ -725,16 +720,16 @@ class ProductionService extends BaseService $otDate = $this->otDate->where('orden_trabajo_id', $this->ot->id) ->set([$data['name'] => $data[$data['name']]]) ->update($data); - $this->otDate->updateUserDateMap($this->ot->id,$data); + $this->otDate->updateUserDateMap($this->ot->id, $data); $ot_users = $this->ot->users(); - if(isset($this->MAPPING_DATE_USER[$data["name"]])){ + if (isset($this->MAPPING_DATE_USER[$data["name"]])) { $user_id = $ot_users->{$this->MAPPING_DATE_USER[$data["name"]]}; $user = $this->userModel->find($user_id); - if($user_id){ + if ($user_id) { $result = ["user" => null, "status" => false]; } $result = ["user" => $user, "status" => $otDate]; - }else{ + } else { $result = ["user" => null, "status" => false]; } return $result; diff --git a/ci4/app/Views/themes/vuexy/pdfs/orden_trabajo.php b/ci4/app/Views/themes/vuexy/pdfs/orden_trabajo.php index cadb6bf7..f17d7478 100644 --- a/ci4/app/Views/themes/vuexy/pdfs/orden_trabajo.php +++ b/ci4/app/Views/themes/vuexy/pdfs/orden_trabajo.php @@ -288,7 +288,7 @@ $settings = $session->get('settings');
| = $value->tarifa()->nombre ?> | = $presupuesto->solapas ? "SI" : "NO" ?> | = $presupuesto->hasSobrecubierta() ? "SI" : "NO" ?> | -______ pliegos de ______ | += $linea_impresion->pliegos_libro?>/=$linea_impresion->pliegos_pedido?> | = $presupuesto->guardas ? "SI" : "NO" ?> | = $presupuesto->retractilado ? "SI" : "NO" ?> | = $presupuesto->marcapaginas ? "SI" : "NO" ?> |