称重设备状态

app/Http/Controllers/MeasureMonitorController.php

@@ -23,7 +23,9 @@ class MeasureMonitorController extends Controller
     public function data(Request $request){
         $measuring_machine_id=$request->input('id');
         if ($measuring_machine_id){
-            $package=OrderPackage::with('order','paperBox','measuringMachine')->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
+            $package=OrderPackage::with(['order'=>function($query){
+                $query->with('owner','logistic');
+            },'paperBox','measuringMachine'])->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
             if (!$package){
                 $measuringMachine=MeasuringMachine::query()->where('id',$measuring_machine_id)->first();
                 $package=new OrderPackage();

app/Http/Controllers/PackageController.php

@@ -36,6 +36,7 @@ class PackageController extends Controller
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $paginateParams = $request->input();
+        /** @var PackageService */
         $packages = app('packageService')->paginate($request);
         return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }

app/Services/OrderService.php

@@ -142,6 +142,7 @@ class OrderService
         $shop = null;
         $shop_name = $orderHeader->issuepartyname;
         if ($shop_name && $owner) {
+            /** @var ShopService */
             $shop = app('shopService')->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner->id]);
         }
 

app/Services/PackageService.php

@@ -13,7 +13,7 @@ Class PackageService
     private function conditionQuery($params){
         $packages = OrderPackage::query()->with(['order'=>function($query){
             $query->with('owner','logistic');
-        }])->orderBy(TABLE.'id','DESC');
+        },'paperBox','measuringMachine'])->orderBy(TABLE.'id','DESC');
         $columnQueryRules=[
             'logistic_number' => ['like' => ''],
             'batch_number' => ['like' => ''],

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

@@ -119,16 +119,16 @@
                     }else{
                         _this.currentAudioIndex=_this.currentAudioIndex+1;
                     }
-                    if (package && package.measuringMachine && package.measuringMachine.name ===_this.package.measuringMachine){
+                    if (package && package.measuring_machine && package.measuring_machine.name ===_this.package.measuringMachine){
                         if (package.id ===_this.package.id){
-                            _this.package.measuringMachine_status=package.measuringMachine.status;
-                            _this.measuringMachinesIndex[package.package.measuringMachine.name].status=package.measuringMachine_status;
+                            _this.package.measuringMachine_status=package.measuring_machine.status;
+                            _this.measuringMachinesIndex[package.measuring_machine.name].status=package.measuring_machine.status;
                             tempTip.setDuration(4000);
                             tempTip.showSuccess('暂无新数据');
                             return;
                         }
                         _this.updateData(_this,package);
-                        let logistic_name = package.logistic ? package.logistic.name : '';
+                        let logistic_name = package.order ? (package.order.logistic ? package.order.logistic.name : '') : '';
                         if (_this.logisticAudioURL[logistic_name]){
                             audio.src=_this.logisticAudioURL[logistic_name];
                             audio.play();
@@ -153,11 +153,6 @@
                         tempTip.showSuccess('刷新成功!');
                     }
                 });
-                /*                if(this.timer){
-                                    clearInterval(this.timer);
-                                }else {
-                                    this.timer=setInterval(()=>{this.flushData();},18000);
-                                }*/
             },
             methods:{
                 clickMeasuringMachine(e){
@@ -167,7 +162,7 @@
                             if (response.data.id){
                                 let orderPackage=response.data;
                                 _this.updateData(_this,orderPackage);
-                                _this.package.measuringMachine=orderPackage.measuringMachine ? orderPackage.measuringMachine.name : '';                            }else {
+                                _this.package.measuringMachine=orderPackage.measuring_machine ? orderPackage.measuring_machine.name : '';                            }else {
                                 tempTip.setDuration(4000);
                                 tempTip.showSuccess('暂无数据!');
                             }
@@ -182,14 +177,14 @@
                     _this.package.logistic_number=package.logistic_number;
                     _this.package.orderno = package.order ?  package.order.code : '';
                     _this.package.weight=package.weight;
-                    _this.package.owner=package.owner ? package.owner.name : '';
-                    _this.package.paperBox=package.paperBox ? package.paperBox.name : '';
+                    _this.package.owner=package.order ? (package.order.owner ? package.order.owner.name : '') : '';
+                    _this.package.paperBox=package.paper_box ? package.paper_box.name : '';
                     _this.package.recipient=package.order ? package.order.recipient : '';
                     _this.package.status=package.status;
                     _this.package.weighed_at=package.weighed_at;_this.package.bulk=package.bulk;
-                    _this.package.logistic_name=package.logistic ? package.logistic.name : '';
-                    _this.package.measuringMachine_status=package.measuringMachine ? package.measuringMachine.status : '';
-                    _this.measuringMachinesIndex[package.measuringMachine ? package.measuringMachine.name : ''].status=package.measuringMachine_status;
+                    _this.package.logistic_name=package.order ? (package.order.logistic ? package.order.logistic.name : '') : '';
+                    _this.package.measuringMachine_status=package.measuring_machine ? package.measuring_machine.status : '';
+                    _this.measuringMachinesIndex[package.measuring_machine ? package.measuring_machine.name : ''].status=package.measuring_machine ? package.measuring_machine.status : '离线';
                 }
             },
         });

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

@@ -79,7 +79,7 @@
                         weight:'{{$package->weight}}', length:'{{$package->length}}',width:'{{$package->width}}',height:'{{$package->height}}',
                         bulk:'{{$package->bulk}}',paperBoxName:'{{$package->paper_box ? $package->paper_box->name : ''}}',
                         status:'{{$package->status}}',created_at:'{{$package->created_at}}',weighed_at:'{{$package->weighed_at}}',
-                        paperBox : {!! $package->paperBox !!} },
+                        },
                     @endforeach
                 ],
                 i:0,