称重机BUG

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

@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Jobs\FetchPackageFromOracle;
 use App\MeasuringMachine;
 use App\OrderPackage;
+use App\Services\OrderService;
 use App\Waybill;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -216,7 +217,14 @@ class PackageController extends Controller
         }
         if (!$package){
             $logisticNumber=$request['barcode'];
-            $package=new Package([
+            $order = app('orderService')->logisticNumberCreateOrder($logisticNumber);
+            if (!$order) {
+                $response=["msg"=>"保存时发生错误（未在WMS找到该单）!","code"=>500,"data"=>null];
+                return json_encode($response,JSON_UNESCAPED_UNICODE);
+            }
+            $package=new OrderPackage([
+                /** @var OrderService */
+                'order_id' => $order->id,
                 'logistic_number'=>$logisticNumber,
                 'measuring_machine_id'=>$measuringMachine->id,
                 'weight'=>$request['weight'],

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

@@ -33,8 +33,8 @@
                                                 <td>@{{package.weight}}</td>
                                             </tr>
                                             <tr>
-                                                <th class="tag" scope="row" scope="row">发货单号</th>
-                                                <td style="border-right:thick double #aaaaaa;">@{{package.delivery_number}}</td>
+                                                <th class="tag" scope="row" scope="row">订单编号</th>
+                                                <td style="border-right:thick double #aaaaaa;">@{{package.orderno}}</td>
                                                 <th class="tag" scope="row" scope="row">收件人</th>
                                                 <td>@{{package.recipient}}</td>
                                             </tr>
@@ -78,7 +78,7 @@
             el:'#list',
             data:{
                 package:
-                    {id:'',logistic_number:'',delivery_number:'',
+                    {id:'',logistic_number:'',orderno:'',
                         weight:'',owner:'',paperBox:'',
                         measuringMachine:'',recipient:'',measuringMachine_status:'',
                         status:'',weighed_at:'',bulk:'',logistic_name:''},
@@ -119,20 +119,21 @@
                     }else{
                         _this.currentAudioIndex=_this.currentAudioIndex+1;
                     }
-                    if (package&& package.measuringMachine_name===_this.package.measuringMachine){
-                        if (package.id===_this.package.id){
-                            _this.package.measuringMachine_status=package.measuringMachine_status;
-                            _this.measuringMachinesIndex[package.measuringMachine_name].status=package.measuringMachine_status;
+                    if (package && package.measuringMachine && package.measuringMachine.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;
                             tempTip.setDuration(4000);
                             tempTip.showSuccess('暂无新数据');
                             return;
                         }
                         _this.updateData(_this,package);
-                        if (_this.logisticAudioURL[package.logistic_name]){
-                            audio.src=_this.logisticAudioURL[package.logistic_name];
+                        let logistic_name = package.logistic ? package.logistic.name : '';
+                        if (_this.logisticAudioURL[logistic_name]){
+                            audio.src=_this.logisticAudioURL[logistic_name];
                             audio.play();
                         }else {
-                            axios.post('/package/measureMonitor/speech',{logistic:package.logistic_name})
+                            axios.post('/package/measureMonitor/speech',{logistic:logistic_name})
                                 .then(function (response) {
                                     if (response.data){
                                         _this.logisticAudioURL[_this.package.logistic_name]=response.data;
@@ -166,7 +167,7 @@
                             if (response.data.id){
                                 let package=response.data;
                                 _this.updateData(_this,package);
-                                _this.package.measuringMachine=package.measuringMachine_name;                            }else {
+                                _this.package.measuringMachine=package.measuringMachine ? package.measuringMachine.name : '';                            }else {
                                 tempTip.setDuration(4000);
                                 tempTip.showSuccess('暂无数据!');
                             }
@@ -178,14 +179,17 @@
                 },
                 updateData(_this,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;
-                    _this.package.paperBox=package.paperBox_name;
-                    _this.package.recipient=package.recipient;_this.package.status=package.status;
+                    _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.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_name;
-                    _this.package.measuringMachine_status=package.measuringMachine_status;
-                    _this.measuringMachinesIndex[package.measuringMachine_name].status=package.measuringMachine_status;
+                    _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;
                 }
             },
         });

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

@@ -77,7 +77,8 @@
                         ,measuringMachineName:'{{$package->measuring_machine ? $package->measuring_machine->name : ''}}',
                         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}}'},
+                        status:'{{$package->status}}',created_at:'{{$package->created_at}}',weighed_at:'{{$package->weighed_at}}',
+                        paperBox : {!! $package->paperBox !!} },
                     @endforeach
                 ],
                 i:0,