Merge branch 'master' into wangyang

app/Http/Controllers/TestController.php

@@ -130,15 +130,7 @@ sql;
 
     public function test()
     {
-        \Illuminate\Support\Facades\Log::emergency("emergency");
-        \Illuminate\Support\Facades\Log::critical("critical");
-        \Illuminate\Support\Facades\Log::alert("alert");
-        \Illuminate\Support\Facades\Log::error("error");
-        \Illuminate\Support\Facades\Log::warning("warning");
-        \Illuminate\Support\Facades\Log::notice("notice");
-        \Illuminate\Support\Facades\Log::info("info");
-        \Illuminate\Support\Facades\Log::debug("debug");
-        $a = 0/0;
+        dd();
         /*$batchService = new BatchService();
         $batches = Batch::query()->where("id",171829)->get();
         $batchService->assignTasks($batches);

app/Http/Controllers/WaybillController.php

@@ -1092,7 +1092,8 @@ SQL;
     //按日输入专线费
     public function dailyBilling(Request $request): array
     {
-        if(!Gate::allows('运输管理-运单-按日计算专线费')){return ['success'=>false,'message'=>'没有权限'];}
+        if(!Gate::allows('运输管理-运单-按日计算专线费')
+        && !Gate::allows('运输管理-承运商调度')){return ['success'=>false,'message'=>'没有权限'];}
         $dailyBilling=$request->input('param');
         $waybills=app('waybillService')->dailyBilling($dailyBilling);
         if ($waybills=='无数据')return ['success'=>false,'message'=>'当前选定发货日期没有任何记录'];
@@ -1391,12 +1392,12 @@ SQL;
 
     public function appendSubjoinFee()
     {
-        $this->gate("运输管理-编辑");
+        $this->gate("运输管理-承运商调度");
         $id = \request("id");
         $subjoinFee = \request("subjoinFee");
         if (!$id || !$subjoinFee)$this->error("非法参数");
         if (Waybill::query()->where("id",$id)->update(["subjoin_fee"=>$subjoinFee]) == 0)$this->error("修改失败，运单信息发送变更");
-        LogService::log("运输附加费","调度商添加","录入人:".Auth::id()." | 修改费用{$id}为：".$subjoinFee);
+        LogService::log("运输附加费","调度商添加","录入人:".Auth::id()." | 修改{$id}费用为：".$subjoinFee);
         $this->success();
     }
 }

app/Http/Controllers/api/thirdPart/goodscan/PackageController.php

@@ -13,7 +13,7 @@ class PackageController
 {
     public function new_(Request $request)
     {
-        WeightLog::query()->create(['content' => $request->all(),'interface' => 'GoodScan']);
+        WeightLog::query()->create(['content' => json_encode($request->all()),'interface' => 'GoodScan']);
 
         app('LogService')->log(__METHOD__, 'GoodScan weightApi add' . __FUNCTION__, json_encode($request->getContent()));
         $requestInput = [];

app/Http/Controllers/api/thirdPart/hengli/PackageController.php

@@ -13,7 +13,7 @@ class PackageController extends WeightBaseController
 {
     public function new_(Request $request)
     {
-        WeightLog::query()->create(['content' => $request->all(),'interface' => 'HengLi']);
+        WeightLog::query()->create(['content' => json_encode($request->all()),'interface' => 'HengLi']);
         $errors = $this->validator($request);
         if(count($errors)>0){
             return json_encode(['success' => false,'message' => $errors],JSON_UNESCAPED_UNICODE);

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -14,7 +14,7 @@ class PackageController extends Controller
 {
     public function new_(Request $requestInitial)
     {
-        WeightLog::query()->create(['content' => $requestInitial->all(),'interface' => 'HaoChuang']);
+        WeightLog::query()->create(['content' => json_encode($requestInitial->all()),'interface' => 'HaoChuang']);
         $request = [];
         foreach ($requestInitial->all() as $k => $v) {
             $request[strtolower($k)] = $v;

app/Jobs/CacheShelfTaskJob.php

@@ -16,6 +16,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class CacheShelfTaskJob implements ShouldQueue
 {
@@ -48,11 +49,12 @@ class CacheShelfTaskJob implements ShouldQueue
             case "CACHE_SHELF_AVAILABLE"://缓存架释放呼叫
                 //等待一定时间来合并同类请求至此
                 $available = Cache::get($this->key,0);
-                LogService::log("海柔任务","队列事务分发","当前数量：".$this->count.",总量：".$available);
+                Log::debug("队列事务1",["当前数量:{$this->count}","缓存数量：$available"]);
                 if ($this->count!==$available)return;
                 Cache::forget($this->key); //无论是否开始分发 都清除本次缓存架的计数器
                 //获取可用缓存架
                 $stations = app("StationService")->getCacheShelf(true);
+                Log::debug("队列事务2",["可用缓存架:{$stations->count()}"]);
                 if ($stations->count()==0)break;
                 LogService::log("海柔任务","队列事务分发",$stations->toJson());
                 //检查事务 尝试分发任务 改变下方序列来控制分发顺序 逐级分发 一次成功就终止
@@ -108,6 +110,8 @@ class CacheShelfTaskJob implements ShouldQueue
                     $query->where("status","待处理");
                 })->where("status",3)->lockForUpdate()
                 ->where("mark",2)->groupBy("task_id")->get(); //检索等待的队列事务来获取对应任务
+            Log::debug("队列事务3",["队列出库任务:{$tasks->count()}"]);
+            if ($tasks->count()==0)return false;
             if ($this->dispatchTask($tasks,$stations,$service,function ($obj,$stationId,$time,&$updateTransaction){
                 if ($obj->ids!=$obj->id){
                     $ids = explode(",",$obj->ids);
@@ -140,7 +144,8 @@ class CacheShelfTaskJob implements ShouldQueue
                     $query->where("status","待处理");
                 })->where("status",3)->lockForUpdate()
                 ->where("mark",1)->get(); //检索等待的队列事务来获取对应任务
-            if (!$tasks->count())return false;
+            Log::debug("队列事务3",["队列入库任务:{$tasks->count()}"]);
+            if ($tasks->count()==0)return false;
             if ($this->dispatchTask($tasks,$stations,$service,function ($obj,$stationId,$time,&$updateTransaction){
                 $updateTransaction[] = ["id"=>$obj->id,"fm_station_id"=>$stationId,"status"=>0,"updated_at"=>$time];
             },function ($service,$toLocation,$task,$prefix){

app/Logging/DebugFormatter.php

@@ -18,6 +18,6 @@ class DebugFormatter
      */
     public function __invoke($logger)
     {
-        if (env("APP_ENV","production")!='local')$logger->popHandler();
+        //if (env("APP_ENV","production")!='local')$logger->popHandler();
     }
 }

app/Logging/ErrorFormatter.php

@@ -4,6 +4,10 @@
 namespace App\Logging;
 
 
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Monolog\Logger;
+
 /**
  * Handler error events
  *
@@ -12,8 +16,19 @@ namespace App\Logging;
  */
 class ErrorFormatter
 {
+    /**
+     * @param Logger|\Illuminate\Log\Logger $logger
+     */
     public function __invoke($logger)
     {
-
+        $logger->setExceptionHandler(function ($e) {
+            if (stripos($e->getMessage(),"Permission denied")){
+                try {
+                    if (PHP_OS != 'WINNT')exec("chmod 777 ".base_path("storage/logs/error-".date("Y-m-d").".log"),$output,$return);
+                }catch (\Exception $e){
+                    Log::critical("日志写入错误",["msg"=>$e->getMessage(),"user"=>Auth::id()]);
+                }
+            }
+        });
     }
 }

app/Providers/AppServiceProvider.php

@@ -181,9 +181,7 @@ use App\Services\RequirementUserService;
 use App\Services\WorkOrderService;
 use App\Services\WorkOrderTypeService;
 use App\Services\OrderPackageRemarkService;
-use App\Services\MeasureMonitorService;
 use App\Services\LaborCompanyService;
-use App\Services\UserAuthablesService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -368,7 +366,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('TerminalPrinterService',TerminalPrinterService::class);
         app()->singleton('TerminalService',TerminalService::class);
         app()->singleton('UnitService', UnitService::class);
-        app()->singleton('UserAuthablesService',UserAuthablesService::class);
         app()->singleton('UserOwnerGroupService', UserOwnerGroupService::class);
         app()->singleton('UserService', UserService::class);
         app()->singleton('UserWorkgroupService', UserWorkgroupService::class);

bootstrap/cache/packages.php

@@ -1,11 +1,4 @@
 <?php return array (
-  'beyondcode/laravel-dump-server' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    ),
-  ),
   'facade/ignition' => 
   array (
     'providers' => 

bootstrap/cache/services.php

@@ -23,25 +23,24 @@
     19 => 'Illuminate\\Translation\\TranslationServiceProvider',
     20 => 'Illuminate\\Validation\\ValidationServiceProvider',
     21 => 'Illuminate\\View\\ViewServiceProvider',
-    22 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    23 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    25 => 'Intervention\\Image\\ImageServiceProvider',
-    26 => 'Laravel\\Horizon\\HorizonServiceProvider',
-    27 => 'Laravel\\Ui\\UiServiceProvider',
-    28 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    29 => 'Carbon\\Laravel\\ServiceProvider',
-    30 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    31 => 'Oursdreams\\Export\\ExportServiceProvider',
-    32 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    33 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    34 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    35 => 'App\\Providers\\AppServiceProvider',
-    36 => 'App\\Providers\\AuthServiceProvider',
-    37 => 'App\\Providers\\BroadcastServiceProvider',
-    38 => 'App\\Providers\\EventServiceProvider',
-    39 => 'App\\Providers\\HorizonServiceProvider',
-    40 => 'App\\Providers\\RouteServiceProvider',
+    22 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    23 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    24 => 'Intervention\\Image\\ImageServiceProvider',
+    25 => 'Laravel\\Horizon\\HorizonServiceProvider',
+    26 => 'Laravel\\Ui\\UiServiceProvider',
+    27 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    28 => 'Carbon\\Laravel\\ServiceProvider',
+    29 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    30 => 'Oursdreams\\Export\\ExportServiceProvider',
+    31 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    32 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    33 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    34 => 'App\\Providers\\AppServiceProvider',
+    35 => 'App\\Providers\\AuthServiceProvider',
+    36 => 'App\\Providers\\BroadcastServiceProvider',
+    37 => 'App\\Providers\\EventServiceProvider',
+    38 => 'App\\Providers\\HorizonServiceProvider',
+    39 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -55,25 +54,24 @@
     7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
     8 => 'Illuminate\\Session\\SessionServiceProvider',
     9 => 'Illuminate\\View\\ViewServiceProvider',
-    10 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    11 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    13 => 'Intervention\\Image\\ImageServiceProvider',
-    14 => 'Laravel\\Horizon\\HorizonServiceProvider',
-    15 => 'Laravel\\Ui\\UiServiceProvider',
-    16 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    17 => 'Carbon\\Laravel\\ServiceProvider',
-    18 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    19 => 'Oursdreams\\Export\\ExportServiceProvider',
-    20 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    21 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    22 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    23 => 'App\\Providers\\AppServiceProvider',
-    24 => 'App\\Providers\\AuthServiceProvider',
-    25 => 'App\\Providers\\BroadcastServiceProvider',
-    26 => 'App\\Providers\\EventServiceProvider',
-    27 => 'App\\Providers\\HorizonServiceProvider',
-    28 => 'App\\Providers\\RouteServiceProvider',
+    10 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    11 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    12 => 'Intervention\\Image\\ImageServiceProvider',
+    13 => 'Laravel\\Horizon\\HorizonServiceProvider',
+    14 => 'Laravel\\Ui\\UiServiceProvider',
+    15 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    16 => 'Carbon\\Laravel\\ServiceProvider',
+    17 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    18 => 'Oursdreams\\Export\\ExportServiceProvider',
+    19 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    20 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    21 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    22 => 'App\\Providers\\AppServiceProvider',
+    23 => 'App\\Providers\\AuthServiceProvider',
+    24 => 'App\\Providers\\BroadcastServiceProvider',
+    25 => 'App\\Providers\\EventServiceProvider',
+    26 => 'App\\Providers\\HorizonServiceProvider',
+    27 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (

database/migrations/2021_09_03_103000_change_waybills_subjoinfee_column.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeWaybillsSubjoinfeeColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('waybills', function (Blueprint $table) {
+            $table->string("subjoin_fee")->nullable()->comment("附加费")->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('waybills', function (Blueprint $table) {
+            $table->decimal("subjoin_fee",10,3)->default(0)->comment("附加费")->change();
+        });
+    }
+}

resources/views/transport/waybill/delivering.blade.php

@@ -87,11 +87,11 @@
                             <div class="mr-3 text-nowrap form-inline" v-if="!waybill.isBtn">
                                 <label :for="'subjoin_fee'+waybill.id">附加费：</label>
                                 <div class="input-group input-group-sm">
-                                    <input :id="'subjoin_fee'+waybill.id" :value="waybill.subjoin_fee" type="number" step="0.01"
+                                    <input :id="'subjoin_fee'+waybill.id" :value="waybill.subjoin_fee"
                                            class="form-control" style="width:150px">
-                                    <span class="input-group-append">
+<!--                                    <span class="input-group-append">
                                       <span class="input-group-text">元</span>
-                                    </span>
+                                    </span>-->
                                 </div>
                             </div>
                             <span class="mr-3 text-nowrap">