Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas into zzd

 Conflicts:

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

app/Http/Controllers/MeasureMonitorController.php

@@ -23,7 +23,9 @@ class MeasureMonitorController extends Controller
     public function data(Request $request){
         $measuring_machine_id=$request->input('id');
         if ($measuring_machine_id){
-            $package=OrderPackage::with('order','paperBox','measuringMachine')->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
+            $package=OrderPackage::with(['order'=>function($query){
+                $query->with('owner','logistic');
+            },'paperBox','measuringMachine'])->where('measuring_machine_id',$measuring_machine_id)->orderBy('id','DESC')->first();
             if (!$package){
                 $measuringMachine=MeasuringMachine::query()->where('id',$measuring_machine_id)->first();
                 $package=new OrderPackage();

app/Http/Controllers/OrderController.php

@@ -238,7 +238,7 @@ class OrderController extends Controller
                       DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,
                       DOC_ORDER_HEADER.OrderTime,DOC_Order_Details.CustomerID,DOC_Order_Details.SKU,DOC_Order_Details.QtyOrdered,
                       DOC_Order_Details.LineStatus,DOC_Order_Details.OrderLineNo,order_code.codename_c,order_detail_code.codename_c,BAS_Customer.descr_c,
-                      BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C";
+                      BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C ORDER BY DOC_ORDER_HEADER.ADDTIME desc";
         //转导出
         if ($checkData || $export){
             $post = Http::post(config('go.export.url'),['type'=>'order','sql'=>$sql]);

app/Http/Controllers/PackageController.php

@@ -36,6 +36,7 @@ class PackageController extends Controller
     {
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $paginateParams = $request->input();
+        /** @var PackageService */
         $packages = app('packageService')->paginate($request);
         return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }

app/Http/Controllers/ProcessController.php

@@ -1019,20 +1019,22 @@ class ProcessController extends Controller
                     $this->log(__METHOD__,"二次加工单录入导入商品数据时添加货主".__FUNCTION__,json_encode($owner),Auth::user()['id']);
                 }
             }
-            $commodity = Commodity::query()->with('barcodes')->whereNull('owner_id')
+            $goods = Commodity::query()->with('barcodes')->whereNull('owner_id')
                 ->where('sku',$commodityData['sku'])->first();
-            if (!$commodity){
-                $commodity = Commodity::query()->create($commodityData);
+            if (!$goods){
+                $goods = Commodity::query()->create($commodityData);
+                if (!$barcode)$this->log(__METHOD__,"二次加工导入时产品条码为空",
+                    json_encode($commodity,JSON_UNESCAPED_UNICODE),Auth::user()['id']);
                 $commodityBarCode=CommodityBarcode::query()->create([
                     'code' => $barcode,
-                    'commodity_id' => $commodity->id
+                    'commodity_id' => $goods->id
                 ]);
                 $commodity_barcodes = [$commodityBarCode];
-            }else $commodity_barcodes = $commodity->barcodes;
+            }else $commodity_barcodes = $goods->barcodes;
             $this->log(__METHOD__,"二次加工单录入导入商品数据时添加商品及条码".__FUNCTION__,
-                json_encode($commodity)." || ".json_encode($commodity_barcodes),Auth::user()['id']);
-            $processContent=['bill_type'=>'入库单','commodity_id'=>$commodity->id,'wms_code'=>$wmsCode,'amount'=>$amount,
-                'commodity_name'=>$commodity->name,'commodity_barcodes'=>$commodity_barcodes,'commodity_sku'=>$commodity->sku,
+                json_encode($goods)." || ".json_encode($commodity_barcodes),Auth::user()['id']);
+            $processContent=['bill_type'=>'入库单','commodity_id'=>$goods->id,'wms_code'=>$wmsCode,'amount'=>$amount,
+                'commodity_name'=>$goods->name,'commodity_barcodes'=>$commodity_barcodes,'commodity_sku'=>$goods->sku,
                 'lineNo'=>1,'owner_id'=>$owner->id,'owner_name'=>$owner->name,'addBtnShow'=>false,'type'=>$request->type];
             array_push($processContents,$processContent);
         }

app/Services/OrderService.php

@@ -142,6 +142,7 @@ class OrderService
         $shop = null;
         $shop_name = $orderHeader->issuepartyname;
         if ($shop_name && $owner) {
+            /** @var ShopService */
             $shop = app('shopService')->firstOrCreate(['name' => $shop_name, 'owner_id' => $owner->id]);
         }
 

app/Services/PackageService.php

@@ -13,7 +13,7 @@ Class PackageService
     private function conditionQuery($params){
         $packages = OrderPackage::query()->with(['order'=>function($query){
             $query->with('owner','logistic');
-        }])->orderBy(TABLE.'id','DESC');
+        },'paperBox','measuringMachine'])->orderBy(TABLE.'id','DESC');
         $columnQueryRules=[
             'logistic_number' => ['like' => ''],
             'batch_number' => ['like' => ''],

resources/views/weight/measureMonitor/index.blade.php

@@ -119,16 +119,16 @@
                     }else{
                         _this.currentAudioIndex=_this.currentAudioIndex+1;
                     }
-                    if (package && package.measuringMachine && package.measuringMachine.name ===_this.package.measuringMachine){
+                    if (package && package.measuring_machine && package.measuring_machine.name ===_this.package.measuringMachine){
                         if (package.id ===_this.package.id){
-                            _this.package.measuringMachine_status=package.measuringMachine.status;
-                            _this.measuringMachinesIndex[package.package.measuringMachine.name].status=package.measuringMachine_status;
+                            _this.package.measuringMachine_status=package.measuring_machine.status;
+                            _this.measuringMachinesIndex[package.measuring_machine.name].status=package.measuring_machine.status;
                             tempTip.setDuration(4000);
                             tempTip.showSuccess('暂无新数据');
                             return;
                         }
                         _this.updateData(_this,package);
-                        let logistic_name = package.logistic ? package.logistic.name : '';
+                        let logistic_name = package.order ? (package.order.logistic ? package.order.logistic.name : '') : '';
                         if (_this.logisticAudioURL[logistic_name]){
                             audio.src=_this.logisticAudioURL[logistic_name];
                             audio.play();
@@ -153,11 +153,6 @@
                         tempTip.showSuccess('刷新成功!');
                     }
                 });
-                /*                if(this.timer){
-                                    clearInterval(this.timer);
-                                }else {
-                                    this.timer=setInterval(()=>{this.flushData();},18000);
-                                }*/
             },
             methods:{
                 clickMeasuringMachine(e){
@@ -167,7 +162,7 @@
                             if (response.data.id){
                                 let orderPackage=response.data;
                                 _this.updateData(_this,orderPackage);
-                                _this.package.measuringMachine=orderPackage.measuringMachine ? orderPackage.measuringMachine.name : '';                            }else {
+                                _this.package.measuringMachine=orderPackage.measuring_machine ? orderPackage.measuring_machine.name : '';                            }else {
                                 tempTip.setDuration(4000);
                                 tempTip.showSuccess('暂无数据!');
                             }
@@ -182,14 +177,14 @@
                     _this.package.logistic_number=package.logistic_number;
                     _this.package.orderno = package.order ?  package.order.code : '';
                     _this.package.weight=package.weight;
-                    _this.package.owner=package.owner ? package.owner.name : '';
-                    _this.package.paperBox=package.paperBox ? package.paperBox.name : '';
+                    _this.package.owner=package.order ? (package.order.owner ? package.order.owner.name : '') : '';
+                    _this.package.paperBox=package.paper_box ? package.paper_box.name : '';
                     _this.package.recipient=package.order ? package.order.recipient : '';
                     _this.package.status=package.status;
                     _this.package.weighed_at=package.weighed_at;_this.package.bulk=package.bulk;
-                    _this.package.logistic_name=package.logistic ? package.logistic.name : '';
-                    _this.package.measuringMachine_status=package.measuringMachine ? package.measuringMachine.status : '';
-                    _this.measuringMachinesIndex[package.measuringMachine ? package.measuringMachine.name : ''].status=package.measuringMachine_status;
+                    _this.package.logistic_name=package.order ? (package.order.logistic ? package.order.logistic.name : '') : '';
+                    _this.package.measuringMachine_status=package.measuring_machine ? package.measuring_machine.status : '';
+                    _this.measuringMachinesIndex[package.measuring_machine ? package.measuring_machine.name : ''].status=package.measuring_machine ? package.measuring_machine.status : '离线';
                 }
             },
         });

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

@@ -75,9 +75,9 @@
                         ,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->measuring_machine ? $package->measuring_machine->name : ''}}',
+                        ,measuringMachineName:'{{$package->measuringMachine ? $package->measuringMachine->name : ''}}',
                         weight:'{{$package->weight}}', length:'{{$package->length}}',width:'{{$package->width}}',height:'{{$package->height}}',
-                        bulk:'{{$package->bulk}}',paperBoxName:'{{$package->paper_box ? $package->paper_box->name : ''}}',
+                        bulk:'{{$package->bulk}}',paperBoxName:'{{$package->paperBox ? $package->paperBox->name : ''}}',
                         status:'{{$package->status}}',created_at:'{{$package->created_at}}',weighed_at:'{{$package->weighed_at}}',
                         paperBox : {!! $package->paperBox??'""' !!} },
                     @endforeach

routes/web.php

@@ -23,45 +23,59 @@ Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 Route::get('/homeTemp', 'HomeController@home');
 
+/** 密码 */
 Route::group(['prefix'=>'password'],function(){
     Route::get('change', 'Auth\PasswordController@change');
     Route::post('update', 'Auth\PasswordController@update');
 });
 
 /** 基础设置 */
-Route::get('maintenance/', function () {return view('maintenance.index');});
 Route::group(['prefix'=>'maintenance'],function(){
+    /** 商品 */
     Route::group(['prefix'=>'commodity'],function(){
+        /** 导出 */
+        Route::group(['prefix'=>'import'],function(){
+            Route::post('excel', 'CommodityController@importExcel');
+        });
+
         Route::get('import', 'CommodityController@import');
-        Route::post('import/excel', 'CommodityController@importExcel');
     });
+    /** 货主 */
+    Route::group(['prefix'=>'owners'],function(){
+        Route::get('recycle','OwnerController@recycle');
+    });
+    /** 教程 */
     Route::group(['prefix'=>'tutorial'],function(){
-        //教程展示
         Route::post('showContent/{id}', 'TutorialController@showContent');
     });
-    //临时工管理
+    /** 临时工 */
     Route::group(['prefix'=>'userLabor'],function(){
-        //获取劳务记录
         Route::post('getWorkRecord', 'UserLaborController@getWorkRecord');
-        //获取打卡记录
         Route::post('getClockRecord', 'UserLaborController@getClockRecord');
-        //解除绑定设备
         Route::post('relieve', 'UserLaborController@relieve');
     });
+    /** 纸箱 */
     Route::group(['prefix'=>'paperBox'],function(){
-        Route::get('index/model', 'PaperBoxController@indexModel');
-        Route::get('index/owner', 'PaperBoxController@indexOwner');
-        Route::post('excel/import','PaperBoxController@import');
-        Route::get('excel/goImport',function (){return view('maintenance.paperBox.import');});
+        /** 首页 */
+        Route::group(['prefix'=>'index'],function(){
+            Route::get('model', 'PaperBoxController@indexModel');
+            Route::get('owner', 'PaperBoxController@indexOwner');
+        });
+        /** excel */
+        Route::group(['prefix'=>'excel'],function(){
+            Route::post('import','PaperBoxController@import');
+            Route::get('goImport',function (){return view('maintenance.paperBox.import');});
+        });
     });
+    /** 计费模型 */
     Route::group(['prefix'=>'waybillPriceModel'],function(){
-        Route::get('excel/goImport',function (){return view('maintenance.waybillPriceModel.import');});
+        /** excel */
+        Route::group(['prefix'=>'excel'],function(){
+            Route::get('goImport',function (){return view('maintenance.waybillPriceModel.import');});
+        });
         Route::get('cities/{province_id}','WaybillPriceModelsController@getCities');
     });
-    Route::resource('waybillPriceModel','WaybillPriceModelsController');
-    Route::resource('tutorial', 'TutorialController');
-    Route::resource('userLabor','UserLaborController');
-    Route::resource('paperBox', 'PaperBoxController');
+
     Route::resource('log', 'LogController');
     Route::resource('user', 'UserController');
     Route::resource('role', 'RoleController');
@@ -80,26 +94,33 @@ Route::group(['prefix'=>'maintenance'],function(){
     Route::resource('laborCompany', 'LaborCompanyController');
     Route::resource('warehouse', 'WarehouseController');
     Route::resource('jobType', 'JobTypeController');
-    //停用货主
-    Route::get('owners/recycle','OwnerController@recycle');
+    Route::resource('tutorial', 'TutorialController');
+    Route::resource('userLabor','UserLaborController');
+    Route::resource('paperBox', 'PaperBoxController');
+    Route::resource('waybillPriceModel','WaybillPriceModelsController');
 });
+Route::get('maintenance', function () {return view('maintenance.index');});
 
 /** 运输 */
 Route::group(['prefix'=>'waybill'],function(){
+    /** 置顶 */
+    Route::group(['prefix'=>'ontop'],function(){
+        Route::any('top','WaybillController@waybillOnTop');
+        Route::any('cancel','WaybillController@cancelOnTop');
+    });
+    /** 判断 */
+    Route::group(['prefix'=>'is'],function(){
+        Route::post('waybillPriceModel','WaybillController@isWaybillPriceModel');
+    });
     Route::post('deleteImg','WaybillController@deleteImg');
     Route::post('upload','WaybillController@upload');
     Route::get('relating',function (){return view('waybill.menuWaybill');});
-    Route::get('recycle', 'WaybillController@recycle');   //回收站
-    Route::any('ontop/top','WaybillController@waybillOnTop');
-    Route::any('ontop/cancel','WaybillController@cancelOnTop');
+    Route::get('recycle', 'WaybillController@recycle');
     Route::post('refreshWaveHouseWeight','WaybillController@refreshWaveHouseWeight');
-    Route::resource('waybillFinancialSnapshot','WaybillFinancialSnapshotsController');
-    Route::resource('waybillFinancialExcepted','WaybillFinancialExceptedController');
     Route::get('index','WaybillController@index');
     Route::get('delivering','WaybillController@delivering');
     Route::any('deliveringExport','WaybillController@deliveringExport');
     Route::post('storeCarrierBill','WaybillController@storeCarrierBill');
-    Route::post('is/waybillPriceModel','WaybillController@isWaybillPriceModel');
     Route::post('addCounty','WaybillController@addCounty');
     Route::any('waybillAudit','WaybillController@waybillAudit');
     Route::any('waybillEdit/{id}','WaybillController@waybillEdit');
@@ -107,316 +128,286 @@ Route::group(['prefix'=>'waybill'],function(){
     Route::any('waybillEndAudit','WaybillController@waybillEndAudit');
     Route::any('export','WaybillController@export');
     Route::any('waybillUpdate/{id}','WaybillController@waybillUpdate');
+
+    Route::resource('waybillFinancialSnapshot','WaybillFinancialSnapshotsController');
+    Route::resource('waybillFinancialExcepted','WaybillFinancialExceptedController');
 });
 Route::resource('waybill','WaybillController');
 
+/** 运输财务 */
+Route::group(['prefix'=>'waybillFinancialSnapshot'],function(){
+    Route::any('export','WaybillFinancialSnapshotsController@export');
+});
 
-Route::any('waybillFinancialSnapshot/export','WaybillFinancialSnapshotsController@export');
-Route::post('waybillPriceModel/excel/import','WaybillPriceModelsController@import');
+/** 运输计费模型 */
+Route::group(['prefix'=>'waybillPriceModel'],function(){
+    /** excel */
+    Route::group(['prefix'=>'excel'],function(){
+        Route::post('import','WaybillPriceModelsController@import');
+    });
+});
 
-Route::post('rejectedBill/{rejectedBill}/edit', 'RejectedBillController@edit');
+/** 退货明细 */
+Route::group(['prefix'=>'rejectedBill'],function(){
+    Route::post('{rejectedBill}/edit', 'RejectedBillController@edit');
+});
 Route::resource('rejectedBill', 'RejectedBillController');
 
 /** 退货 */
 Route::group(['prefix'=>'rejected'],function(){
-    Route::get('import', 'RejectedController@import');
-    Route::post('import/excel', 'RejectedController@importExcel');
+    /** 导出 */
+    Route::group(['prefix'=>'import'],function(){
+        Route::post('excel', 'RejectedController@importExcel');
+    });
+    /** 主页 */
+    Route::group(['prefix'=>'index'],function(){
+        Route::any('general','RejectedController@index');
+        Route::any('analyze','RejectedController@indexAnalyze');
+    });
+    /** 分析 */
+    Route::group(['prefix'=>'analyze'],function(){
+        Route::post('exportExcelOnParams', 'RejectedController@exportExcelOnParams');
+        Route::post('exportAllExcelOnParams', 'RejectedController@exportAllExcelOnParams');
+    });
+
     Route::get('relating', function () {return view('rejected.relating');});
     Route::get('recycle', 'RejectedController@recycle');
     Route::post('ajaxCheck', 'RejectedController@ajaxCheck');
     Route::post('ajaxCheckAll', 'RejectedController@ajaxCheckAll');
     Route::post('ajaxFinishAll', 'RejectedController@ajaxFinishAll');
+    Route::get('import', 'RejectedController@import');
     Route::any('export', 'RejectedController@export');
-    Route::any('index/general','RejectedController@index');  // 一般查询
-    Route::any('index/analyze','RejectedController@indexAnalyze');  // 统计查询
     Route::any('exportAnalyze', 'RejectedController@exportAnalyze');
-    Route::post('analyze/exportExcelOnParams', 'RejectedController@exportExcelOnParams');
-    Route::post('analyze/exportAllExcelOnParams', 'RejectedController@exportAllExcelOnParams');
     Route::post('ajaxGetRejected', 'RejectedController@ajaxGetRejected');
 });
 Route::resource('rejected', 'RejectedController');
 
+
 /** 包裹 */
 Route::group(['prefix'=>'package'],function(){
-    Route::group(['prefix'=>'statistics'],function(){
-        Route::any('export','PackageController@statisticsExport');
-    });
+    /** 设备 */
     Route::group(['prefix'=>'measureMonitor'],function(){
-        Route::post('data','MeasureMonitorController@data');
         Route::any('speech','MeasureMonitorController@speech');
+        Route::post('data','MeasureMonitorController@data');
     });
-    Route::resource('measureMonitor','MeasureMonitorController');
-    Route::any('export','PackageController@export');
-    Route::get('statistics','PackageController@statistics');
-    Route::get('relating', function () {return view('weight.menuWeight');});
+    /** 统计 */
+    Route::group(['prefix'=>'statistics'],function(){
+        Route::any('export','PackageController@statisticsExport');
+    });
+    /** 异常 */
     Route::group(['prefix'=>'weightExcepted'],function(){
         Route::get('indexCreate','WeighExceptedController@indexCreate');
         Route::get('indexIssued','WeighExceptedController@indexIssued');
         Route::any('export/{type}','WeighExceptedController@export');
     });
+
+    Route::any('export','PackageController@export');
+    Route::get('statistics','PackageController@statistics');
+    Route::get('relating', function () {return view('weight.menuWeight');});
+
+    Route::resource('measureMonitor','MeasureMonitorController');
 });
 Route::resource('package','PackageController');
 
 /** 入库 */
-Route::get('store','StoreController@index');
 Route::group(['prefix'=>'store'],function(){
     Route::resource('fast','StoreController');
     Route::resource('storeItem','StoreItemsController');
 });
+Route::get('store','StoreController@index');
 
-/** 人事 */
-Route::group(['prefix'=>'personnel'],function(){
-    //二维码
-    Route::group(['prefix'=>'checking-in'],function(){
-        //进入打卡
-        Route::get('goGetQRCode','QRCodeController@goGetQRCode');
-        //进入组二维码显示页面
-        Route::get('QRCode','QRCodeController@QRCode');
-        //进入进出场二维码显示页面
-        Route::get('importAndExportQRCode','QRCodeController@importAndExportQRCode');
-        //获取刷新二维码
-        Route::post('refreshQRCode','QRCodeController@refreshQRCode');
-        //去往录入补卡
-        Route::get('createReplenishClock','PersonnelController@createReplenishClock');
-        //搜索临时工下打卡信息
-        Route::post('checkUserLabors','PersonnelController@checkUserLabors');
-        //录入补卡
-        Route::post('storeReplenishClock','PersonnelController@storeReplenishClock');
-        //去往打卡审核
-        Route::get('clockAudit','PersonnelController@clockAudit');
-        //去往任务审核
-        Route::get('missionAudit','PersonnelController@missionAudit');
-        //打卡审核
-        Route::post('storeClockAudit','PersonnelController@storeClockAudit');
-        //打卡审核类型
-        Route::post('updateDutyCheckType','PersonnelController@updateDutyCheckType');
-        //打卡组长审核
-        Route::post('storeGroupAudit','PersonnelController@storeGroupAudit');
-        //打卡审核登出类型判断异常
-        Route::post('isException','PersonnelController@isException');
-        //任务审核
-        Route::post('storeMissionAudit','PersonnelController@storeMissionAudit');
-    });
-    //用户打卡
-    Route::group(['prefix'=>'userDutyCheck'],function(){
-        //进出场打卡接口
-        Route::get('importAndExportClock','UserDutyCheckController@importAndExportClock');
-        //进入打卡接口
-        Route::get('clock','UserDutyCheckController@clock');
-        //进出场提交打卡
-        Route::post('storeClock','UserDutyCheckController@storeClock');
-        Route::post('绑定临时工并进组','UserDutyCheckController@绑定临时工并进组');
-        //进出场提交打卡
-        Route::post('importGroupClock','UserDutyCheckController@importGroupClock');
-        //去往登记资料页面
-        Route::get('createUserDetail/{mobile_phone}','UserDutyCheckController@createUserDetail');
-        //去往修改资料页面
-        Route::get('updateUserLaborCompanies/{mobile_phone}','UserDutyCheckController@updateUserLaborCompanies');
-        //提交登记资料
-        Route::post('storeUserDetail','UserDutyCheckController@storeUserDetail');
-        //提交修改劳务所
-        Route::post('storeUpdateUserLaborCompanies','UserDutyCheckController@storeUpdateUserLaborCompanies');
-    });
-    //相关设置
-    Route::get('relating',function (){return view('personnel/menuPersonnel');});
-    //临时工报表界面
-    Route::resource('laborReport','LaborReportController');
-});
-
-
-
-/**
- *  二次加工
- */
+/** 二次加工 */
 Route::group(['prefix'=>'process'],function(){
-    //相关设置
-    Route::get('relating',function (){return view('process.menuProcess');});
-    //统计
-    Route::group(['prefix'=>'statistic'],function (){
-        //首页
-        Route::get("",'ProcessStatisticController@index');
-        //导出
+    /** 统计 */
+    Route::group(['prefix'=>'statistic'],function(){
         Route::any("export",'ProcessStatisticController@export');
     });
-    //获取每日参与人
+
+    Route::get('relating',function (){return view('process.menuProcess');});
+    Route::get("statistic",'ProcessStatisticController@index');
     Route::post('getDailyParticipant','ProcessController@getDailyParticipant');
-    //驳回
     Route::post('reject/{id}','ProcessController@reject');
-    //接单
     Route::post('receive/{id}','ProcessController@receive');
-    //完成
     Route::post('accomplish','ProcessController@accomplish');
-    //修改每日产量
     Route::post('updateDailyOutput','ProcessController@updateDailyOutput');
-    //添加参与人
     Route::post('storeProcessDailyParticipant','ProcessController@storeProcessDailyParticipant');
-    //验证参与人
     Route::post('verifyUserName','ProcessController@verifyUserName');
-    //修改参与人
     Route::post('updateProcessDailyParticipant','ProcessController@updateProcessDailyParticipant');
-    //参与人审核
     Route::post('processDailyParticipantAudit/{id}','ProcessController@processDailyParticipantAudit');
-    //临时工详情
-    //Route::post('showUserDetail','ProcessController@showUserDetail');
-    //获取全部教程
     Route::post('getTutorials/{id}','ProcessController@getTutorials');
-    //添加教程关联
     Route::post('selectedTutorial','ProcessController@selectedTutorial');
-    //删除教程关联
     Route::post('deleteTutorial','ProcessController@deleteTutorial');
-    //根据货主获取教程
     Route::post('ownerGetTutorials/{owner_id}','ProcessController@ownerGetTutorials');
-    //删除二次加工内容单
-    Route::post('deleteProcessContent/{id}','ProcessController@deleteProcessContent');
-    //回滚状态
     Route::post('rollback','ProcessController@rollback');
-    //回收站
     Route::get('recycle','ProcessController@recycle');
-    //恢复
     Route::post('recover','ProcessController@recover');
-    //审核
     Route::post('audit','ProcessController@audit');
-    //加工完成
     Route::post('processAccomplish','ProcessController@processAccomplish');
-    //验收
     Route::post('checkAndAccept','ProcessController@checkAndAccept');
-    //修改价格
     Route::post('updateUnitPrice','ProcessController@updateUnitPrice');
-    //二次加工组审核
     Route::post('workGroupVerify','ProcessController@workGroupVerify');
-    //财务审核
     Route::post('accountantVerify','ProcessController@accountantVerify');
-    //修改起始日期
     Route::post('updateStartDate','ProcessController@updateStartDate');
-    //修改终止日期
     Route::post('updateEndDate','ProcessController@updateEndDate');
-    //删除临时工工作记录
     Route::delete('destroyDailyParticipant/{id}','ProcessController@destroyDailyParticipant');
-    //导入粘贴商品数据
     Route::post('importPasteData','ProcessController@importPasteData');
-    //导出
     Route::any('export','ProcessController@export');
+    Route::post('deleteProcessContent/{id}','ProcessController@deleteProcessContent');
 });
 Route::resource('process','ProcessController');
 
-/** 人事报表 */
+
+/** 人事 */
+Route::group(['prefix'=>'personnel'],function(){
+    /** 打卡 */
+    Route::group(['prefix'=>'checking-in'],function(){
+        /** 打卡记录 */
+        Route::group(['prefix'=>'userDutyCheck'],function(){
+            Route::get('importAndExportClock','UserDutyCheckController@importAndExportClock');
+            Route::get('clock','UserDutyCheckController@clock');
+            Route::post('storeClock','UserDutyCheckController@storeClock');
+            Route::post('绑定临时工并进组','UserDutyCheckController@绑定临时工并进组');
+            Route::post('importGroupClock','UserDutyCheckController@importGroupClock');
+            Route::get('createUserDetail/{mobile_phone}','UserDutyCheckController@createUserDetail');
+            Route::get('updateUserLaborCompanies/{mobile_phone}','UserDutyCheckController@updateUserLaborCompanies');
+            Route::post('storeUserDetail','UserDutyCheckController@storeUserDetail');
+            Route::post('storeUpdateUserLaborCompanies','UserDutyCheckController@storeUpdateUserLaborCompanies');
+        });
+
+        Route::get('goGetQRCode','QRCodeController@goGetQRCode');
+        Route::get('QRCode','QRCodeController@QRCode');
+        Route::get('importAndExportQRCode','QRCodeController@importAndExportQRCode');
+        Route::post('refreshQRCode','QRCodeController@refreshQRCode');
+        Route::get('createReplenishClock','PersonnelController@createReplenishClock');
+        Route::post('checkUserLabors','PersonnelController@checkUserLabors');
+        Route::post('storeReplenishClock','PersonnelController@storeReplenishClock');
+        Route::get('clockAudit','PersonnelController@clockAudit');
+        Route::get('missionAudit','PersonnelController@missionAudit');
+        Route::post('storeClockAudit','PersonnelController@storeClockAudit');
+        Route::post('updateDutyCheckType','PersonnelController@updateDutyCheckType');
+        Route::post('storeGroupAudit','PersonnelController@storeGroupAudit');
+        Route::post('isException','PersonnelController@isException');
+        Route::post('storeMissionAudit','PersonnelController@storeMissionAudit');
+    });
+
+    Route::get('relating',function (){return view('personnel/menuPersonnel');});
+
+    Route::resource('laborReport','LaborReportController');
+});
+
 Route::get('getLaborReport','LaborReportController@getDailyLabor');
+
+/** 临时工报表 */
 Route::group(['prefix'=>'laborReport'],function(){
-    //门卫打卡审核
     Route::post('guardClockAudit','LaborReportController@guardClockAudit');
-    //组长打卡审核
     Route::post('groupClockAudit','LaborReportController@groupClockAudit');
-    //组长打卡审核(特定组添加备注)
     Route::post('addRemarkAndGroupClock','LaborReportController@addRemarkAndGroupClock');
-    //组长点击退场
     Route::post('groupExport','LaborReportController@groupExport');
-    //组长点击退场，是否包含晚饭时间情况
     Route::post('groupExportEnsure','LaborReportController@groupExportEnsure');
-    //导出
     Route::any('export','LaborReportController@export');
 });
 
-/**
- * 库存
- */
-Route::group(['prefix'=>'inventory'],function (){
-    //动库报表
-    Route::get('statement/changeInventory','InventoryController@changeInventory');
-    Route::any('statement/changeInventory/export','InventoryController@exportData');
-    Route::get('statement/changeInventory/downLoadExcel','InventoryController@downLoadExcel');
-    Route::post('statement/changeInventory/deleteExcel','InventoryController@deleteExcel');
-    //全部库存
-    Route::get('statement/allInventory','InventoryController@allInventory');
-    Route::any('statement/allInventory/export','InventoryController@exportAllInventory');
-
-    //同步货主
+/** 库存 */
+Route::group(['prefix'=>'inventory'],function(){
+    /** 说明 */
+    Route::group(['prefix'=>'statement'],function(){
+        /** 动库报表 */
+        Route::group(['prefix'=>'changeInventory'],function(){
+            Route::any('export','InventoryController@exportData');
+            Route::get('downLoadExcel','InventoryController@downLoadExcel');
+            Route::post('deleteExcel','InventoryController@deleteExcel');
+        });
+        Route::get('changeInventory','InventoryController@changeInventory');
+        /** 全部库存 */
+        Route::group(['prefix'=>'allInventory'],function(){
+            Route::any('export','InventoryController@exportAllInventory');
+        });
+        Route::get('allInventory','InventoryController@allInventory');
+        /** 每日记录 */
+        Route::group(['prefix'=>'dailyLog'],function(){
+            Route::any('export','InventoryController@exportDailyLog');
+            Route::post('getLoggingOwner','InventoryController@getLoggingOwner');
+            Route::post('addLoggingOwner','InventoryController@addLoggingOwner');
+        });
+        Route::get('dailyLog','InventoryController@dailyLog');
+
+        Route::get('inventoryCompare','InventoryCompareController@inventoryCompare');
+    });
+    /** 库存盘点 */
+    Route::group(['prefix'=>'stockInventory'],function(){
+        Route::get('mission','InventoryAccountController@mission');
+        Route::post('createStockInventoryMission','InventoryAccountController@createStockInventoryMission');
+        Route::any('enterStockInventory/{id}','InventoryAccountController@enterStockInventory');
+    });
+    /** 库存比对 */
+    Route::group(['prefix'=>'inventoryCompare'],function(){
+        /** excel */
+        Route::group(['prefix'=>'import'],function(){
+            Route::post('excel','InventoryCompareController@importExcel');
+        });
+    });
+
     Route::get('syncOwners','InventoryAccountController@syncOwners');
     Route::any('删除盘点记录','InventoryAccountController@删除盘点记录');
-    Route::get('盘点任务完结/{id}','InventoryAccountController@盘点任务完结');
+    Route::get('完结盘点任务/{id}','InventoryAccountController@完结盘点任务');
     Route::post('修改质量状态','InventoryAccountController@修改质量状态');
     Route::post('增加系统之外的库位记录','InventoryAccountController@增加系统之外的库位记录');
-    //库存盘点
-    Route::get('stockInventory/mission','InventoryAccountController@mission');
-    //创建盘点任务
-    Route::post('stockInventory/createStockInventoryMission','InventoryAccountController@createStockInventoryMission');
-    //结束初盘任务
+    Route::post('盘点选中任务','InventoryAccountController@盘点选中任务');
     Route::post('stockInventoryEnd','InventoryAccountController@stockInventoryEnd');
-    //删除盘点任务
     Route::any('deleteStockInventoryMission/{id}','InventoryAccountController@deleteStockInventoryMission');
-    //进入盘点或者复盘页面
-    Route::any('stockInventory/enterStockInventory/{id}','InventoryAccountController@enterStockInventory');
-    //盘点任务导出
     Route::any('stockInventoryExport','InventoryAccountController@stockInventoryExport');
     Route::any('stockInventory','InventoryAccountController@stockInventory');
-
-    //库存体积
-    Route::get('statement/dailyLog','InventoryController@dailyLog');
-    //库存体积导出
-    Route::any('statement/dailyLog/export','InventoryController@exportDailyLog');
-    //获取记录监听货主
-    Route::post('statement/dailyLog/getLoggingOwner','InventoryController@getLoggingOwner');
-    //添加记录监听货主
-    Route::post('statement/dailyLog/addLoggingOwner','InventoryController@addLoggingOwner');
-    //复盘查询盘点记录
     Route::post('searchStockInventoryRecord','InventoryAccountController@searchStockInventoryRecord');
-
-    //库存对比
-    Route::get('statement/inventoryCompare','InventoryCompareController@inventoryCompare');
-    //库存对比批量导入
-    Route::post('inventoryCompare/import/excel','InventoryCompareController@importExcel');
-
-    Route::post('statement/dailyLog/addLoggingOwner','InventoryController@addLoggingOwner');
 });
 
-/**
- * 出库
- */
+/** 订单 */
 Route::group(['prefix'=>'order'],function(){
-    //波次
+    /** 主页 */
+    Route::group(['prefix'=>'index'],function(){
+        Route::any('delivering','OrderController@delivering');
+    });
+    /** 创建 */
+    Route::group(['prefix'=>'create'],function(){
+        Route::post('batchComments','OrderController@batchComments');
+    });
+    /** 波次 */
     Route::group(['prefix'=>'wave'],function(){
-        // index
         Route::get('index','WaveController@index');
-        // cancel printing by id or ids
         Route::post('cancelPrinting','WaveController@cancelPrinting');
-        // export Excel
         Route::any('exportExcel','WaveController@exportExcelOnParams');
     });
-    //问题件
+    /** 问题件 */
     Route::group(['prefix'=>'issue'],function(){
-        Route::get('index','OrderIssueController@index');// 查询
-        Route::get('create','OrderIssueController@create'); // 录入
-        Route::post('store','OrderIssueController@store'); // 录入
-        Route::post('batchImport','OrderIssueController@batchImport'); // 批量导入
-        Route::get('excelImport','OrderIssueController@excelImport'); // 前往
-        Route::get('edit/{id}','OrderIssueController@edit');// 编辑
-        Route::match(['get','post'],'export','OrderIssueController@exportOrderIssue');// 导出
-        Route::get('workLoad/index','OrderIssuePerformanceController@workLoadPage');
-        Route::any('workLoad/export','OrderIssuePerformanceController@exportWorkLoad');
-        Route::get('orderIssuePerformance/index','OrderIssuePerformanceController@index');
-        Route::any('orderIssuePerformance/export','OrderIssuePerformanceController@export');
+        /** 工作量 */
+        Route::group(['prefix'=>'workLoad'],function(){
+            Route::get('index','OrderIssuePerformanceController@workLoadPage');
+            Route::any('export','OrderIssuePerformanceController@exportWorkLoad');
+        });
+        /** 绩效 */
+        Route::group(['prefix'=>'orderIssuePerformance'],function(){
+            Route::get('index','OrderIssuePerformanceController@index');
+            Route::any('export','OrderIssuePerformanceController@export');
+        });
+
+        Route::get('index','OrderIssueController@index');
+        Route::get('create','OrderIssueController@create');
+        Route::post('store','OrderIssueController@store');
+        Route::post('batchImport','OrderIssueController@batchImport');
+        Route::get('excelImport','OrderIssueController@excelImport');
+        Route::get('edit/{id}','OrderIssueController@edit');
+        Route::match(['get','post'],'export','OrderIssueController@exportOrderIssue');
     });
-    /**
-     * tracking
-     */
+    /** 跟踪 */
     Route::group(['prefix'=>'tracking'],function(){
         Route::get('index',"OrderTrackingController@index");
         Route::get('export',"OrderTrackingController@export");
         Route::get('update','OrderTrackingController@updateApi');
     });
-    //发运
-    Route::any('index/delivering','OrderController@delivering');
-    //批量备注
-    Route::post('create/batchComments','OrderController@batchComments');
-    //冻结订单
+
     Route::post('freeze','OrderController@freeze');
-    //批量冻结订单
     Route::post('freezeAll','OrderController@freezeAll');
-    //解冻订单
     Route::post('thaw','OrderController@thaw');
-    //取消分配
     Route::post('deAllocation','OrderController@deAllocation');
-    //批量取消分配
     Route::post('deAllocationAll','OrderController@deAllocationAll');
-    //重置快递获取标记
     Route::post('resetLogisticsGetMark','OrderController@resetLogisticsGetMark');
-});
+});

tests/Routes/WebTest.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Routes;
+
+use App\User;
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class WebTest extends TestCase
+{
+    const PARAM = 1;
+    const GET = [
+        "/home",
+        "/homeTemp",
+        "password/change",
+        "password/update",
+    ];
+    const POST = [
+
+    ];
+    const PUT = [
+
+    ];
+    const DELETE = [
+
+    ];
+    const RESTFUL = [
+
+    ];
+    public function testGet(){
+        $superAdmin = config('users.superAdmin');
+        $user = User::query()->where('name',$superAdmin[0])->first();
+        if (!$user){
+            $user = User::query()->create([
+                'name' => $superAdmin[0],
+                'email' => "test@example.com",
+                'password' => "$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi",
+                'remember_token' => Str::random(10),
+            ]);
+        }
+        $urls = array_merge(self::GET,self::RESTFUL);
+        /** @var User $user */
+        foreach ($urls as $url){
+            $response = $this->actingAs($user)->get($url);
+            $this->assertNotEquals($response->getStatusCode(),404);
+        }
+    }
+
+    public function testPost(){
+
+    }
+}