包裹管理-称重记录波次显示字段调整

app/Http/Controllers/WeighController.php

@@ -41,6 +41,7 @@ class WeighController extends Controller
      *
      * @param Request $request
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void
+     * @throws
      */
     public function store(Request $request)
     {

app/Services/PackageService.php

@@ -19,7 +19,7 @@ class PackageService
     private function conditionQuery($params){
         $ownerIds=app('UserService')->getPermittingOwnerIds(Auth::user());
         $packages = OrderPackage::query()->with(['order'=>function($query){
-            return  $query->with(['owner','logistic']);
+            return  $query->with(['owner','logistic','batch']);
         },'paperBox','measuringMachine'])
         ->whereIn('order_packages.owner_id',$ownerIds)->orderBy(TABLE.'id','DESC');
         if ($params['owner_id'] ?? false){

database/migrations/2021_02_22_175630_change_waybills_table_add_order_id_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeWaybillsTableAddOrderIdColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('waybills', function (Blueprint $table) {
+            //
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('waybills', function (Blueprint $table) {
+            //
+        });
+    }
+}

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

@@ -72,11 +72,13 @@
                         @foreach($packages as $package)
                     {id:'{{$package->id}}',ownerName:'{{$package->order ? ($package->order->owner ? $package->order->owner->name : '') : ''}}',
                         orderCode:'{{$package->order ? $package->order->code : ''}}',
-                        logisticName:'{{$package->order ? ($package->order->logistic ? $package->order->logistic->name : '') : ''}}'
-                        ,batchNumber:'{{$package->batch_number}}',batchRule:'{{$package->batch_rule}}',
-                        recipient:'{{$package->order ? $package->order->consignee_name : ''}}',recipientMobile:'{{$package->order ? $package->order->consignee_phone : ''}}'
-                        ,logisticNumber:'{{$package->logistic_number}}'
-                        ,measuringMachineName:'{{$package->measuringMachine ? $package->measuringMachine->name : ''}}',
+                        logisticName:'{{$package->order ? ($package->order->logistic ? $package->order->logistic->name : '') : ''}}',
+                        batchNumber:'{{$package->order ? ($package->order->batch ? $package->order->batch->code : '') : ''}}',
+                        batchRule:'{{$package->order ? ($package->order->batch ? $package->order->batch->wms_type : '') : ''}}',
+                        recipient:'{{$package->order ? $package->order->consignee_name : ''}}',
+                        recipientMobile:'{{$package->order ? $package->order->consignee_phone : ''}}',
+                        logisticNumber:'{{$package->logistic_number}}',
+                        measuringMachineName:'{{$package->measuringMachine ? $package->measuringMachine->name : ''}}',
                         weight:'{{$package->weight}}', length:'{{$package->length}}',width:'{{$package->width}}',height:'{{$package->height}}',
                         bulk:'{{$package->bulk}}',paperBoxName:'{{$package->paperBox ? $package->paperBox->name : ''}}',
                         status:'{{$package->status}}',created_at:'{{$package->created_at}}',weighed_at:'{{$package->weighed_at}}',