diff --git a/app/controller/LocationController.php b/app/controller/LocationController.php
index d8425b1..86d03a0 100644
--- a/app/controller/LocationController.php
+++ b/app/controller/LocationController.php
@@ -16,6 +16,7 @@ class LocationController
     {
         $locations = Location::with('vehicles')
             ->with('fboVehicles')
+            ->whereIn('type',['port','warehouse'])
             ->get()
             ->map(function ($location) {
                 $location->vehicle_count = $location->vehicles->count();
@@ -36,7 +37,7 @@ class LocationController
     public function production(Request $request)
     {
         $where = [];
-        $status = $request->post('status', 4);
+        $status = $request->post('status', '');
         if($status == 1){
             $status = [5,6];
         }elseif ($status == 2){
@@ -66,6 +67,7 @@ class LocationController
                 return $location;
             });
         foreach ($locations as &$location) {
+            $location->status = $request->post('status', '');
             unset($location->vehicles);
             unset($location->fboVehicles);
         }
diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php
index 7feef0a..76b90b7 100644
--- a/app/controller/VehicleController.php
+++ b/app/controller/VehicleController.php
@@ -155,6 +155,9 @@ class VehicleController
             if(is_numeric($vehicle->status)) {
                 $vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0];
             }
+            $vehicle['vin'] = $vehicle['vin']??'';
+            $vehicle['brand'] = $vehicle['brand']??'';
+            $vehicle['model'] = $vehicle['model']??'';
             if(!empty($vehicle['img_url'])) {
                 $img_url = Cache::get('img_dib_'.$vehicle->id);
                 if ($img_url) {
@@ -227,6 +230,9 @@ class VehicleController
             if(is_numeric($vehicle->status)) {
                 $vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0];
             }
+            $vehicle['vin'] = $vehicle['vin']??'';
+            $vehicle['brand'] = $vehicle['brand']??'';
+            $vehicle['model'] = $vehicle['model']??'';
             if(!empty($vehicle['img_url'])) {
                 $img_url = Cache::get('img_dib_'.$vehicle->id);
                 if ($img_url) {
@@ -303,6 +309,9 @@ class VehicleController
             if(is_numeric($vehicle->status)) {
                 $vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0];
             }
+            $vehicle['vin'] = $vehicle['vin']??'';
+            $vehicle['brand'] = $vehicle['brand']??'';
+            $vehicle['model'] = $vehicle['model']??'';
             if(!empty($vehicle['img_url'])) {
                 $img_url = Cache::get('img_dib_'.$vehicle->id);
                 if ($img_url) {
@@ -347,8 +356,13 @@ class VehicleController
             $ship->fill($updateData);
             $res = $ship->save();
 
+            $shipHis = new LogisticsShipHis();
+            $shipHis->fill($updateData);
+            $shipHis->ship_id = $ship->id;
+            $shipHis->save();
+
             if($res){
-                return Util::success($res,'成功');
+                return Util::success($apiData,'成功');
             } else{
                 return Util::fail($res,'成功');
             }