Merge branch 'waybill_ZD' of ssh://47.103.131.176:10022/var/git/bswas into waybill_ZD

app/WMSReflectPackage.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class WMSReflectPackage extends Model
 {
-    protected $table="w_m_s_reflect_package";
     protected $fillable=[
         'TASKID','Orderno','palletid','SOReference5','Customer','Consigneename','CarrierID',
         'USERDEFINE1','USERDEFINE2','USERDEFINE3'

database/migrations/2020_02_10_103905_change_package_column.php

@@ -23,7 +23,7 @@ class ChangePackageColumn extends Migration
             $table->string('batch_rule')->nullable()->comment('波次规则');
             $table->string('recipient')->nullable()->comment('收件人');
             $table->string('recipient_mobile')->nullable()->comment('收件人电话');
-            $table->bigInteger('logistics_id')->nullable()->index()->comment('外键物流公司');
+            $table->bigInteger('logistic_id')->nullable()->index()->comment('外键物流公司');
             $table->bigInteger('measuring_machine_id')->nullable()->index()->comment('外键设备');
             $table->decimal('weight')->nullable()->comment('重KG');
             $table->decimal('length')->nullable()->index()->comment('长(cm)');

database/migrations/2020_02_19_145227_create_w_m_s_reflect_package_table.php

@@ -13,7 +13,7 @@ class CreateWMSReflectPackageTable extends Migration
      */
     public function up()
     {
-        Schema::create('w_m_s_reflect_package', function (Blueprint $table) {
+        Schema::create('w_m_s_reflect_packages', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('TASKID',30)->unique()->comment('任务号');
             $table->string('Orderno',30)->unique()->comment('WMS订单号');
@@ -37,6 +37,6 @@ class CreateWMSReflectPackageTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('w_m_s_reflect_package');
+        Schema::dropIfExists('w_m_s_reflect_packages');
     }
 }