|
@@ -2234,7 +2234,6 @@ class PreventiveMaintenanceController extends Controller
|
|
|
// Visitas técnicas no programadas (Preventivas)
|
|
// Visitas técnicas no programadas (Preventivas)
|
|
|
public function newUnprogrammedOrder(Request $request)
|
|
public function newUnprogrammedOrder(Request $request)
|
|
|
{
|
|
{
|
|
|
- Log::info($request->all());
|
|
|
|
|
DB::enableQueryLog();
|
|
DB::enableQueryLog();
|
|
|
|
|
|
|
|
$validator = Validator::make($request->all(), [
|
|
$validator = Validator::make($request->all(), [
|
|
@@ -2643,7 +2642,6 @@ class PreventiveMaintenanceController extends Controller
|
|
|
'id_user' => 'required|string',
|
|
'id_user' => 'required|string',
|
|
|
'linea' => 'required|integer',
|
|
'linea' => 'required|integer',
|
|
|
'id_visit' => 'required|string',
|
|
'id_visit' => 'required|string',
|
|
|
- 'comments' => 'required|string|min:15',
|
|
|
|
|
'status' => 'required|string|in:VA,EP,CP,CE,P,C,R,A,F'
|
|
'status' => 'required|string|in:VA,EP,CP,CE,P,C,R,A,F'
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
@@ -2761,14 +2759,6 @@ class PreventiveMaintenanceController extends Controller
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Actualizar comentarios
|
|
|
|
|
- $commentsArr = json_decode($visit->RVTN_COME, true);
|
|
|
|
|
- if (!is_array($commentsArr)) {
|
|
|
|
|
- $commentsArr = [];
|
|
|
|
|
- }
|
|
|
|
|
- $commentsArr["C$newStatus"] = $form['comments'];
|
|
|
|
|
- $commentsStr = json_encode($commentsArr);
|
|
|
|
|
-
|
|
|
|
|
// Obtener y actualizar historial de estados
|
|
// Obtener y actualizar historial de estados
|
|
|
$statusHistoryArr = json_decode($visit->RVTN_HIES, true);
|
|
$statusHistoryArr = json_decode($visit->RVTN_HIES, true);
|
|
|
if (!is_array($statusHistoryArr)) {
|
|
if (!is_array($statusHistoryArr)) {
|
|
@@ -2789,7 +2779,6 @@ class PreventiveMaintenanceController extends Controller
|
|
|
// Preparar actualización
|
|
// Preparar actualización
|
|
|
$updateArr = [
|
|
$updateArr = [
|
|
|
'RVTN_ESTA' => $newStatus,
|
|
'RVTN_ESTA' => $newStatus,
|
|
|
- 'RVTN_COME' => $commentsStr,
|
|
|
|
|
'RVTN_HIES' => $statusHistoryStr,
|
|
'RVTN_HIES' => $statusHistoryStr,
|
|
|
'RVTN_USMO' => $idUser,
|
|
'RVTN_USMO' => $idUser,
|
|
|
'RVTN_FEMO' => $nowStr,
|
|
'RVTN_FEMO' => $nowStr,
|
|
@@ -2863,7 +2852,7 @@ class PreventiveMaintenanceController extends Controller
|
|
|
|
|
|
|
|
$statusAction = $statusMessages[$newStatus] ?? 'Cambio de estado';
|
|
$statusAction = $statusMessages[$newStatus] ?? 'Cambio de estado';
|
|
|
$notificationTitle = "Visita Técnica No Programada #$idVisit";
|
|
$notificationTitle = "Visita Técnica No Programada #$idVisit";
|
|
|
- $notificationMessage = "La visita técnica no programada #$idVisit ha sido {$statusAction}.";
|
|
|
|
|
|
|
+ $notificationMessage = "La visita técnica no programada #$idVisit ha sido actulizada a estado:{$statusAction}.";
|
|
|
|
|
|
|
|
// Notificación general para todos los cambios de estado (A, R, C, EP, F, VA, CE, CP)
|
|
// Notificación general para todos los cambios de estado (A, R, C, EP, F, VA, CE, CP)
|
|
|
if (in_array($newStatus, ['A', 'R', 'C', 'EP', 'F', 'VA', 'CE', 'CP']) && !empty($audience)) {
|
|
if (in_array($newStatus, ['A', 'R', 'C', 'EP', 'F', 'VA', 'CE', 'CP']) && !empty($audience)) {
|
|
@@ -3234,7 +3223,25 @@ class PreventiveMaintenanceController extends Controller
|
|
|
// Revertir transacción en caso de error
|
|
// Revertir transacción en caso de error
|
|
|
DB::rollBack();
|
|
DB::rollBack();
|
|
|
|
|
|
|
|
- Log::error('Error en registerOperatorClosingComment: ' . $e->getMessage());
|
|
|
|
|
|
|
+ $actions = DB::getQueryLog();
|
|
|
|
|
+ $now = $this->functionsController->now();
|
|
|
|
|
+ $nowStr = $now->toDateTimeString();
|
|
|
|
|
+ $name = $this->functionsController->joinName($usr->USUA_NOMB ?? '', $usr->USUA_APPA ?? '', $usr->USUA_APMA ?? '');
|
|
|
|
|
+
|
|
|
|
|
+ $idac = $this->functionsController->registerActivity(
|
|
|
|
|
+ $form['linea'],
|
|
|
|
|
+ 'S002V01M10GMPR',
|
|
|
|
|
+ 'S002V01F11RVTP',
|
|
|
|
|
+ 'S002V01P01REVI',
|
|
|
|
|
+ 'Error',
|
|
|
|
|
+ "Error al registrar comentario de finalización para la visita no programada #$idVisit: " . $e->getMessage(),
|
|
|
|
|
+ $idUser,
|
|
|
|
|
+ $nowStr,
|
|
|
|
|
+ 'S002V01S02AOTR'
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+ $this->functionsController->registerLog($actions, $idUser, $nowStr, $idac, $form['linea']);
|
|
|
|
|
+
|
|
|
return $this->responseController->makeResponse(
|
|
return $this->responseController->makeResponse(
|
|
|
true,
|
|
true,
|
|
|
'Ocurrió un error al registrar el comentario de finalización.',
|
|
'Ocurrió un error al registrar el comentario de finalización.',
|
|
@@ -5930,7 +5937,25 @@ class PreventiveMaintenanceController extends Controller
|
|
|
// Revertir transacción en caso de error
|
|
// Revertir transacción en caso de error
|
|
|
DB::rollBack();
|
|
DB::rollBack();
|
|
|
|
|
|
|
|
- Log::error('Error en assignOperariosToPreventiveVisit: ' . $e->getMessage());
|
|
|
|
|
|
|
+ $actions = DB::getQueryLog();
|
|
|
|
|
+ $now = $this->functionsController->now();
|
|
|
|
|
+ $nowStr = $now->toDateTimeString();
|
|
|
|
|
+ $name = $this->functionsController->joinName($usr->USUA_NOMB ?? '', $usr->USUA_APPA ?? '', $usr->USUA_APMA ?? '');
|
|
|
|
|
+
|
|
|
|
|
+ $idac = $this->functionsController->registerActivity(
|
|
|
|
|
+ $form['linea'],
|
|
|
|
|
+ 'S002V01M10GMPR',
|
|
|
|
|
+ 'S002V01F11RVTP',
|
|
|
|
|
+ 'S002V01P01REVI',
|
|
|
|
|
+ 'Error',
|
|
|
|
|
+ "Error al asignar operarios a la visita preventiva #$idVisit: " . $e->getMessage(),
|
|
|
|
|
+ $idUser,
|
|
|
|
|
+ $nowStr,
|
|
|
|
|
+ 'S002V01S02AOTR'
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+ $this->functionsController->registerLog($actions, $idUser, $nowStr, $idac, $form['linea']);
|
|
|
|
|
+
|
|
|
return $this->responseController->makeResponse(
|
|
return $this->responseController->makeResponse(
|
|
|
true,
|
|
true,
|
|
|
'Ocurrió un error al asignar operarios a la visita preventiva.',
|
|
'Ocurrió un error al asignar operarios a la visita preventiva.',
|
|
@@ -6538,7 +6563,25 @@ class PreventiveMaintenanceController extends Controller
|
|
|
// Revertir transacción en caso de error
|
|
// Revertir transacción en caso de error
|
|
|
DB::rollBack();
|
|
DB::rollBack();
|
|
|
|
|
|
|
|
- Log::error('Error en attendPreventiveVisit: ' . $e->getMessage());
|
|
|
|
|
|
|
+ $actions = DB::getQueryLog();
|
|
|
|
|
+ $now = $this->functionsController->now();
|
|
|
|
|
+ $nowStr = $now->toDateTimeString();
|
|
|
|
|
+ $userName = $this->functionsController->joinName($usr->USUA_NOMB ?? '', $usr->USUA_APPA ?? '', $usr->USUA_APMA ?? '');
|
|
|
|
|
+
|
|
|
|
|
+ $idac = $this->functionsController->registerActivity(
|
|
|
|
|
+ $form['linea'],
|
|
|
|
|
+ 'S002V01M10GMPR',
|
|
|
|
|
+ 'S002V01F11RVTP',
|
|
|
|
|
+ 'S002V01P01REVI',
|
|
|
|
|
+ 'Error',
|
|
|
|
|
+ "Error al procesar la respuesta de la visita preventiva #$idVisit: " . $e->getMessage(),
|
|
|
|
|
+ $idUser,
|
|
|
|
|
+ $nowStr,
|
|
|
|
|
+ 'S002V01S02AOTR'
|
|
|
|
|
+ );
|
|
|
|
|
+
|
|
|
|
|
+ $this->functionsController->registerLog($actions, $idUser, $nowStr, $idac, $form['linea']);
|
|
|
|
|
+
|
|
|
return $this->responseController->makeResponse(
|
|
return $this->responseController->makeResponse(
|
|
|
true,
|
|
true,
|
|
|
'Ocurrió un error al procesar la respuesta de la visita.',
|
|
'Ocurrió un error al procesar la respuesta de la visita.',
|