运输管理-二次逻辑修复

app/Http/Controllers/WaybillController.php

@@ -16,7 +16,6 @@ use App\UploadFile;
 use App\WaybillAuditLog;
 use App\WaybillOnTop;
 use App\WaybillPriceModel;
-use App\City;
 use App\Unit;
 use App\Waybill;
 use App\WaybillPayoff;
@@ -138,7 +137,7 @@ class WaybillController extends Controller
             if ($waybillPriceModel_id){
                 $carrier_weight=$request->input('carrier_weight');
                 $waybillPriceModel=$waybillPriceModelService->find($waybillPriceModel_id);
-                $logistic=$logisticService->find($waybill->order->logistic_id ?? $waybill->logistic_id);
+                $logistic=$logisticService->find($waybill->logistic_id);
                 if ($carrier_weight<$waybillPriceModel->initial_weight){
                     $fee=(($waybillPriceModel->unit_price)*($waybillPriceModel->initial_weight))+$logistic->delivery_fee;
                 }else{
@@ -435,7 +434,7 @@ class WaybillController extends Controller
     //生成报表数据
     private function createReportData($waybill,$waybillPayoff){
         /** @var Waybill $waybill */
-        $waybill->loadMissing(["order.owner",'order.logistic']);
+        $waybill->loadMissing(["order.owner"]);
         return [
             "type"=>$waybill->type,
             "waybill_number"=>$waybill->waybill_number,
@@ -449,7 +448,7 @@ class WaybillController extends Controller
             "charge"=>$waybill->charge,
             "collect_fee"=>$waybill->collect_fee,
             "ordering_remark"=>$waybill->ordering_remark,
-            "carrier_name"=>$waybill->order->logistic->name ?? ($waybill->logistic->name ?? null),
+            "carrier_name"=>$waybill->logistic->name ?? null,
             "carrier_bill"=>$waybill->carrier_bill,
             "origination_city_name"=>$waybill->originationCity ? $waybill->originationCity->name : null,
             "destination_city_name"=>$waybill->order->city ?? ($waybill->destinationCity->name ?? null),
@@ -800,7 +799,7 @@ class WaybillController extends Controller
         if(!Gate::allows('运输管理-删除')){return redirect('/');}
         $paginate = $request->input('paginate')??50;
         /** @var Collection $waybills */
-        $waybills = Waybill::query()->with(['owner','order.owner','order.logistic','logistic','amountUnit','warehouseWeightUnit','carrierWeightUnit',
+        $waybills = Waybill::query()->with(['owner','order.owner','logistic','amountUnit','warehouseWeightUnit','carrierWeightUnit',
             'warehouseWeightUnitOther','carrierWeightUnitOther','carType','waybillAuditLogs' => function ($query) {
             /** @var Builder $query */
             $query->with('user');

app/Listeners/WaybillPriceModelListener.php

@@ -2,7 +2,6 @@
 
 namespace App\Listeners;
 
-use App\Logistic;
 use App\Events\WaybillPriceModelEvent;
 use App\Region;
 use App\Waybill;
@@ -16,19 +15,13 @@ class WaybillPriceModelListener
 {
     public function waybillPriceModel_check_waybill(WaybillPriceModel $waybillPriceModel){
 
-        $waybills=Waybill::query()->with(["logistic","order.logistic"])->where('type','专线')
+        $waybills=Waybill::query()->with(["logistic"])->where('type','专线')
             ->where('status','!=','已完结');
 
         //条件携带承运商
         /** @var \stdClass $waybillPriceModel */
         $logisticId = $waybillPriceModel->logistic_id;
-        $waybills->where(function ($query)use($logisticId){
-            /** @var Builder $query */
-            $query->where('logistic_id',$logisticId)->orWhereHas("order",function ($query)use($logisticId){
-                /** @var Builder $query */
-                $query->where("logistic_id",$logisticId);
-            });
-        });
+        $waybills->where('logistic_id',$logisticId);
         //市不存在
         if(!$waybillPriceModel->city_id){
             $cities=Region::query()->select('id')->where('parent_id',$waybillPriceModel['province_id'])->get();
@@ -98,7 +91,7 @@ class WaybillPriceModelListener
             foreach ($waybills as $waybill){
                 //修改运单表运费
                 /** @var \stdClass $carrier */
-                $carrier=$waybill->order->logistic ?? $waybill->logistic;
+                $carrier=$waybill->logistic;
                 if ($waybill->carrier_weight<$waybillPriceModel->initial_weight){
                     $fee=(($waybillPriceModel->unit_price)*($waybillPriceModel->initial_weight))+$carrier->delivery_fee;
                 }else{

app/Waybill.php

@@ -135,10 +135,8 @@ class Waybill extends Model
         $ids=app('UserService')->getPermittingOwnerIds(auth()->user());
         return (new static)->newQuery()->leftJoin("orders","waybills.order_id","orders.id")
             ->leftJoin("owners","orders.owner_id","owners.id")
-            ->leftJoin("logistics","orders.logistic_id","logistics.id")
             ->selectRaw(<<<column
             owners.name as owner_name,
-            logistics.name as logistic_name,
             orders.consignee_name as order_consignee_name,
             orders.consignee_phone as order_consignee_phone,
             orders.province as order_province,

resources/views/waybill/delivering.blade.php

@@ -193,7 +193,7 @@
                     amount_unit_id:'{{$waybill->amount_unit_id}}',
                     amount_unit_name:'{{$waybill->amount_unit ? $waybill->amount_unit->name : ''}}',
                     inquire_tel:'{{$waybill->inquire_tel}}',
-                    carrier_name:'{{$waybill->logistic_name ?? ($waybill->logistic->name ?? '')}}',
+                    carrier_name:'{{$waybill->logistic->name ?? ''}}',
                     owner_name:'{{$waybill->owner_name ?? ($waybill->owner->name ?? '')}}',
                     warehouse_weight_unit_name:'{{$waybill->warehouse_weight_unit ? $waybill->warehouse_weight_unit->name : ''}}',
                     carrier_weight_unit_name:'{{$waybill->carrier_weight_unit ? $waybill->carrier_weight_unit->name : ''}}',

resources/views/waybill/edit.blade.php

@@ -127,8 +127,7 @@
                     <div class="form-group row" style="margin-bottom: 20px">
                         <label for="logistic_id" class="col-2 col-form-label text-right text-primary">承运商 *</label>
                         <div class="col-8" style="position: relative">
-                            <select class="form-control @error('logistic_id') is-invalid @enderror" id="logistic_id" style="width: 30%; "
-                                    :name="waybill.order_id ? '' : 'logistic_id'" :disabled="!!waybill.order_id"
+                            <select class="form-control @error('logistic_id') is-invalid @enderror" id="logistic_id" style="width: 30%; " name="logistic_id"
                                     :class="errors['logistic_id'] ? 'is-invalid' :''"  v-model="waybill.logistic_id">
                                 <option v-for="logistic in logistics" :value="logistic.id">@{{logistic.name}}</option>
                             </select>
@@ -411,7 +410,7 @@
                     recipient_mobile:'{{$waybill->order->consignee_phone ?? $waybill->recipient_mobile}}',ordering_remark:'{{$waybill->ordering_remark}}',
 
                     charge:'{{ old("charge") ?? $waybill->charge}}',
-                    logistic_id:'{{ $waybill->order->logistic_id ?? (old("logistic_id") ?? $waybill->logistic_id)}}',
+                    logistic_id:'{{old("logistic_id") ?? $waybill->logistic_id}}',
                     carrier_bill:'{{ old("carrier_bill") ?? $waybill->carrier_bill}}',
                     type:'{{ old("type") ?? $waybill->type}}',
                     warehouse_weight_other:'{{ old("warehouse_weight_other") ?? $waybill->warehouse_weight_other}}',

resources/views/waybill/index.blade.php

@@ -303,7 +303,7 @@
                         recipient_mobile:'{{$waybill->order_consignee_phone ?? $waybill->recipient_mobile}}',
                         charge:'{{$waybill->charge}}',
                         ordering_remark:'{{preg_replace("/[\n\s]/",' ',($waybill->ordering_remark??""))}}',
-                        carrier:'{{$waybill->logistic_name ?? ($waybill->logistic->name ?? '')}}',
+                        carrier:'{{$waybill->logistic->name ?? ''}}',
                         carrier_bill:'{{$waybill->carrier_bill}}',
                         warehouse_weight:'{{$waybill->warehouse_weight}}',
                         warehouse_weight_unit:'{{$waybill->warehouse_weight_unit ? $waybill->warehouse_weight_unit->name : ''}}',

resources/views/waybill/recycle.blade.php

@@ -147,7 +147,7 @@
                         recipient_mobile:'{{$waybill->order->consignee_phone ?? $waybill->recipient_mobile}}',
                         charge:'{{$waybill->charge}}',
                         ordering_remark:'{{preg_replace("/[\n\s]/",' ',($waybill->ordering_remark??""))}}',
-                        carrier:'{{$waybill->order->logistic->name ?? ($waybill->logistic->name ?? '')}}',
+                        carrier:'{{$waybill->logistic->name ?? ''}}',
                         carrier_bill:'{{$waybill->carrier_bill}}',
                         origination_city:'{{$waybill->origination_city ? $waybill->origination_city->name : ''}}',
                         destination_city:'{{$waybill->order->city ?? ($waybill->destination_city->name ?? '')}}',