Merge branch 'main' into add/impresion_etiquetas_envios

ci4/app/Controllers/Logistica/LogisticaController.php

@@ -70,11 +70,11 @@ class LogisticaController extends BaseController
     }
 
 
-    public function findPedidosNewEnvio()
+    public function findForNewEnvio()
     {
 
         if ($this->request->isAJAX()) {
-            $query = LogisticaService::findPedidosNewEnvio();
+            $query = LogisticaService::findForNewEnvio();
             if ($this->request->getGet("q")) {
                 $query->groupStart()
                     ->orLike("id", $this->request->getGet("q"))
@@ -109,21 +109,6 @@ class LogisticaController extends BaseController
 
 
 
-    public function searchPedidoOrISBN($search = "", $envio_id = null)
-    {
-
-        if (empty($search)) {
-            $result = [
-                'status' => false,
-                'message' => lang('Logistica.errors.noDataToFind'),
-            ];
-            return $this->response->setJSON($result);
-        }
-        $result = LogisticaService::findPedidoOrISBN($search);
-        return $this->response->setJSON($result);
-    }
-
-
     public function generarEnvio()
     {
         if ($this->request->isAJAX()) {
@@ -191,9 +176,18 @@ class LogisticaController extends BaseController
 
     public function datatable_envios()
     {
+
+        $otsFilter = $this->request->getGetPost('otsFilter');
+
         $model = model('App\Models\Logistica\EnvioModel');
         $q = $model->getDatatableQuery();
 
+        if (!empty($otsFilter)) {
+            $q->groupStart();
+            $q->like('t5.id', $otsFilter);
+            $q->groupEnd();
+        }
+
 
         $result = DataTable::of($q)
             ->edit(

ci4/app/Controllers/Produccion/Ordentrabajo.php

@@ -3,6 +3,7 @@
 namespace App\Controllers\Produccion;
 
 use App\Controllers\BaseController;
+use App\Models\Configuracion\MaquinaModel;
 use App\Models\OrdenTrabajo\OrdenTrabajoModel;
 use App\Models\OrdenTrabajo\OrdenTrabajoTarea;
 use App\Models\OrdenTrabajo\OrdenTrabajoUser;
@@ -27,6 +28,7 @@ class Ordentrabajo extends BaseController
     protected OrdenTrabajoModel $otModel;
     protected OrdenTrabajoUser $otUserModel;
     protected OrdenTrabajoTarea $otTarea;
+    protected MaquinaModel $maquinaModel;
     protected UserModel $userModel;
     protected Validation $validation;
     protected static $viewPath = 'themes/vuexy/form/produccion/';
@@ -42,6 +44,7 @@ class Ordentrabajo extends BaseController
         $this->userModel = model(UserModel::class);
         $this->produccionService = new ProductionService();
         $this->otTarea = model(OrdenTrabajoTarea::class);
+        $this->maquinaModel = model(MaquinaModel::class);
         $this->validation = service("validation");
         helper("time");
         parent::initController($request, $response, $logger);
@@ -118,6 +121,19 @@ class Ordentrabajo extends BaseController
             return $this->response->setJSON(["errors" => $this->validation->getErrors()])->setStatusCode(400);
         }
     }
+    public function reset_orden_trabajo_date()
+    {
+        $bodyData = $this->request->getPost();
+        // return $this->response->setJSON(["message" => lang("App.global_alert_save_success"),  "data" => $bodyData]);
+        $validated = $this->validation->run($bodyData, "orden_trabajo_date");
+        if ($validated) {
+            $validatedData = $bodyData;
+            $r = $this->produccionService->emptyOrdenTrabajoDate($validatedData['orden_trabajo_id'],$validatedData['name']);
+            return $this->response->setJSON(["message" => lang("App.global_alert_save_success"), "status" => $r, "user" => auth()->user(), "data" => $bodyData]);
+        } else {
+            return $this->response->setJSON(["errors" => $this->validation->getErrors()])->setStatusCode(400);
+        }
+    }
     public function update_orden_trabajo_pedido_date()
     {
         try {
@@ -128,6 +144,18 @@ class Ordentrabajo extends BaseController
             return $this->response->setJSON(["errors" => $th->getMessage(), "status" => false])->setStatusCode(500);
         }
     }
+    public function reset_orden_trabajo_pedido_date()
+    {
+        $bodyData = $this->request->getPost();
+        $validated = $this->validation->run($bodyData, "orden_trabajo_date");
+        if ($validated) {
+            $validatedData = $bodyData;
+            $r = $this->produccionService->init($bodyData['orden_trabajo_id'])->emptyOrdenTrabajoPedidoDate($validatedData['name']);
+            return $this->response->setJSON(["message" => lang("App.global_alert_save_success"), "status" => $r, "user" => auth()->user(), "data" => $bodyData]);
+        } else {
+            return $this->response->setJSON(["errors" => $this->validation->getErrors()])->setStatusCode(400);
+        }
+    }
     public function update_orden_trabajo_pedido()
     {
         try {
@@ -170,7 +198,7 @@ class Ordentrabajo extends BaseController
         $q = $this->otModel->getDatatableQuery()->where("ordenes_trabajo.estado", "F");
         // return $this->response->setJSON($q->get()->getResultArray());
         return DataTable::of($q)
-            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name,"color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
+            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name, "color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
             ->edit(
                 "fecha_encuadernado_at",
                 fn($q) => $q->fecha_encuadernado_at ? Time::createFromFormat("Y-m-d H:i:s", $q->fecha_encuadernado_at)->format("d/m/Y") : ""
@@ -185,7 +213,7 @@ class Ordentrabajo extends BaseController
         $q = $this->otModel->getDatatableQuery()->whereIn("ordenes_trabajo.estado", ["I", "PM"]);
         // return $this->response->setJSON($q->get()->getResultArray());
         return DataTable::of($q)
-            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name,"color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
+            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name, "color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
             ->edit(
                 "fecha_encuadernado_at",
                 fn($q) => $q->fecha_encuadernado_at ? Time::createFromFormat("Y-m-d H:i:s", $q->fecha_encuadernado_at)->format("d/m/Y") : ""
@@ -200,7 +228,7 @@ class Ordentrabajo extends BaseController
         $q = $this->otModel->getDatatableQuery()->where("ferro_ok_at", null);
         // return $this->response->setJSON($q->get()->getResultArray());
         return DataTable::of($q)
-            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name,"color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
+            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name, "color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
             ->edit(
                 "fecha_encuadernado_at",
                 fn($q) => $q->fecha_encuadernado_at ? Time::createFromFormat("Y-m-d H:i:s", $q->fecha_encuadernado_at)->format("d/m/Y") : ""
@@ -215,7 +243,7 @@ class Ordentrabajo extends BaseController
         $q = $this->otModel->getDatatableQuery()->where("ferro_ok_at is NOT NULL", NULL, FALSE);
         // return $this->response->setJSON($q->get()->getResultArray());
         return DataTable::of($q)
-            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name,"color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
+            ->add("logo", fn($q) => ["logo" => site_url($logo->get_logo_path($q->presupuesto_linea_tipo)), "imposicion" => $q->imposicion_name, "color" =>  $this->produccionService->init($q->id)->getOtColorStatus()])
             ->edit(
                 "fecha_encuadernado_at",
                 fn($q) => $q->fecha_encuadernado_at ? Time::createFromFormat("Y-m-d H:i:s", $q->fecha_encuadernado_at)->format("d/m/Y") : ""
@@ -354,7 +382,7 @@ class Ordentrabajo extends BaseController
             ->edit("tiempo_real_sum", fn($q) => $q->tiempo_real_sum)
             ->edit("fecha_entrega_real_at", fn($q) => $q->fecha_entrega_real_at ? Time::createFromFormat("Y-m-d", $q->fecha_entrega_real_at)->format("d/m/Y") : "")
             ->add("pliegos_check", fn($q) => $q->otId)
-            ->add("action", fn($q) => ["data" => $q ])
+            ->add("action", fn($q) => ["data" => $q])
             ->toJson(true);
     }
     public function select_maquina_planning_rot()
@@ -448,11 +476,96 @@ class Ordentrabajo extends BaseController
         helper('file');
         $barcode = $this->produccionService->init($orden_trabajo_id)->getFileBarCode();
         return $this->response
-        ->setHeader('Content-Type', 'image/png')
-        ->setHeader('Content-Disposition', "attachment; filename=CodigoBarrasOT_{$orden_trabajo_id}.png")
-        ->setBody($barcode);
+            ->setHeader('Content-Type', 'image/png')
+            ->setHeader('Content-Disposition', "attachment; filename=CodigoBarrasOT_{$orden_trabajo_id}.png")
+            ->setBody($barcode);
     }
-    public function maquinista_maquinas_view(){}
-    public function maquinista_colas_view(){}
 
+    public function maquinista_maquinas_view()
+    {
+        // Breadcrumbs
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Produccion.maquinista.maquinas"), 'route' => route_to("viewProduccionMaquinistaMaquinas"), 'active' => true],
+        ];
+        $data = [
+            "impresion" => $this->maquinaModel->queryViewMaquinistaMaquinas('impresion')->get()->getResultArray(),
+            "manipulado" => $this->maquinaModel->queryViewMaquinistaMaquinas('manipulado')->get()->getResultArray(),
+            "acabado" => $this->maquinaModel->queryViewMaquinistaMaquinas('acabado')->get()->getResultArray(),
+        ];
+        $this->viewData["maquinas"] = $data;
+        return view(static::$viewPath . '/maquinista/viewMaquinistaMaquinaList', $this->viewData);
+    }
+    public function maquinista_maquina_tareas_list(int $maquina_id)
+    {
+        $maquina = $this->maquinaModel->find($maquina_id);
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Produccion.maquinista.maquinas"), 'route' => route_to("viewProduccionMaquinistaMaquinas"), 'active' => false],
+            ['title' => $maquina->nombre, 'route' => route_to("viewProduccionMaquinistaMaquina", $maquina_id), 'active' => true],
+        ];
+        $this->viewData["maquinaEntity"] = $maquina;
+        return view(static::$viewPath . '/maquinista/viewMaquinistaMaquinaTareas', $this->viewData);
+    }
+    public function maquinista_maquina_tarea_view(int $orden_trabajo_tarea_id)
+    {
+        $otTareaEntity = $this->otTarea->find($orden_trabajo_tarea_id);
+        $this->viewData['ot_tarea'] = $otTareaEntity;
+        $this->viewData['ot'] = $otTareaEntity->orden_trabajo();
+        $this->viewData['presupuesto'] = $this->viewData['ot']->presupuesto();
+        $this->viewData['breadcrumb'] = [
+            ['title' => lang("Produccion.maquinista.maquinas"), 'route' => route_to("viewProduccionMaquinistaMaquinas"), 'active' => false],
+            ['title' => $otTareaEntity->maquina_actual()->nombre, 'route' => route_to("viewProduccionMaquinaTareasList", $otTareaEntity?->maquina_actual()?->id), 'active' => true],
+            ['title' => $otTareaEntity->nombre, 'route' => route_to("viewProduccionMaquinistaTareaView", $otTareaEntity->id), 'active' => true]
+
+        ];
+
+        return view(static::$viewPath . '/maquinista/viewMaquinistaMaquinaTarea', $this->viewData);
+    }
+    public function maquinista_colas_view()
+    {
+        return view(static::$viewPath . '/maquinista/viewMaquinistaPlanningList', $this->viewData);
+    }
+    public function maquinista_maquina_tareas_datatable(string $content , int $maquina_id)
+    {
+        $pm = $this->produccionService->getMaquinaImpresionTareasList($maquina_id);
+        if($content == 'today'){
+            $pm->like('pedidos.fecha_impresion', Time::now()->format('Y-m-d'));
+        }
+        return DataTable::of($pm)
+            ->edit('fecha_impresion', fn($q) => $q->fecha_impresion ? Time::createFromFormat('Y-m-d H:i:s', $q->fecha_impresion)->format('d/m/Y') : '')
+            ->add('action', fn($q) => $this->produccionService->buttonActionDatatableTareaList($q->ot_tarea_id))
+            ->toJson(true);
+    }
+
+
+    public function store_orden_trabajo_progress_date()
+    {
+        try {
+            $bodyData = $this->request->getPost();
+            $validated = $this->validation->run($bodyData, "orden_trabajo_tarea_progress_date");
+            // return $this->response->setJSON(["message" => lang("App.global_alert_save_success"),  "data" => $this->validation->getValidated(),"errors" => $this->validation->getErrors()]);
+            if ($validated) {
+                $r = $this->produccionService->storeOrdenTrabajoTareaProgressDate($this->validation->getValidated());
+                return $this->response->setJSON(["message" => lang("App.global_alert_save_success"), "status" => $r, "data" => $bodyData]);
+            } else {
+                return $this->response->setJSON(["errors" => $this->validation->getErrors()])->setStatusCode(400);
+            }
+        } catch (\Throwable $th) {
+            return $this->response->setJSON(["status" => false, "error" => $th->getMessage()])->setStatusCode(500);
+        }
+    }
+    public function delete_orden_trabajo_progress_date(int $orden_trabajo_tarea_id)
+    {
+
+        $status = $this->produccionService->deleteOrdenTrabajoTareaProgressDates($orden_trabajo_tarea_id);
+        return $this->response->setJSON(["message" => lang("App.global_alert_save_success"), "status" => $status]);
+    }
+    public function get_orden_trabajo_progress_date(int $orden_trabajo_tarea_id)
+    {
+        $otTareaEntity = $this->otTarea->find($orden_trabajo_tarea_id);
+        $data = [
+            "tiempo_trabajado" => float_seconds_to_hhmm_string($otTareaEntity->tiempo_trabajado()),
+            "progress_dates" => $otTareaEntity->progress_dates(),
+        ];
+        return $this->response->setJSON($data);
+    }
 }