xinyouhe/car_info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
HESU\HESU
2025-06-10 16:45:46 +08:00
parent 69b0bc4fd5
commit 846c626124
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/LocationController.php
+3 -1
View File
@@ -16,6 +16,7 @@ class LocationController
{ {
$locations = Location::with('vehicles') $locations = Location::with('vehicles')
->with('fboVehicles') ->with('fboVehicles')
->whereIn('type',['port','warehouse'])
->get() ->get()
->map(function ($location) { ->map(function ($location) {
$location->vehicle_count = $location->vehicles->count(); $location->vehicle_count = $location->vehicles->count();
@@ -36,7 +37,7 @@ class LocationController
public function production(Request $request) public function production(Request $request)
{ {
$where = []; $where = [];
$status = $request->post('status', 4); $status = $request->post('status', '');
if($status == 1){ if($status == 1){
$status = [5,6]; $status = [5,6];
}elseif ($status == 2){ }elseif ($status == 2){
@@ -66,6 +67,7 @@ class LocationController
return $location; return $location;
}); });
foreach ($locations as &$location) { foreach ($locations as &$location) {
$location->status = $request->post('status', '');
unset($location->vehicles); unset($location->vehicles);
unset($location->fboVehicles); unset($location->fboVehicles);
} }
app/controller/VehicleController.php
+15 -1
View File
@@ -155,6 +155,9 @@ class VehicleController
if(is_numeric($vehicle->status)) { if(is_numeric($vehicle->status)) {
$vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0]; $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'])) { if(!empty($vehicle['img_url'])) {
$img_url = Cache::get('img_dib_'.$vehicle->id); $img_url = Cache::get('img_dib_'.$vehicle->id);
if ($img_url) { if ($img_url) {
@@ -227,6 +230,9 @@ class VehicleController
if(is_numeric($vehicle->status)) { if(is_numeric($vehicle->status)) {
$vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0]; $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'])) { if(!empty($vehicle['img_url'])) {
$img_url = Cache::get('img_dib_'.$vehicle->id); $img_url = Cache::get('img_dib_'.$vehicle->id);
if ($img_url) { if ($img_url) {
@@ -303,6 +309,9 @@ class VehicleController
if(is_numeric($vehicle->status)) { if(is_numeric($vehicle->status)) {
$vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0]; $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'])) { if(!empty($vehicle['img_url'])) {
$img_url = Cache::get('img_dib_'.$vehicle->id); $img_url = Cache::get('img_dib_'.$vehicle->id);
if ($img_url) { if ($img_url) {
@@ -347,8 +356,13 @@ class VehicleController
$ship->fill($updateData); $ship->fill($updateData);
$res = $ship->save(); $res = $ship->save();
$shipHis = new LogisticsShipHis();
$shipHis->fill($updateData);
$shipHis->ship_id = $ship->id;
$shipHis->save();
if($res){ if($res){
return Util::success($res,'成功'); return Util::success($apiData,'成功');
} else{ } else{
return Util::fail($res,'成功'); return Util::fail($res,'成功');
} }