称重包裹微调

app/Events/PackageEvent.php → app/Events/CustomerStored.php

@@ -11,7 +11,7 @@ use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
-class PackageEvent
+class CustomerStored
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 

app/Events/InformWMSReceivedEvent.php

@@ -26,3 +26,13 @@ class InformWMSReceivedEvent
     }
 
 }
+
+
+//撞车了
+//下雨了
+
+//通知WMS接收
+
+
+//onclick 点击事件发生
+//onmouseover 鼠标滑入发生

app/Http/Controllers/OwnerController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Authority;
-use App\Events\PackageEvent;
+use App\Events\CustomerStored;
 use App\Log;
 use App\Logistic;
 use App\Owner;
@@ -47,7 +47,8 @@ class OwnerController extends Controller
         $this->validatorCreate($request->all())->validate();
         $owner=new Owner($request->all());
         $owner->save();
-        event(new PackageEvent($owner));
+//        event(new CustomerStoreEvent($owner));
+        event(new CustomerStored($owner));
         $authority=new Authority([
             'name'=>"_{$owner['id']}",
             'alias_name'=>"(货主：{$owner['name']})",
@@ -107,7 +108,7 @@ class OwnerController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $owner->fill($request->all());
         $owner->update();
-        event(new PackageEvent($owner));
+        event(new CustomerStored($owner));
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/owner/')->with('successTip',"成功修改货主{$owner['name']}！");
     }

app/Http/Controllers/TestController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 
 use App\Batch;
+use App\Carrier;
 use App\Events\CancelOrder;
 use App\Events\WmsReceiveNewEvent;
 use App\Jobs\ProcessReceiveCombined;
@@ -99,16 +100,22 @@ class TestController extends Controller
     }
 
     public function changePackage(){
+        $packages=Package::where('delivery_number','<>',null)->where('logistic_id',null)->get();
+        dd($packages);
         $packages=Package::whereRaw('delivery_number IS NOT NULL AND logistic_id IS NULL')->get();
         $logistics=Logistic::get();
-        foreach ($packages as $package){
-            foreach ($logistics as $logistic){
+        $packages->each(function ($package)use($logistics){
+            $logistics->each(function ($logistic)use($package){
                 if ($package->WMSReflectPackage->CarrierID==$logistic->code){
                     $package->logistic_id=$logistic->id;
-                    break;
+                    return;
                 }
-            }
-        }
+            });
+        });
         return "OK";
     }
+    public function tNull(){
+        $carrier=new Carrier(['name'=>'123123','mobile'=>'12312321321','remark'=>null]);
+        $carrier->save();
+    }
 }

app/Http/Controllers/WaybillsController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\PackageEvent;
+use App\Events\CustomerStored;
 use App\MeasuringMachine;
 use App\Package;
 use App\WaybillAuditLog;

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -37,7 +37,8 @@ class PackageController extends Controller
                 $package->owner_id=$owner->id;
                 $packagePaperBox=new Package();
                 $paperBox_id=$packagePaperBox->checkPaperBox($package->length,$package->width,$package->height,$owner->id);
-                $package->paperBox_id=$paperBox_id;
+                if($paperBox_id)
+                    $package->paperBox_id=$paperBox_id;
             }else{
                 $package->status='记录异常';
             }

app/Listeners/PackageListener.php → app/Listeners/FulfillFulfillPackageCustomer.php

@@ -2,12 +2,12 @@
 
 namespace App\Listeners;
 
-use App\Events\PackageEvent;
+use App\Events\CustomerStored;
 use App\Package;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
-class PackageListener
+class FulfillPackageCustomer
 {
     /**
      * Create the event listener.
@@ -22,10 +22,10 @@ class PackageListener
     /**
      * Handle the event.
      *
-     * @param  PackageEvent  $event
+     * @param  CustomerStored  $event
      * @return bool
      */
-    public function handle(PackageEvent $event)
+    public function handle(CustomerStored $event)
     {
         $packages=Package::with('WMSReflectPackage')->where('status','记录异常')->orWhere('status','已上传异常')->get();
         foreach ($packages as $package){

app/Providers/EventServiceProvider.php

@@ -24,8 +24,8 @@ class EventServiceProvider extends ServiceProvider
         'App\Events\InformWMSReceivedEvent' => [
             'App\Listeners\InformWMSReceivedListener',
         ],
-        'App\Events\PackageEvent' =>[
-            'App\Listeners\PackageListener'
+        'App\Events\CustomerStored' =>[
+            'App\Listeners\FulfillPackageCustomer'
         ],
     ];