订单问题迁移BAK

database/migrations/2020_07_24_072012_create_orders_table.php.bak

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('orders', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string("batch_id")->index()->nullable();
+            $table->string("code")->index();
+            $table->integer("owner_id")->nullable();
+            $table->enum("status",['处理中','未处理','已处理','取消','异常'])->default('未处理');
+            $table->string("wms_status");
+
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('orders');
+    }
+}

database/migrations/2020_07_24_072406_create_order_commodities_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateOrderCommoditiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('order_commodities', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->integer('order_id')->index();
+            $table->integer('commodity_id')->index();
+            $table->integer('amount');
+            $table->string('wms_ptltaskid')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_barcodes');
+    }
+}

resources/views/waybill/index.blade.php

@@ -747,7 +747,6 @@
                             location.href = "{{url('waybillExport')}}/" + this.checkData;
                         }
                     }else {
-
                         $form=$('<form target="_blank" action="{{url('waybillExport/-1')}}"></form>')
                         $form.append("<input type='hidden' name='waybill_number' value='"+data.waybill_number+"'/>");
                         $form.append("<input type='hidden' name='carrier_bill' value='"+data.carrier_bill+"'/>");