diff --git a/ci4/app/Config/OrdenTrabajo.php b/ci4/app/Config/OrdenTrabajo.php index b3638dba..2c9a9474 100644 --- a/ci4/app/Config/OrdenTrabajo.php +++ b/ci4/app/Config/OrdenTrabajo.php @@ -21,7 +21,10 @@ class OrdenTrabajo extends BaseConfig "cosido_at" => "cosido_user_id", "grapado_at" => "grapado_user_id", "solapa_at" => "solapa_user_id", - + "retractilado_at" => "retractilado_user_id", + "retractilado5_at" => "retractilado5_user_id", + "prototipo_at" => "prototipo_user_id", + "marcapaginas_at" => "marcapaginas_user_id", //FERRO "pendiente_ferro_at" => "pendiente_ferro_user_id", "ferro_en_cliente_at" => "ferro_en_cliente_user_id", diff --git a/ci4/app/Database/Migrations/2025-04-14-204500_UpdateDateFieldsOrdenTrabajoDates.php b/ci4/app/Database/Migrations/2025-04-14-204500_UpdateDateFieldsOrdenTrabajoDates.php index a69258c7..b6d5e06f 100644 --- a/ci4/app/Database/Migrations/2025-04-14-204500_UpdateDateFieldsOrdenTrabajoDates.php +++ b/ci4/app/Database/Migrations/2025-04-14-204500_UpdateDateFieldsOrdenTrabajoDates.php @@ -20,6 +20,22 @@ class UpdateDateFieldsOrdenTrabajoDates extends Migration "type" => "DATE", "null" => true, ], + "retractilado_at" => [ + "type" => "DATE", + "null" => true, + ], + "retractilado5_at" => [ + "type" => "DATE", + "null" => true, + ], + "prototipo_at" => [ + "type" => "DATE", + "null" => true, + ], + "marcapaginas_at" => [ + "type" => "DATE", + "null" => true, + ], ]; protected array $USERS = [ "cosido_user_id" => [ @@ -40,6 +56,30 @@ class UpdateDateFieldsOrdenTrabajoDates extends Migration "constraint" => 10, "null" => true, ], + "retractilado_user_id" => [ + "type" => "INT", + "unsigned" => true, + "constraint" => 10, + "null" => true, + ], + "retractilado5_user_id" => [ + "type" => "INT", + "unsigned" => true, + "constraint" => 10, + "null" => true, + ], + "prototipo_user_id" => [ + "type" => "INT", + "unsigned" => true, + "constraint" => 10, + "null" => true, + ], + "marcapaginas_user_id" => [ + "type" => "INT", + "unsigned" => true, + "constraint" => 10, + "null" => true, + ], ]; public function up() diff --git a/ci4/app/Entities/Produccion/OrdenTrabajoDateEntity.php b/ci4/app/Entities/Produccion/OrdenTrabajoDateEntity.php index 43410440..b796e380 100644 --- a/ci4/app/Entities/Produccion/OrdenTrabajoDateEntity.php +++ b/ci4/app/Entities/Produccion/OrdenTrabajoDateEntity.php @@ -24,6 +24,10 @@ class OrdenTrabajoDateEntity extends Entity "cosido_at" => null, "solapa_at" => null, "cosido_at" => null, + "retractilado_at"=> null, + "retractilado5_at"=> null, + "prototipo_at"=> null, + "marcapaginas_at"=> null, //FERRO "pendiente_ferro_at" => null, "ferro_en_cliente_at" => null, diff --git a/ci4/app/Entities/Produccion/OrdenTrabajoEntity.php b/ci4/app/Entities/Produccion/OrdenTrabajoEntity.php index 0728d4b9..c14bfa37 100644 --- a/ci4/app/Entities/Produccion/OrdenTrabajoEntity.php +++ b/ci4/app/Entities/Produccion/OrdenTrabajoEntity.php @@ -21,21 +21,21 @@ class OrdenTrabajoEntity extends Entity "pedido_id" => null, "user_created_id" => null, "user_updated_id" => null, - "fecha_entrega_warning" => false, - "fecha_entrega_warning_revised" => false, + "fecha_entrega_warning" => null, + "fecha_entrega_warning_revised" => null, "total_tirada" => null, "total_precio" => null, "tipo_entrada" => "out", "progreso" => 0.00, "estado" => "I", "comentarios" => null, - "revisar_formato" => false, - "revisar_lomo" => false, - "revisar_solapa" => false, - "revisar_isbn" => false, - "revisar_codigo_barras" => false, - "realizar_imposicion" => false, - "enviar_impresion" => false, + "revisar_formato" => null, + "revisar_lomo" => null, + "revisar_solapa" => null, + "revisar_isbn" => null, + "revisar_codigo_barras" => null, + "realizar_imposicion" => null, + "enviar_impresion" => null, "portada_path" => null, "is_pedido_espera" => null, "pedido_espera_by" => null, diff --git a/ci4/app/Entities/Produccion/OrdenTrabajoUserEntity.php b/ci4/app/Entities/Produccion/OrdenTrabajoUserEntity.php index 26e78560..57356b8b 100644 --- a/ci4/app/Entities/Produccion/OrdenTrabajoUserEntity.php +++ b/ci4/app/Entities/Produccion/OrdenTrabajoUserEntity.php @@ -25,9 +25,13 @@ class OrdenTrabajoUserEntity extends Entity "corte_user_id" => null, "preparacion_interior_user_id" => null, "entrada_manipulado_user_id" => null, - "cosido_user_id"=> null, - "solapa_user_id"=> null, - "grapado_user_id"=> null, + "cosido_user_id" => null, + "solapa_user_id" => null, + "grapado_user_id" => null, + "retractilado_user_id" => null, + "retractilado5_user_id" => null, + "prototipo_user_id" => null, + "marcapaginas_user_id" => null, //FERRO "pendiente_ferro_user_id" => null, "ferro_en_cliente_user_id" => null, @@ -42,9 +46,9 @@ class OrdenTrabajoUserEntity extends Entity "pre_codbarras_user_id" => null, "pre_imposicion_user_id" => null, //UNUSED - "inaplazable_revised_change_user_id" => null,//!DELETE - "ferro_disponible_hecho_user_id" => null,//!DELETE - "ferro_entregado_user_id" => null,//!DELETE + "inaplazable_revised_change_user_id" => null, //!DELETE + "ferro_disponible_hecho_user_id" => null, //!DELETE + "ferro_entregado_user_id" => null, //!DELETE "pre_imprimir_user_id" => null, //!DELETE "ferro_disponible_ok_user_id" => null, //!DELETE ]; @@ -88,7 +92,7 @@ class OrdenTrabajoUserEntity extends Entity } return $user; } - public function getPlastificadoBy() : ?UserEntity + public function getPlastificadoBy(): ?UserEntity { return $this->userBy('plastificado_user_id'); } diff --git a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php index 0c883788..1d82ec12 100644 --- a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php +++ b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php @@ -31,6 +31,10 @@ class OrdenTrabajoDate extends Model "cosido_at", "solapa_at", "cosido_at", + "retractilado_at", + "retractilado5_at", + "prototipo_at", + "marcapaginas_at", //FERRO "pendiente_ferro_at", "ferro_en_cliente_at", diff --git a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoUser.php b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoUser.php index 12c6b0e9..df4d0541 100644 --- a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoUser.php +++ b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoUser.php @@ -32,6 +32,10 @@ class OrdenTrabajoUser extends Model "cosido_user_id", "solapa_user_id", "grapado_user_id", + "retractilado_user_id", + "retractilado5_user_id", + "prototipo_user_id", + "marcapaginas_user_id", //FERRO "pendiente_ferro_user_id", "ferro_en_cliente_user_id", diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otPreimpresionReview.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otPreimpresionReview.php index bc0093b6..01d0782b 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otPreimpresionReview.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otPreimpresionReview.php @@ -2,7 +2,7 @@