改了一个WeightQueue的命名和BUG

改了权限命名
改了退货和笕尚之间的队列BUG

app/Http/Controllers/MeasureMonitorController.php

@@ -22,13 +22,13 @@ class MeasureMonitorController extends Controller
      */
     public function index(Request $request)
     {
-        if(!Gate::allows('称重信息-查询')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $measuringMachines=MeasuringMachine::select('id','name','code','status')->get();
         return view('weight.measureMonitor.index',['measuringMachines'=>$measuringMachines]);
     }
 
     public function data(Request $request){
-        if(!Gate::allows('称重信息-查询')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $measuring_machine_id=$request->input('id');
         if ($measuring_machine_id){
             /*$package=Package::with('owner','paperBox','measuringMachine')->where('measuring_machine_id',$measuringMachines[0]->id)->orderBy('id','DESC')->first();*/

app/Http/Controllers/PackageController.php

@@ -22,7 +22,7 @@ class PackageController extends Controller
      */
     public function index(Request $request)
     {
-        if(!Gate::allows('称重信息-查询')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         if ($request->input()){
             $packages=Package::orderBy('id','DESC');
             $today=Carbon::now()->subDays(15);
@@ -60,7 +60,7 @@ class PackageController extends Controller
      */
     public function create()
     {
-        if(!Gate::allows('称重信息-录入')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-录入')){ return redirect(url('/'));  }
         $paperBoxes=PaperBox::select('id','model')->get();
         return view('weight.package.create',['paperBoxes'=>$paperBoxes]);
     }
@@ -73,7 +73,7 @@ class PackageController extends Controller
      */
     public function store(Request $request)
     {
-        if(!Gate::allows('称重信息-录入')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-录入')){ return redirect(url('/'));  }
         $this->validator($request)->validate();
         $logistic_number=$request->input('logistic_number');
         $weight=$request->input('weight');

app/Http/Controllers/WeighExceptedController.php

@@ -18,7 +18,7 @@ class WeighExceptedController extends Controller
      */
     public function indexCreate(Request $request)
     {
-        if(!Gate::allows('称重信息-查看异常')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-查看异常')){ return redirect(url('/'));  }
         $paginate=$request->input('paginate');
         if ($paginate){
             $weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
@@ -32,7 +32,7 @@ class WeighExceptedController extends Controller
 
     public function indexIssued(Request $request)
     {
-        if(!Gate::allows('称重信息-查看异常')){ return redirect(url('/'));  }
+        if(!Gate::allows('称重管理-查看异常')){ return redirect(url('/'));  }
         $paginate=$request->input('paginate');
         if ($paginate){
             $weightExcepteds=Package::select('id','owner_id','logistic_number','created_at','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id')->
@@ -45,7 +45,7 @@ class WeighExceptedController extends Controller
     }
 
    public function export($id){
-       if(!Gate::allows('称重信息-查看异常')){ return redirect(url('/'));  }
+       if(!Gate::allows('称重管理-查看异常')){ return redirect(url('/'));  }
        if ($id==-1){
            $id=[];
            $packages=Package::where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orWhere('status','下发异常')->select('id')->get();

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

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Api\thirdPart\flux;
 
 use App\Http\Controllers\Controller;
-use App\Jobs\WeightQueue;
+use App\Jobs\MarkPackageExcepted;
 use App\Logistic;
 use App\Owner;
 use App\Package;
@@ -103,10 +103,10 @@ class PackageController extends Controller
                         $createPackage->status="上传异常";
                     }
                 }else{
-                    WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+                    MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
                 }
             }else{
-                WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
             }
             $createPackage->save();
             $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);

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

@@ -6,7 +6,7 @@ use App\Events\WeighedEvent;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\LogisticNumberFeatureController;
 use App\Jobs\MeasuringMachineQueue;
-use App\Jobs\WeightQueue;
+use App\Jobs\MarkPackageExcepted;
 use App\MeasuringMachine;
 use App\Package;
 use Illuminate\Http\Request;
@@ -151,7 +151,7 @@ class PackageController extends Controller
             if ($createPackage->save()){
                 $measuringMachine->touch();
                 MeasuringMachineQueue::dispatch($measuringMachine)->delay(\Carbon\Carbon::now()->addMinutes(30));
-                WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
+                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
                 event(new WeightEvent($createPackage));
                 $response=["msg"=>"保存成功",
                     "code"=>200,

app/Jobs/WeightQueue.php → app/Jobs/MarkPackageExcepted.php

@@ -9,7 +9,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
-class WeightQueue implements ShouldQueue
+class MarkPackageExcepted implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -33,6 +33,7 @@ class WeightQueue implements ShouldQueue
     public function handle()
     {
         $delivery_number=Package::where('logistic_number',$this->package->logistic_number)->select('id','delivery_number','status')->first();
+        if(!$delivery_number)return;
         if (!$delivery_number->delivery_number){
             $delivery_number->status="下发异常";
             $delivery_number->save();

app/Listeners/WmsReceiveNewListener.php

@@ -55,7 +55,7 @@ class WmsReceiveNewListener
 
     private function handleJianshang($logisticNumberReturn, $downloadedSkuItems, $wmsReceives){
         $bills=RejectedBill::where('logistic_number_return',$logisticNumberReturn)->
-            whereIn('is_loaded',[0,2])->get();
+        whereIn('is_loaded',[0,2])->get();
         if($bills->isEmpty()){//没有本地货单
             (new Controller())->log(__METHOD__,  __FUNCTION__,  'WMS下发，且没有本地退单:'.$logisticNumberReturn);
             return;
@@ -90,11 +90,12 @@ class WmsReceiveNewListener
         //（下发小于实收）
         //该单号在6小时前录入的(不是当前最新录入)，直接不入库，将实收推给客户（笕尚），并且退单号下所有WMS本地单作废
         $lastReceive=$wmsReceives->first();
-        if(Carbon::now()->greaterThan(Carbon::make($lastReceive['created_at'])->addHours(6))){
-            (new RejectedBillItemController())->sendRejectedToThirdPart($actualGotItems,$bills->first());
-            (new Controller())->log(__METHOD__,  __FUNCTION__,  '下发小于实收，发给客户:'.$logisticNumberReturn);
-            return;
-        }
+        if($lastReceive&&$lastReceive['created_at'])
+            if(Carbon::now()->greaterThan(Carbon::make($lastReceive['created_at'])->addHours(6))){
+                (new RejectedBillItemController())->sendRejectedToThirdPart($actualGotItems,$bills->first());
+                (new Controller())->log(__METHOD__,  __FUNCTION__,  '下发小于实收，发给客户:'.$logisticNumberReturn);
+                return;
+            }
 
 
 

database/migrations/2020_03_05_080123_add_weigh_excepted_authority.php

@@ -15,9 +15,10 @@ class AddWeighExceptedAuthority extends Migration
     public function up()
     {
 
-        if(!Authority::where('name','称重信息-查看异常')->first())(new Authority(['name'=>'称重信息-查看异常','alias_name'=>'称重信息-查看异常']))->save();
-        if(!Authority::where('name','称重信息-录入')->first())(new Authority(['name'=>'称重信息-录入','alias_name'=>'称重信息-录入']))->save();
-        if(!Authority::where('name','称重信息-查询')->first())(new Authority(['name'=>'称重信息-录入','alias_name'=>'称重信息-查询']))->save();
+        if(!Authority::where('name','称重管理-查看异常')->first())(new Authority(['name'=>'称重管理-查看异常','alias_name'=>'称重管理-查看异常']))->save();
+        if(!Authority::where('name','称重管理-录入')->first())(new Authority(['name'=>'称重管理-录入','alias_name'=>'称重管理-录入']))->save();
+        if(!Authority::where('name','称重管理-查询')->first())(new Authority(['name'=>'称重管理-查询','alias_name'=>'称重管理-查询']))->save();
+        if(!Authority::where('name','称重管理')->first())(new Authority(['name'=>'称重管理-查询','alias_name'=>'称重管理-查询']))->save();
     }
 
     /**
@@ -27,9 +28,10 @@ class AddWeighExceptedAuthority extends Migration
      */
     public function down()
     {
-        Authority::where('name','称重信息-查看异常')->delete();
-        Authority::where('name','称重信息-录入')->delete();
-        Authority::where('name','称重信息-查询')->delete();
+        Authority::where('name','称重管理-查看异常')->delete();
+        Authority::where('name','称重管理-录入')->delete();
+        Authority::where('name','称重管理-查询')->delete();
+        Authority::where('name','称重管理')->delete();
 
     }
 }

resources/views/maintenance/user/create.blade.php

@@ -96,7 +96,7 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label for="role" class="col-md-3 col-form-label text-md-right">承运商</label>
+                                <label for="role" class="col-md-3 col-form-label text-md-right">可见承运商</label>
 
                                 <div class="col-md-7">
                                     <div class="input-group">

resources/views/maintenance/user/edit.blade.php

@@ -71,7 +71,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="role" class="col-2 col-form-label text-md-right">承运商</label>
+                        <label for="role" class="col-2 col-form-label text-md-right">可见承运商</label>
 
                         <div class="col-md-8">
                             <div class="input-group">

resources/views/weight/menu.blade.php

@@ -2,22 +2,22 @@
 <div class="container-fluid mt-3" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
-                @can('称重信息-查询')
+                @can('称重管理-查询')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">记录</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/measureMonitor')}}" :class="{active:isActive('measureMonitor',2)}">设备</a>
                 </li>@endcan
-                @can('称重信息-录入')
+                @can('称重管理-录入')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('package/create')}}" :class="{active:isActive('create',2)}">手动录入</a>
                 </li>@endcan
-                @can('称重信息-查询')
+                @can('称重管理-查询')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('package/weightExcepted/indexCreate')}}" :class="{active:isActive('weightExcepted',2)}">异常记录</a>
                 </li>@endcan
-                @can('称重信息-查看异常')
+                @can('称重管理-查看异常')
                 <li class="nav-item">
                     <a class="nav-link text-dark" href="{{url('package/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
                 </li>@endcan

resources/views/weight/package/menu.blade.php

@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav nav-pills">
-            @can('称重信息-查询')
+            @can('称重管理-查询')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/')}}" :class="{active:isActive('',2)}">查询</a>
                 </li> @endcan

resources/views/weight/weightExcepted/menu.blade.php

@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav nav-pills">
-            @can('称重信息-查看异常')
+            @can('称重管理-查看异常')
                 <li class="nav-item">
                     <a class="nav-link" href="{{url('package/weightExcepted/indexCreate')}}" :class="{active:isActive('indexCreate',3)}">录入异常</a>
                 </li>