Merge branch 'Haozi'

# Conflicts:
#	resources/views/waybill/index.blade.php

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

@@ -59,6 +59,7 @@ class WaybillController extends Controller
                 'destination'=>$receiveInputting['C_Address1']??'',
                 'recipient'=>$receiveInputting['ConsigneeName']??'',
                 'recipient_mobile'=>$receiveInputting['C_Tel1']??'',
+                'source_bill'=>$receiveInputting['ReservedField01']??'',
                 'destination_city_id'=>$city['id'],
             ]);
             $waybill->save();

database/migrations/2020_05_18_105150_change_cities_table.php

@@ -18,10 +18,10 @@ class ChangeCitiesTable extends Migration
             $table->bigInteger('type')->default(2)->comment('行政级别');
         });
         Schema::table('w_m_s_waybills', function (Blueprint $table) {
-            $table->string('ReservedField01 ')->nullable()->comment('预留字段1');
+            $table->string('ReservedField01')->nullable()->comment('预留字段1');
         });
         Schema::table('waybills', function (Blueprint $table) {
-            $table->string('source_bill')->nullable()->comment('上游单号');
+            $table->string('source_bill')->after('waybill_number')->nullable()->comment('上游单号');
         });
     }
 

resources/views/waybill/index.blade.php

@@ -202,6 +202,7 @@
                     <td class="text-muted">@{{waybill.created_at}}</td>
                     <td>@{{waybill.type}}</td>
                     <td>@{{waybill.owner}}</td>
+                    <td>@{{waybill.source_bill}}</td>
                     <td>@{{waybill.wms_bill_number}}</td>
                     <td>@{{waybill.waybill_number}}</td>
                     <td>@{{waybill.recipient}}</td>
@@ -312,7 +313,7 @@
                     {
                         id:'{{$waybill->id}}',created_at:'{{$waybill->created_at}}',updated_at:'{{$waybill->updated_at}}',
                         status:'{{$waybill->status}}',type:'{{$waybill->type}}',waybill_number:'{{$waybill->waybill_number}}',
-                        owner:'{{$waybill->owner_name}}',wms_bill_number:'{{$waybill->wms_bill_number}}',origination:'{{$waybill->origination}}',
+                        owner:'{{$waybill->owner_name}}',source_bill:'{{$waybill->source_bill}}',wms_bill_number:'{{$waybill->wms_bill_number}}',origination:'{{$waybill->origination}}',
                         destination:'{{$waybill->destination}}',recipient:'{{$waybill->recipient}}',recipient_mobile:'{{$waybill->recipient_mobile}}',
                         charge:'{{$waybill->charge}}',ordering_remark:'{{$waybill->ordering_remark}}',carrier:'{{$waybill->carrier_name}}',
                         carrier_bill:'{{$waybill->carrier_bill}}',origination_city:'{{$waybill->origination_city_name}}',