Merge remote-tracking branch 'origin/waybill_ZD' into waybill_ZD

app/Events/PackageEvent.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Events;
+
+use App\Owner;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class PackageEvent
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $owner;
+
+    /**
+     * Create a new event instance.
+     * @param Owner $owner
+     * @return void
+     */
+    public function __construct(Owner $owner)
+    {
+        $this->owner=$owner;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new PrivateChannel('channel-name');
+    }
+}

app/Http/Controllers/LogisticController.php

@@ -55,12 +55,14 @@ class LogisticController extends Controller
     {
         return Validator::make($data, [
             'name' => ['required', 'string', 'max:50', 'unique:logistics'],
+            'code' => ['nullable', 'string', 'max:50', 'unique:logistics,code'],
         ]);
     }
     protected function validatorUpdate(array $data)
     {
         return Validator::make($data, [
             'name' => ['required', 'string', 'max:50'],
+            'code' => ['nullable', 'string', 'max:50'],
         ]);
     }
     /**

app/Http/Controllers/MeasureMonitorController.php

@@ -23,7 +23,7 @@ class MeasureMonitorController extends Controller
     public function index(Request $request)
     {
         if(!Gate::allows('包裹信息-查询')){ return redirect(url('/'));  }
-        $measuringMachines=MeasuringMachine::select('id','name','code')->get();
+        $measuringMachines=MeasuringMachine::select('id','name','code','status')->get();
         return view('weight.measureMonitor.index',['measuringMachines'=>$measuringMachines]);
     }
 

app/Http/Controllers/OwnerController.php

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

app/Http/Controllers/PackageController.php

@@ -41,6 +41,9 @@ class PackageController extends Controller
             if ($request->input('owner_id')){
                 $packages=$packages->where('owner_id',$request->input('owner_id'));
             }
+            if ($request->input('batch_number')){
+                $packages=$packages->where('batch_number','like','%'.$request->input('batch_number').'%')->where('created_at','>',$today->format('Y-m-d'));
+            }
             $packages=$packages->paginate($request->input('paginate')?$request->input('paginate'):50);
             $owners=Owner::select('id','name')->get();
             return view('weight.package.index',['packages'=>$packages,'owners'=>$owners]);
@@ -131,6 +134,7 @@ class PackageController extends Controller
     }
 
     public function export($id){
+        dd($id);
         $id = explode( ',',$id);
         $row=[[
             'id'=>'ID',
@@ -183,7 +187,7 @@ class PackageController extends Controller
         $validator=Validator::make($request->input(),[
             'logistic_number'=>['required','max:50','unique:packages,logistic_number'],
             'weight'=>'required|min:0|max:999999|numeric',
-            'paper_box_id'=>'required|integer',
+            'paper_box_id'=>'nullable|integer',
         ],[
             'required'=>':attribute 为必填项',
             'max'=>':attribute 字符过多或输入值过大',

app/Http/Controllers/WaybillsController.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Events\PackageEvent;
+use App\MeasuringMachine;
 use App\Package;
 use App\WaybillAuditLog;
 use App\WaybillPriceModel;

app/Http/Controllers/WeighExceptedController.php

@@ -21,10 +21,10 @@ class WeighExceptedController extends Controller
         $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')->
-            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orderBy('created_at','DESC')->paginate($paginate);
+            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate($paginate);
         }else{
             $weightExcepteds=Package::select('id','status','logistic_number','logistic_id','measuring_machine_id','created_at','weight','length','width','height','bulk','paper_box_id')->
-            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orderBy('created_at','DESC')->paginate(50);
+            where('status','上传异常')->orWhere('status','测量异常')->orWhere('status','记录异常')->orWhere('status','已上传异常')->orderBy('created_at','DESC')->paginate(50);
         };
         return view('weight.weightExcepted.index',['weightExcepteds'=>$weightExcepteds,'view'=>'indexCreate']);
     }

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

@@ -29,8 +29,8 @@ class PackageController extends Controller
                 'errors'=>$errors]];
         }
         $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
-        $owner=Owner::select('id')->where('name',$receiveInputs['Customer'])->first();
-        $carrier=Logistic::select('id')->where('name',$receiveInputs['CarrierID'])->first();
+        $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
+        $carrier=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
         if ($package){
             $package->delivery_number=$receiveInputs['palletid'];
             if ($owner){
@@ -43,13 +43,13 @@ class PackageController extends Controller
             }
             $package->recipient=$receiveInputs['Consigneename'];
             if ($carrier)$package->logistic_id=$carrier->id;
-            else $package->status='记录异常';
             $package->batch_number=$receiveInputs['USERDEFINE1'];
             $package->batch_rule=$receiveInputs['USERDEFINE2'];
             $package->save();
             $result=$this->accomplishToWMS($package);
             if ($result['result']=='success'){
-                $package->status="已上传";
+                if ($package->status=="记录异常")$package->status="已上传异常";
+                else $package->status="已上传";
             }else{
                 $package->status="上传异常";
             }
@@ -83,8 +83,8 @@ class PackageController extends Controller
                     'status'=>'记录异常'
                 ]);
             }
-            //活动波次同步
-            if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'活动')){
+            //活动波次同步  组合提总
+            if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'组合')){
                 $packageBatch=Package::whereRaw('batch_number = ? AND weight IS NOT NULL',[$receiveInputs['USERDEFINE1']])->first();
                 if ($receiveInputs['USERDEFINE1']&&$packageBatch){
                     $createPackage->measuring_machine_id=$packageBatch->measuring_machine_id;
@@ -97,7 +97,8 @@ class PackageController extends Controller
                     $createPackage->save();
                     $result=$this->accomplishToWMS($createPackage);
                     if ($result['result']=='success'){
-                        $createPackage->status="已上传";
+                        if ($createPackage->status=="记录异常")$createPackage->status="已上传异常";
+                        else $createPackage->status="已上传";
                     }else{
                         $createPackage->status="上传异常";
                     }

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\thirdPart\weight;
 
 use App\Events\WeightEvent;
 use App\Http\Controllers\Controller;
+use App\Http\Controllers\LogisticNumberFeatureController;
 use App\Jobs\WeightQueue;
 use App\MeasuringMachine;
 use App\Package;
@@ -32,10 +33,14 @@ class PackageController extends Controller
         if (!$measuringMachine){
             $measuringMachine=new MeasuringMachine([
                 'name'=>$request['id'],
-                'code'=>$request['id']
+                'code'=>$request['id'],
+                'status'=>'在线'
             ]);
             $measuringMachine->save();
             $this->log(__METHOD__,'weightApi(new measuring machine)'.__FUNCTION__,json_encode($request),null);
+        }else{
+            $measuringMachineStatus=new MeasuringMachine();
+            $measuringMachineStatus->changeStatus($measuringMachine);
         }
 
         $package=Package::where('logistic_number',$request['barcode'])->first();
@@ -68,7 +73,7 @@ class PackageController extends Controller
             $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
 
             //处理活动波次
-            if ($package->batch_rule&&strstr($package->batch_rule,'活动')){
+            if ($package->batch_rule&&strstr($package->batch_rule,'组合')){
                 $packagesBatch=Package::where('batch_number',$package->batch_number)->get();
                 foreach ($packagesBatch as $packageBatch){
                     $packageBatch->measuring_machine_id=$measuringMachine->id;
@@ -79,11 +84,11 @@ class PackageController extends Controller
                     $packageBatch->bulk=$max*$centre*$min;
                     if (isset($paperBox_id))$packageBatch->paper_box_id=$paperBox_id;
                     $packageBatch->status="未上传";
-                    $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($packageBatch),null);
                     $packageBatch->save();
                     $result=$accomplishToWMS->accomplishToWMS($packageBatch);
                     if ($result['result']=='success'){
-                        $packageBatch->status="已上传";
+                        if ($package->status=="记录异常")$package->status="已上传异常";
+                        else $package->status="已上传";
                     }else{
                         $packageBatch->status="上传异常";
                     }
@@ -102,7 +107,8 @@ class PackageController extends Controller
                 $package->save();
                 $result=$accomplishToWMS->accomplishToWMS($package);
                 if ($result['result']=='success'){
-                    $package->status="已上传";
+                    if ($package->status=="记录异常")$package->status="已上传异常";
+                    else $package->status="已上传";
                 }else{
                     $package->status="上传异常";
                 }
@@ -123,6 +129,8 @@ class PackageController extends Controller
             return json_encode($response,JSON_UNESCAPED_UNICODE);
         }
         if (!$package){
+            $logisticNumberFeature=new LogisticNumberFeatureController();
+            $logistic=$logisticNumberFeature->getLogisticByFeatures($request['barcode']);
             $createPackage=new Package([
                 'logistic_number'=>$request['barcode'],
                 'measuring_machine_id'=>$measuringMachine->id,
@@ -133,6 +141,7 @@ class PackageController extends Controller
                 'bulk'=>$max*$centre*$min,
                 'status'=>"未下发",
             ]);
+            if ($logistic)$createPackage->logistic_id=$logistic->id;
             if ($createPackage->save()){
                 WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
                 $response=["msg"=>"保存成功",

app/Listeners/PackageListener.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\PackageEvent;
+use App\Package;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class PackageListener
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  PackageEvent  $event
+     * @return bool
+     */
+    public function handle(PackageEvent $event)
+    {
+        $packages=Package::with('WMSReflectPackage')->where('status','记录异常')->get();
+        foreach ($packages as $package){
+            if (isset($package->WMSReflectPackage->Customer)&&$package->WMSReflectPackage->Customer==$event->owner->code){
+                $package->status="未测量";
+                $package->owner_id=$event->owner->id;
+                $package->save();
+            }
+        }
+        return false;
+    }
+}

app/Logistic.php

@@ -10,5 +10,5 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Logistic extends Model
 {
-    protected $fillable = ['name'];
+    protected $fillable = ['name','code'];
 }

app/MeasuringMachine.php

@@ -9,4 +9,11 @@ class MeasuringMachine extends Model
     protected $fillable=[
         'name','code','status',
     ];
+
+
+    //TODO 上线下线
+    public function changeStatus(MeasuringMachine $measuringMachine){
+        $measuringMachine->status='在线';
+        $measuringMachine->save();
+    }
 }

app/Package.php

@@ -14,6 +14,7 @@ class Package extends Model
         'owner_name',
         'logistic_name',
         'measuringMachine_name',
+        'measuringMachine_status',
         'paperBox_name',
         'WMSReflectPackage_name'
     ];
@@ -48,6 +49,9 @@ class Package extends Model
     public function getMeasuringMachineNameAttribute(){
         return $this['measuringMachine']? $this['measuringMachine']['name']:null;
     }
+    public function getMeasuringMachineStatusAttribute(){
+        return $this['measuringMachine']? $this['measuringMachine']['status']:null;
+    }
     public function getPaperBoxNameAttribute(){
         return $this['paperBox']? $this['paperBox']['model']:null;
     }

app/Providers/EventServiceProvider.php

@@ -24,6 +24,9 @@ class EventServiceProvider extends ServiceProvider
         'App\Events\InformWMSReceivedEvent' => [
             'App\Listeners\InformWMSReceivedListener',
         ],
+        'App\Events\PackageEvent' =>[
+            'App\Listeners\PackageListener'
+        ],
     ];
 
     /**

config/api.php

@@ -14,8 +14,9 @@ return [
     /** Flux
     https://was.baoshi56.com/api/thirdPart/flux/receive/new  //新增收货
      **/
-//    'receiveAccomplishToWMS_flux' => 'http://47.103.72.58:19199/datahub/FluxBSJsonApi/RECECF?messageId=RECECF', //通知WMS完成的订单收货(测试服)
     'receiveAccomplishToWMS_flux' => 'http://106.14.155.246:19192/datahub/FluxBSJsonApi/RECECF?messageId=RECECF', //通知WMS完成的订单收货
-
+    /** Flux
+    https://was.baoshi56.com/api/thirdPart/flux/package/new  //新增包裹
+     **/
     'packageAccomplishTOWMS_flux' =>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK',
 ];

database/migrations/2019_10_23_174338_create_logistics_table.php

@@ -16,6 +16,7 @@ class CreateLogisticsTable extends Migration
         Schema::create('logistics', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name')->unique();
+            $table->string('code')->unique()->nullable()->comment('代码');
             $table->timestamps();
         });
     }

database/migrations/2020_02_10_103905_change_package_column.php

@@ -31,7 +31,7 @@ class ChangePackageColumn extends Migration
             $table->decimal('height')->nullable()->index()->comment('高(cm)');
             $table->decimal('bulk')->nullable()->comment('体积(cm³)');
             $table->bigInteger('paper_box_id')->nullable()->index()->comment('外键纸箱');
-            $table->enum('status',['无','未上传','已上传','未测量','未下发','上传异常','下发异常','记录异常'])->default('无')->comment('包裹信息状态');
+            $table->enum('status',['无','未上传','已上传','未测量','未下发','上传异常','下发异常','记录异常','已上传异常'])->default('无')->comment('包裹信息状态');
             $table->timestamps();
         });
     }

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

@@ -25,6 +25,18 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label for="code" class="col-2 col-form-label text-right">物流公司代码</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('code') is-invalid @enderror"
+                                   name="code" autocomplete="off" value="{{ old('code') }}" required>
+                            @error('code')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
+                        </div>
+                    </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
                             <input type="submit" class="btn btn-success form-control">

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

@@ -31,6 +31,18 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label for="code" class="col-2 col-form-label text-right">物流公司代码</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('code') is-invalid @enderror"
+                                   name="code" autocomplete="off" value="@if(old('code')){{old('code')}}@else{{$logistic->code}}@endif" required>
+                            @error('code')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
+                        </div>
+                    </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
                             <input type="submit" class="btn btn-outline-dark form-control">

resources/views/maintenance/logistic/index.blade.php

@@ -15,12 +15,14 @@
                     <tr>
                         <th>ID</th>
                         <th>物流公司名</th>
+                        <th>物流公司代码</th>
                         <th>创建时间</th>
                         <th>操作</th>
                     </tr>
                     <tr v-for="logistic in logistics">
                         <td class="text-muted">@{{logistic.id}}</td>
                         <td>@{{logistic.name}}</td>
+                        <td>@{{logistic.code}}</td>
                         <td class="text-muted">@{{logistic.created_at}}</td>
                         <td>
                             @can('物流公司-编辑')
@@ -43,7 +45,7 @@
             data:{
                 logistics:[
                     @foreach( $logistics as $logistic )
-                    {id:'{{$logistic->id}}',name:'{{$logistic->name}}',created_at:'{{$logistic->created_at}}'},
+                    {id:'{{$logistic->id}}',name:'{{$logistic->name}}',code:'{{$logistic->code}}',created_at:'{{$logistic->created_at}}'},
                     @endforeach
                 ],
             },

resources/views/maintenance/measuringMachine/index.blade.php

@@ -15,7 +15,7 @@
                     <tr>
                         <th>ID</th>
                         <th>设备名</th>
-                        <th>设备代号</th>
+                        <th>"设备代码</th>
                         <th>运行状态</th>
                         <th>操作</th>
                     </tr>

resources/views/weight/measureMonitor/index.blade.php

@@ -13,8 +13,10 @@
                             <div class="form-inline">
                                 <h5>
                                 <ul class="nav nav-pills">
+                                        <b style="padding: 10px">请选择设备：</b>
                                         <li v-for="measuringMachine in measuringMachines" @click="clickMeasuringMachine(measuringMachine.id)" :class="[measuringMachine.name==package.measuringMachine ?  selectedMachine : otherMachine] " style="padding: 10px">
-                                            <span :class="[measuringMachine.status=='离线' ?  off : on] " style="font-size:12px;"></span>
+                                            <span v-if="package.measuringMachine==measuringMachine.name" :class="[package.measuringMachine_status=='离线' ?  off : on] " style="font-size:12px;"></span>
+                                            <span v-else :class="[measuringMachine.status=='离线' ?  off : on] " style="font-size:12px;"></span>
                                             <a style="text-decoration:none;cursor:pointer" class="text-dark"  >@{{measuringMachine.name}}</a>
                                         </li>
                                 </ul>
@@ -82,11 +84,11 @@
                     status:'',created_at:'',bulk:'',logistic:''},
                 measuringMachines:[
                     @foreach($measuringMachines as $measuringMachine)
-                    {id:'{{$measuringMachine->id}}',name:'{{$measuringMachine->name}}',code:'{{$measuringMachine->code}}',status:'{{$measuringMachine->status}}'},
+                    {id:'{{$measuringMachine->id}}',name:'{{$measuringMachine->name}}',code:'{{$measuringMachine->code}}',status:'{{$measuringMachine->status}}',},
                     @endforeach
                 ],
-                on:'fa fa-circle text-danger',
-                off:'fa fa-circle text-success',
+                on:'fa fa-circle text-success',
+                off:'fa fa-circle text-danger',
                 selectedMachine:'nav-item btn btn-primary',
                 otherMachine:'nav-item',
                 onColor:{color:'green'},
@@ -148,6 +150,7 @@
                        });
                },
                updateData(_this,package){
+                   console.log(package)
                    _this.package.id=package.id;
                    _this.package.logistic_number=package.logistic_number;_this.package.delivery_number=package.delivery_number;
                    _this.package.weight=package.weight;_this.package.owner=package.owner_name;
@@ -155,9 +158,7 @@
                    _this.package.recipient=package.recipient;_this.package.status=package.status;
                    _this.package.created_at=package.created_at;_this.package.bulk=package.bulk;
                    _this.package.logistic=package.logistic_name;
-                   if (package.measuringMachine){
-                       _this.package.measuringMachine_status=package.measuringMachine.status;
-                   }
+                   _this.package.measuringMachine_status=package.measuringMachine_status;
                }
             },
         });

resources/views/weight/menu.blade.php

@@ -1,5 +1,5 @@
 
-<div class="container mt-3" id="nav2">
+<div class="container-fluid mt-3" id="nav2">
     <div class="card">
         <ul class="nav nav-pills">
             @can('测量机监视界面-查询')
@@ -23,4 +23,4 @@
 
         </ul>
     </div>
-</div>
+</div>

resources/views/weight/menuWeight.blade.php

@@ -11,6 +11,10 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" href="{{url('maintenance/measuringMachine')}}" :class="{active:isActive('waybillPriceModel',2)}">测量设备</a>
                         </li> @endcan
+                    @can('纸箱')
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="{{url('maintenance/paperBox/index/model')}}" :class="{active:isActive('paperBox',2)}">纸箱</a>
+                        </li> @endcan
                 </ul>
             </div>
         </div>

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

@@ -4,7 +4,7 @@
     <div id="nav2">
         @component('weight.menu')@endcomponent
     </div>
-    <div class="container mt-3" id="package">
+    <div class="container-fluid mt-3" id="package">
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form method="POST" action="{{ url('weight/package') }}">

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

@@ -8,9 +8,9 @@
     </span>
     <div id="list">
         <div class="mt-3" style="margin-left: 20px">
-            <div class="card" style="width: 1800px;">
+            <div class="card table-responsive">
                 <div>
-                    <form  method="GET" action="{{url('weight/package')}}" style="margin-top: 1%" id="optionSubmit">
+                    <form  method="GET" action="{{url('weight/package/index')}}" style="margin-top: 1%" id="optionSubmit">
                         <table class="table  table-sm table-bordered table-hover text-nowrap ">
                             <tr>
                                 <td colspan="10"><div class="col" v-if="isBeingFilterConditions" style="padding:0">
@@ -31,7 +31,7 @@
                                     </select></td>
                             </tr>
                             <tr>
-                                <td>
+                                <td rowspan="2">
                                     <span class="text-muted">根据条件过滤：</span>
                                 </td>
                                 <td >
@@ -40,41 +40,63 @@
                                         <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" class="form-control-sm">
                                     </label>
                                 </td>
-                                <td > <label class="form-inline" style="width:200px;margin-left: 2%">货主：
+                                {{--<td > <label class="form-inline" style="width:200px;margin-left: 2%">货主：
                                         <input class="form-control-sm" style="width: 80px" placeholder="搜索定位" @input="owner_seek">&nbsp;&nbsp;&nbsp;
                                         <select name="owner_id" v-model="filterData.owner_id" class="form-control-sm"  @change="setOwner">
                                             <option >    </option>
                                             @foreach($owners as $owner)
                                                 <option value="{{$owner->id}}">{{$owner->name}}</option>
                                             @endforeach
-                                        </select></label><input hidden type="submit" value="kk"></td>
+                                        </select></label><input hidden type="submit" value="kk"></td>--}}
+                                <td>
+                                    <label for="">客户：</label>
+                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="查找"
+                                           style="width:70px" @input="owner_seek"
+                                           title="输入关键词快速定位下拉列表，回车确定">
+                                    <select name="owner_id" v-model="filterData.owner_id" @change="setOwner" class="form-control-sm tooltipTarget">
+                                        <option >    </option>
+                                        @foreach($owners as $owner)
+                                            <option value="{{$owner->id}}">{{$owner->name}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input hidden type="submit" value="kk">
+                                </td>
                                 <td > <label class="form-inline" style="width:250px;margin-left: 2%">快递单号：
                                         <input type="text" name="logistic_number" class="form-control-sm  " v-model="filterData.logistic_number" style="vertical-align: middle"></label></td>
                                 <td > <label  class="form-inline" style="width:250px;margin-left: 2%">发货单号：
                                         <input type="text" name="delivery_number" class="form-control-sm  " v-model="filterData.delivery_number" style="vertical-align: middle"></label></td>
                                 <td colspan="5"></td>
                             </tr>
+                            <tr>
+                                <td > <label class="form-inline" >波次号：
+                                        <input type="text" name="batch_number" class="form-control-sm  " v-model="filterData.batch_number" style="vertical-align: middle"></label></td>
+                            </tr>
                             <tr>
                                 <td>
                                     <span class="text-muted">操作选定记录：</span>
                                 </td>
                                 <td colspan="9">
-                                    <span class="btn btn-sm" @click="packageExport" style="cursor: pointer"
-                                          :class="[checkData>0?'btn-dark':'btn-outline-dark']">导出Excel</span>
+                                    <select @change="packageExport" :class="[checkData>0?'btn-dark':'btn-outline-dark']"  class=" tooltipTarget form-control-sm" style=" vertical-align: middle"
+                                             title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                        <option >选择导出规则</option>
+                                        <option value="1">导出勾选内容</option>
+                                        <option value="2">导出所有页</option>
+                                    </select>
                                     <input hidden type="submit" value="kk">
                                 </td>
                             </tr>
                         </table>
                     </form>
                 </div>
-            <div class="card-body">
-                <table class="table table-striped table-sm text-nowrap">
+            <div class="">
+                <table class="table table-striped table-sm text-nowrap table-hover">
                     <tr>
                         <th>
                             <label for="all">
                                 <input id="all" type="checkbox" @click="checkAll($event)">全选
                             </label>
                         </th>
+                        <th>序号</th>
                         <th>ID</th>
                         <th>货主</th>
                         <th>快递单号</th>
@@ -92,21 +114,22 @@
                         <th>纸箱</th>
                         <th>状态</th>
                     </tr>
-                    <tr v-for="package in packages">
+                    <tr v-for="(package,i) in packages">
                         <td>
                             <input class="checkItem" type="checkbox" :value="package.id" v-model="checkData">
                         </td>
+                        <td>@{{ i+1  }}</td>
                         <td class="text-muted">@{{package.id}}</td>
                         <td>@{{package.ownerName}}</td>
                         <td>@{{package.logisticNumber}}</td>
-                        <td>@{{package.wmsNumber}}</td>
-                        <td>@{{package.batchNumber}}</td>
+                        <td class="text-muted">@{{package.wmsNumber}}</td>
+                        <td class="text-muted">@{{package.batchNumber}}</td>
                         <td>@{{package.batchRule}}</td>
                         <td class="text-muted">@{{package.created_at}}</td>
                         <td>@{{package.recipient}}</td>
                         <td>@{{package.recipientMobile}}</td>
-                        <td>@{{package.logisticName}}</td>
-                        <td>@{{package.measuringMachineName}}</td>
+                        <td class="text-muted">@{{package.logisticName}}</td>
+                        <td class="text-muted">@{{package.measuringMachineName}}</td>
                         <td>@{{package.weight}}</td>
                         <td>@{{package.length}}<a v-if="package.length" class="text-primary">*</a>@{{package.width}}<a class="text-primary" v-if="package.width">*</a>@{{package.height}}</td>
                         <td>@{{package.bulk}}</td>
@@ -122,6 +145,7 @@
 @endsection
 
 @section('lastScript')
+    <script></script>
     <script>
         new Vue({
             el:"#list",
@@ -137,13 +161,14 @@
                         status:'{{$package->status}}',created_at:'{{$package->created_at}}'},
                     @endforeach
                 ],
+                i:0,
                 owners:[
                     @foreach($owners as $owner)
                         {id:'{{$owner->id}}',name:'{{$owner->name}}'},
                     @endforeach
                 ],
                 filterData:
-                    {paginate:'50',created_at_start:'',created_at_end:'',logistic_number:'',delivery_number:'',owner_id: ''},
+                    {paginate:'50',created_at_start:'',created_at_end:'',logistic_number:'',delivery_number:'',owner_id: '',batch_number:''},
                 checkData:[]
             },
             mounted:function(){
@@ -210,12 +235,17 @@
                         this.checkData = [];
                     }
                 },
-                packageExport(){
+                packageExport(e){
                     if (this.checkData&&this.checkData.length<=0){
                         tempTip.setDuration(4000);
                         tempTip.showSuccess('没有勾选任何记录');
                     }else{
-                        location.href="{{url('weight/package/export').'/'}}"+this.checkData;
+                        if (e===1){
+                            location.href="{{url('weight/package/export').'/'}}"+this.checkData;
+                        } else {
+                            location.href="{{url('weight/package/export/-1')}}";
+                        }
+
                     }
                 },
                 owner_seek:function (e) {

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

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav nav-pills">
             @can('包裹信息-查询')

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

@@ -7,7 +7,7 @@
         @component('weight.weightExcepted.menu')@endcomponent
     </span>
     <div id="list">
-        <div class="container mt-3">
+        <div class="container-fluid mt-3">
             <div class="card">
                 <div>
                     <form  method="GET" action="{{url('weight/weightExcepted/'.$view)}}" style="margin-top: 1%" id="optionSubmit">
@@ -33,7 +33,7 @@
                 </div>
             <div class="card-body">
                 <table class="table table-striped table-sm">
-                    <tr style="color: red">
+                    <tr >
                         <th>
                             <label for="all">
                                 <input id="all" type="checkbox" @click="checkAll($event)">全选
@@ -62,11 +62,11 @@
                             <th>异常类型</th>
                         @endif
                     </tr>
-                    <tr v-for="weightExcepted in weightExcepteds">
+                    <tr v-for="weightExcepted in weightExcepteds" style="color: red">
                         <td>
                             <input class="checkItem" type="checkbox" :value="weightExcepted.id" v-model="checkData">
                         </td>
-                        <td class="text-muted">@{{weightExcepted.id}}</td>
+                        <td >@{{weightExcepted.id}}</td>
                         <td>@{{weightExcepted.logisticNumber}}</td>
                         <td>@{{weightExcepted.carrierName}}</td>
                         @if($view=="indexIssued")

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

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid">
     <div class="card menu-third" style="background: #f9f0f0;transform: scale(0.95)">
         <ul class="nav nav-pills">
             @can('包裹信息-查看异常')

routes/api/thirdPart/flux.php

@@ -6,12 +6,11 @@ use Illuminate\Http\Request;
 /*
 文件地址前缀：/api/thirdPart/flux/receive
 */
-Route::prefix('receive')->group(function(){
-    Route::post('new', "ReceiveController@new_");//增加新波次消息
-    //accomplishToWMS() 发往WMS的完成单
-});
+Route::post('receive/new', "ReceiveController@new_");//增加新波次消息
+//accomplishToWMS() 发往WMS的完成单
 
 /*
 文件地址前缀：/api/thirdPart/flux/package
 */
-Route::post('package/new', "PackageController@new_");//增加新波次消息
+Route::post('package/new', "PackageController@new_");//增加新波次消息
+//accomplishToWMS() 发往WMS的称重和纸条包裹信息