路由与迁移文件部分调整

database/migrations/2019_11_22_094201_create_car_types_table.php

@@ -21,7 +21,6 @@ class CreateCarTypesTable extends Migration
             $table->decimal('length')->comment('车长(米)');
             $table->decimal('load')->nullable()->comment('载重(吨)');
             $table->text('remark')->nullable()->comment('备注');
-
         });
     }
 

database/migrations/2019_11_22_094213_create_units_table.php

@@ -3,9 +3,11 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
 
 class CreateUnitsTable extends Migration
 {
+    protected $units = ['kg','m³','T'];
     /**
      * Run the migrations.
      *
@@ -18,10 +20,9 @@ class CreateUnitsTable extends Migration
             $table->timestamps();
             $table->string('name',50)->unique()->comment('名称');
         });
-        $units=['kg','m³','T'];
-        for ($i=0;$i<count($units);$i++){
-            \App\Unit::create([
-                'name'=>$units[$i],
+        for ($i=0;$i<count($this->units);$i++){
+            DB::insert(DB::raw("INSERT INTO units(name,created_at,updated_at) VALUES(?,?,?)"),[
+                $this->units[$i],date("Y-m-d"),date("Y-m-d")
             ]);
         }
     }

database/migrations/2019_11_22_094241_create_provinces_table.php

@@ -3,9 +3,14 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
 
 class CreateProvincesTable extends Migration
 {
+    protected $provinces=[
+        '陕西','甘肃','宁夏','青海','新疆','江苏','浙江','安徽','江西','福建','重庆','四川','云南',
+        '贵州','西藏','黑龙江','吉林','辽宁','山东','北京','天津','广西','广东','河北','山西','内蒙古',
+        '湖北','湖南','河南','海南','香港','澳门','台湾','上海'];
     /**
      * Run the migrations.
      *
@@ -18,12 +23,9 @@ class CreateProvincesTable extends Migration
             $table->string('name',50)->unique()->comment('名称');
             $table->timestamps();
         });
-        $provinces=['陕西','甘肃','宁夏','青海','新疆','江苏','浙江','安徽','江西','福建','重庆','四川','云南',
-            '贵州','西藏','黑龙江','吉林','辽宁','山东','北京','天津','广西','广东','河北','山西','内蒙古',
-            '湖北','湖南','河南','海南','香港','澳门','台湾','上海'];
-        for ($i=0;$i<count($provinces);$i++){
-            \App\Province::create([
-                'name'=>$provinces[$i]
+        foreach ($this->provinces as $province){
+            DB::insert(DB::raw("INSERT INTO provinces(name,created_at,updated_at) VALUES(?,?,?)"),[
+                $province,date("Y-m-d"),date("Y-m-d")
             ]);
         }
     }

database/migrations/2020_01_02_172739_change_waybill_price_model_field.php

@@ -26,6 +26,7 @@ class ChangeWaybillPriceModelField extends Migration
     public function down()
     {
         Schema::table('waybill_price_models', function (Blueprint $table) {
+            $table->bigInteger('city_id')->change();
         });
     }
 }

database/migrations/2020_03_25_164120_create_process_methods_table.php

@@ -1,11 +1,13 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
 class CreateProcessMethodsTable extends Migration
 {
+    protected $processMethods=['贴标','撕标','全检','组套','拆套','喷码','其他'];
     /**
      * Run the migrations.
      *
@@ -20,10 +22,9 @@ class CreateProcessMethodsTable extends Migration
             $table->string('name');
             $table->timestamps();
         });
-        $processMethods=['贴标','撕标','全检','组套','拆套','喷码','其他'];
-        for ($i=0;$i<count($processMethods);$i++){
-            \App\ProcessMethod::create([
-                'name'=>$processMethods[$i]
+        foreach ($this->processMethods as $processMethod){
+            DB::insert(DB::raw("INSERT INTO process_methods(name,created_at,updated_at) VALUES(?,?,?)"),[
+                $processMethod,date("Y-m-d"),date("Y-m-d")
             ]);
         }
     }

database/migrations/2020_03_25_164834_change_commodities_table.php

@@ -16,25 +16,9 @@ class ChangeCommoditiesTable extends Migration
      */
     public function up()
     {
-
-        ini_set('max_execution_time',2500);
-        ini_set('memory_limit','1526M');
         Schema::table('commodities',function (Blueprint $table){
             $table->bigInteger('owner_id')->after('owner_name')->nullable()->comment('外键货主');
         });
-        if (Schema::hasColumn('commodities','owner_name')){
-            $commodities=Commodity::get();
-            foreach ($commodities as $commodity){
-                $owner=\App\Owner::select('id')->where('name',$commodity->owner_name)->first();
-                if($owner){
-                    $commodity->owner_id=$owner->id;
-                    $commodity->save();
-                }
-            }
-            Schema::table('commodities',function (Blueprint $table){
-                $table->dropColumn('owner_name');
-            });
-        }
     }
 
     /**
@@ -47,16 +31,5 @@ class ChangeCommoditiesTable extends Migration
         Schema::table('commodities',function (Blueprint $table){
             $table->string('owner_name')->after('owner_id')->nullable()->comment('外键货主');
         });
-        if (Schema::hasColumn('commodities','owner_id')){
-            $commodities=Commodity::get();
-            foreach ($commodities as $commodity){
-                $owner=\App\Owner::select('id','name')->where('id',$commodity->owner_id)->first();
-                \Illuminate\Support\Facades\DB::table('commodities')->where('id',$commodity->id)->update(['owner_name'=>$owner->name]);
-            }
-            Schema::table('commodities',function (Blueprint $table){
-                $table->dropColumn('owner_id');
-            });
-
-        }
     }
 }

database/migrations/2020_03_30_112202_drop_commodity_barcode_column_to_barcode_table.php

@@ -20,4 +20,10 @@ class DropCommodityBarcodeColumnToBarcodeTable extends Migration
         });
     }
 
+    public function down()
+    {
+        Schema::table('commodities', function (Blueprint $table) {
+            $table->string('barcode')->unique();
+        });
+    }
 }

database/migrations/2020_06_02_130804_change_user_duty_check.php

@@ -26,6 +26,7 @@ class ChangeUserDutyCheck extends Migration
     public function down()
     {
         Schema::table('user_duty_checks', function (Blueprint $table) {
+            $table->dropColumn('workgroup_id');
         });
     }
 }

routes/web.php

@@ -16,6 +16,39 @@ use Illuminate\Support\Facades\Auth;
 //auth组件的一些注册路由
 Auth::routes();
 
+
+/*
+ * 无需认证的路由
+ * */
+Route::get('/', function () {return redirect('login');});
+Route::any('test/{method}', 'TestController@method');
+//称重广播
+Route::post('package/weigh/measureMonitor/speech','MeasureMonitorController@speech');
+
+//称重显示
+Route::get('package/measureMonitor','MeasureMonitorController@index');
+Route::resource('package/measureMonitor','MeasureMonitorController');
+Route::resource('package/weigh/measureMonitor','MeasureMonitorController');
+//入库预约终端
+Route::get('store/deliveryAppointment/exhibition','DeliveryAppointmentController@exhibition');
+//入库预约预约码输入
+Route::get('store/deliveryAppointment/delivery','DeliveryAppointmentController@delivery');
+//入库预约错误页面
+Route::get('store/deliveryAppointment/errMsg','DeliveryAppointmentController@errMsg');
+//入库预约成功页面
+Route::get('store/deliveryAppointment/successMsg','DeliveryAppointmentController@successMsg');
+//入库预约展览数据
+Route::post('store/deliveryAppointment/getExhibitionList','DeliveryAppointmentController@getExhibitionList');
+//入库预约验证密匙
+Route::post('store/deliveryAppointment/getKey','DeliveryAppointmentController@getKey');
+//临时工二维码
+Route::get('personnel/checking-in/goGetQRCode','QRCodeController@goGetQRCode');
+Route::get('personnel/checking-in/QRCode','QRCodeController@QRCode');
+Route::get('personnel/checking-in/importAndExportQRCode','QRCodeController@importAndExportQRCode');
+Route::post('personnel/checking-in/refreshQRCode','QRCodeController@refreshQRCode');
+//监视器
+Route::get('station/index/{station}','StationController@monitorShow');
+
 /*
  * 需要认证的路由
  * */
@@ -389,8 +422,6 @@ Route::group(['middleware'=>'auth'],function ($route){
         Route::get('statistics','WeighController@statistics');
         Route::get('relating', function () {return view('package.measureMonitor.menu');});
 
-        Route::resource('measureMonitor','MeasureMonitorController');
-
         Route::group(['prefix'=>'measureMonitor'],function(){
             Route::post('data','MeasureMonitorController@data');
         });
@@ -860,32 +891,3 @@ Route::group(['middleware'=>'auth'],function ($route){
         Route::get('/','DemandController@index');
     });
 });
-
-/*
- * 无需认证的路由
- * */
-Route::get('/', function () {return redirect('login');});
-Route::any('test/{method}', 'TestController@method');
-//称重广播
-Route::post('package/weigh/measureMonitor/speech','MeasureMonitorController@speech');
-//称重显示
-Route::resource('package/weigh/measureMonitor','MeasureMonitorController');
-//入库预约终端
-Route::get('store/deliveryAppointment/exhibition','DeliveryAppointmentController@exhibition');
-//入库预约预约码输入
-Route::get('store/deliveryAppointment/delivery','DeliveryAppointmentController@delivery');
-//入库预约错误页面
-Route::get('store/deliveryAppointment/errMsg','DeliveryAppointmentController@errMsg');
-//入库预约成功页面
-Route::get('store/deliveryAppointment/successMsg','DeliveryAppointmentController@successMsg');
-//入库预约展览数据
-Route::post('store/deliveryAppointment/getExhibitionList','DeliveryAppointmentController@getExhibitionList');
-//入库预约验证密匙
-Route::post('store/deliveryAppointment/getKey','DeliveryAppointmentController@getKey');
-//临时工二维码
-Route::get('personnel/checking-in/goGetQRCode','QRCodeController@goGetQRCode');
-Route::get('personnel/checking-in/QRCode','QRCodeController@QRCode');
-Route::get('personnel/checking-in/importAndExportQRCode','QRCodeController@importAndExportQRCode');
-Route::post('personnel/checking-in/refreshQRCode','QRCodeController@refreshQRCode');
-//监视器
-Route::get('station/index/{station}','StationController@monitorShow');