ajun 4 лет назад
Родитель
Сommit
6a57ab4bcf
2 измененных файлов с 51 добавлено и 31 удалено
  1. 10 6
      routes/apiLocal.php
  2. 41 25
      routes/web.php

+ 10 - 6
routes/apiLocal.php

@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -129,11 +128,11 @@ Route::group(['prefix'=>'maintenance'],function (){
     });
     Route::group(['prefix'=>'expressPrinting'],function (){
         Route::group(['prefix'=>'part'],function(){
-            Route::post('create','PrintPartController@storeApi');
-            Route::post('destroy','PrintPartController@destroyApi');
-            Route::post('printTemplate','PrintPartController@printTemplateApi');
-            Route::get('imagePart','PrintPartController@getImagesPartApi');
-            Route::post('pushImage','PrintPartController@pushImagesPartApi');
+//            Route::post('create','PrintPartController@storeApi');
+//            Route::post('destroy','PrintPartController@destroyApi');
+//            Route::post('printTemplate','PrintPartController@printTemplateApi');
+//            Route::get('imagePart','PrintPartController@getImagesPartApi');
+//            Route::post('pushImage','PrintPartController@pushImagesPartApi');
             Route::group(['prefix'=>'image'],function(){
                 Route::post('saveFile','PrintPartImageController@saveFileApi');
                 Route::post('update','PrintPartImageController@updateFileApi');
@@ -164,6 +163,11 @@ Route::group(['prefix'=>'maintenance'],function (){
     });
 });
 
+/** 快递打印次数记录*/
+Route::group(['prefix'=>'printRecord'],function(){
+    Route::post("/updateRecord/{logistic_number}","OrderPackageExpressBillPrintRecordsController@updateRecordApi");
+});
+
 /** 控制台 */
 Route::group(['prefix'=>'control'],function () {
     Route::post('panel/menu/orderCountingRecordApi','ControlPanelController@orderCountingRecordsApi') ;

+ 41 - 25
routes/web.php

@@ -294,13 +294,27 @@ Route::group(['middleware'=>'auth'],function ($route){
         /** 服务商 */
         Route::resource('facilitator','FacilitatorController');
         /** 快递打印 */
+        Route::get('/print/index','PrintController@index');
         Route::group(['prefix'=>'expressPrinting'],function(){
-            Route::get('/part','PrintPartController@index');
-            Route::get('/part/create','PrintPartController@create');
+            Route::get("index",'PrintController@index');
+            Route::group(['prefix' => 'part'],function(){
+                Route::get('/index','PrintPartController@index');
+                Route::get('/create','PrintPartController@create');
+            });
+            Route::prefix('image')->group(function(){
+                Route::get('index','PrintPartImageController@index');
+
+            });
             Route::group(['prefix'=>'template'],function(){
                 Route::get('/index','PrintTemplateController@index');
                 Route::get('/create','PrintTemplateController@create');
+                Route::get('/edit/{id}','PrintTemplateController@edit');
             });
+            Route::group(['prefix' => 'setting'] ,function (){
+                Route::get('/terminal/index','TerminalController@index');
+                Route::get('/printer/index','TerminalPrinterController@index');
+            });
+            Route::get('/printing/index','PrintController@index');
         });
         Route::get('syncRedisLogs','LogController@syncRedisLogs');
         Route::get('region', 'RegionController@index');
@@ -408,30 +422,32 @@ Route::group(['middleware'=>'auth'],function ($route){
             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::any('export', 'RejectedController@export');
-        Route::any('exportAnalyze', 'RejectedController@exportAnalyze');
-        Route::post('ajaxGetRejected', 'RejectedController@ajaxGetRejected');
-        Route::post('changeRejectedBillRemark', 'RejectedController@changeRejectedBillRemark');
-        Route::get('importRejectedNumber','RejectedBillController@importRejectedNumber');
+    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::any('export', 'RejectedController@export');
+    Route::any('exportAnalyze', 'RejectedController@exportAnalyze');
+    Route::post('ajaxGetRejected', 'RejectedController@ajaxGetRejected');
+    Route::post('changeRejectedBillRemark', 'RejectedController@changeRejectedBillRemark');
+    Route::get('importRejectedNumber','RejectedBillController@importRejectedNumber');
+});
+Route::resource('rejected', 'RejectedController');
+
+
+/** 包裹 */
+Route::group(['prefix'=>'package'],function(){
+    /** 统计 */
+    Route::group(['prefix'=>'statistics'],function(){
+        Route::any('export','WeighController@statisticsExport');
+    });
+    /** 异常 */
+    Route::group(['prefix'=>'weightExcepted'],function(){
+        Route::get('indexCreate','WeighExceptedController@indexCreate');
+        Route::get('indexIssued','WeighExceptedController@indexIssued');
+        Route::any('export/{type}','WeighExceptedController@export');
     });
-    $route->resource('rejected', 'RejectedController');
-    /** 包裹 */
-    $route->group(['prefix'=>'package'],function(){
-        /** 统计 */
-        Route::group(['prefix'=>'statistics'],function(){
-            Route::any('export','WeighController@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','WeighController@export');
         Route::get('statistics','WeighController@statistics');