Merge branch 'master' of http://209.50.56.224/git/ITTEC/SistemaMantenimiento

sistema-mantenimiento-back/app/Http/Controllers/OrderController.php

@@ -228,26 +228,26 @@ class OrderController extends Controller {
 
     }
     public function getOrderByNumber($order, $provider, $user, $line){
-
         $arrResponseCheckUser = $this->resourcesController->checkUserEnc($user, $line);
         if ($arrResponseCheckUser['error']) {
             DB::rollBack();
             return $this->responseController->makeResponse(true, 'ERR_WAREHOUSE_GETBY000:'.$arrResponseCheckUser['msg'], [], 401);
         }
 
-
         try {
             $order = $this->encController->decrypt($order);
         } catch (\Throwable $th) {
             DB::rollBack();
             return $this->responseController->makeResponse(true, "ERR_ORDER_GET000: Ocurrió un error al obtener el usuario.", $th->getMessage(), 500);
         }
+
         try {
             $provider = $this->encController->decrypt($provider);
         } catch (\Throwable $th) {
             DB::rollBack();
             return $this->responseController->makeResponse(true, "ERR_ORDER_GET001: Ocurrió un error al obtener el usuario.", $th->getMessage(), 500);
         }
+
         try {
             $arrOrders = (array) DB::table('S002V01TORCO')
                 ->where('ORCO_NUOR', '=', $order)
@@ -314,11 +314,11 @@ class OrderController extends Controller {
         if ( empty($arrOrders) || is_null($arrOrders) ) {
             return $this->responseController->makeResponse( true, "ERR_ORDER_GET003: No se pudo obtener los datos de las órdenes de compra", [], 500);
         }
-
+        
         try {
             $getArtitles = DB::table('S002V01TARSE')
                 ->where('ARSE_IDLI', '=', $arrOrders['NUMERO_SOLICITUD_COMPRA'])
-                ->where('ARSE_ESTA', '=', 'Activo')
+                ->where('ARSE_ESTA', '!=', 'Eliminado')
                 ->where('ARSE_NULI', '=', $line)
                 ->where('ARTI_ESTA', '=', 'Activo')
                 ->where('ARTI_NULI', '=', $line)
@@ -384,8 +384,8 @@ class OrderController extends Controller {
                 $arrArtitlesTemp[$index] = $artitles;
                 $arrArtitlesTemp[$index]['CANTIDAD'] = 1;
             } else {
-                if ( in_array($artitles['INAR_IDIN'], array_column($arrArtitlesTemp, 'INAR_IDIN')) ) {
-                    $indexArtitle = array_search($artitles['INAR_IDIN'], array_column($arrArtitlesTemp, 'INAR_IDIN'));
+                if ( in_array($artitles['ID_INFORMACION'], array_column($arrArtitlesTemp, 'ID_INFORMACION')) ) {
+                    $indexArtitle = array_search($artitles['ID_INFORMACION'], array_column($arrArtitlesTemp, 'ID_INFORMACION'));
                     $arrArtitlesTemp[$indexArtitle]['CANTIDAD'] = $arrArtitlesTemp[$indexArtitle]['CANTIDAD'] + 1;
                 } else {
                     $index = $index + 1;