fyy

app/Service/FyyOrderService.php

@@ -280,7 +280,7 @@ class FyyOrderService extends Service
         $list = [];
         if($data['type'] == 1){
             $list = SaleOrdersProduct::where('del_time',0)
-                ->select('out_order_no')
+                ->select('order_no','out_order_no')
                 ->where('box_num', '>', 0)
                 ->whereColumn('order_quantity', '>', 'shipment_num')
                 ->groupBy('order_no')
@@ -288,15 +288,14 @@ class FyyOrderService extends Service
                 ->get()->toArray();
         }elseif($data['type'] == 2){
             $list = SaleOrdersProduct::where('del_time',0)
-                ->select('out_order_no')
+                ->select('order_no','out_order_no')
                 ->whereColumn('order_quantity', '>', 'box_num')
                 ->groupBy('order_no')
                 ->orderBy('id','desc')
                 ->get()->toArray();
         }
 
-        $order = array_column($list,'out_order_no');
-        return [true, $order];
+        return [true, $list];
     }
 
     public function getShipmentOrder($data){