模型的中间继承

app/AuditLog.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Traits\ModelTimeFormat;
 
-class AuditLog extends Model
+class AuditLog extends ModelExtended
 {
     use ModelTimeFormat;
     use SoftDeletes;

app/Authority.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Authority extends Model
+class Authority extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable = ['name','remark','id_parent','alias_name','type','relevance','permission'];

app/Batch.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Batch extends Model
+class Batch extends ModelExtended
 {
     protected $fillable = [
         'id','code','type', 'wms_type', 'status', 'wms_status', 'wms_created_at',"remark","owner_id",

app/CarType.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class CarType extends Model
+class CarType extends ModelExtended
 {
     use ModelTimeFormat;
 

app/Carrier.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Carrier extends Model
+class Carrier extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/City.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class City extends Model
+class City extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/Commodity.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Commodity extends Model
+class Commodity extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=['name','sku','owner_id','created_at','length','width','height','volumn',"type","pack_spec"];

app/CommodityBarcode.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class CommodityBarcode extends Model
+class CommodityBarcode extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=['code','commodity_id','created_at'];

app/Console/Commands/ModelMakeCommand.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace App\Console\Commands;
+
+
+class ModelMakeCommand extends \Illuminate\Foundation\Console\ModelMakeCommand
+{
+    protected function getStub()
+    {
+        if ($this->option('pivot')) {
+            return parent::getStub();
+        }
+        return __DIR__ . '/stubs/model.stub';
+    }
+
+}

app/Console/Commands/stubs/model.stub

@@ -0,0 +1,10 @@
+<?php
+
+namespace {{ namespace }};
+
+use Illuminate\Database\Eloquent\Model;
+
+class {{ class }} extends ModelExtended
+{
+    //
+}

app/Console/Kernel.php

@@ -14,6 +14,7 @@ use App\Console\Commands\TestTemp;
 use App\Console\Commands\WASSyncWMSOrderInformation;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Foundation\Console\ModelMakeCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -63,6 +64,9 @@ class Kernel extends ConsoleKernel
     protected function commands()
     {
         $this->load(__DIR__ . '/Commands');
+        $this->app->extend('command.model.make',function(ModelMakeCommand $base,$app){
+            return new \App\Console\Commands\ModelMakeCommand($app['files']);
+        });
         require base_path('routes/console.php');
     }
 }

app/CustomField.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class CustomField extends Model
+class CustomField extends ModelExtended
 {
     protected $fillable=['table',
         'field',

app/Customer.php

@@ -6,7 +6,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-class Customer extends Model
+class Customer extends ModelExtended
 {
     use ModelTimeFormat;
 

app/CustomerLog.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class CustomerLog extends Model
+class CustomerLog extends ModelExtended
 {
     use ModelTimeFormat;
 

app/CustomerLogStatus.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class CustomerLogStatus extends Model
+class CustomerLogStatus extends ModelExtended
 {
     use ModelTimeFormat;
 

app/CustomerTag.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class CustomerTag extends Model
+class CustomerTag extends ModelExtended
 {
     protected $fillable=[
         "name","explanation"

app/Depository.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Depository extends Model
+class Depository extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/Exceptions/ErrorException.php

@@ -0,0 +1,15 @@
+<?php
+
+
+namespace App\Exceptions;
+
+
+use Throwable;
+
+class ErrorException extends Exception
+{
+    public function __construct($message = "",  $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message,$type='error',$code, $previous);
+    }
+}

app/Exceptions/Exception.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Exceptions;
+
+
+use Throwable;
+
+class Exception extends \Exception
+{
+        public function __construct($message = "",$type='error', $code = 0, Throwable $previous = null)
+        {
+            parent::__construct($message, $code, $previous);
+            $this['type']=$type;
+        }
+}

app/Exceptions/FatalException.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Exceptions;
+
+
+use Throwable;
+
+class FatalException extends Exception
+{
+
+    public function __construct($message = "",  $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message,$type='fatal',$code, $previous);
+    }
+}

app/Exceptions/Handler.php

@@ -9,6 +9,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
@@ -58,6 +59,7 @@ class Handler extends ExceptionHandler
     {
         $errMsg='';
         try{
+            $type = $exception['type'] ?? 'error';
             $errMsg=(function()use($exception){
                 return $errMsg=
                     '异常: '
@@ -107,7 +109,9 @@ class Handler extends ExceptionHandler
                 $functionName,
                 ($errMsg??'')
                 .'请求：'.json_encode($request->all())
-                .'调用堆栈：'.$tracesAll
+                .'调用堆栈：'.$tracesAll,
+                Auth::id()??'',
+                $type
             );
         }
         return parent::render($request, $exception);

app/Exceptions/PanicException.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Exceptions;
+
+
+use Throwable;
+
+class PanicException extends Exception
+{
+
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message,  $type='panic', $code,$previous = null);
+    }
+}

app/Exceptions/WarningException.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App\Exceptions;
+
+
+use Throwable;
+
+class WarningException extends Exception
+{
+
+    public function __construct($message = "",  $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message,$type='warning',$code, $previous);
+    }
+}

app/Feature.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Feature extends Model
+class Feature extends ModelExtended
 {
     protected $fillable = [
         "type",     //类型

app/Http/Controllers/TestController.php

@@ -17,6 +17,7 @@ use App\InventoryAccount;
 use App\LaborReport;
 use App\Log;
 use App\Logistic;
+use App\Menu;
 use App\OracleActAllocationDetails;
 use App\OracleBasSKU;
 use App\OracleDOCOrderHeader;
@@ -244,7 +245,7 @@ class TestController extends Controller
 
     function t1(Request $request)
     {
-        throw new \Exception('aaaaaa');
+        (new Menu())->getCurrent();
     }
     function packageT(Request $request)
     {

app/Http/Requests/ForeignHaiRobotic_taskUpdateRequest.php

@@ -15,7 +15,7 @@ class ForeignHaiRobotic_taskUpdateRequest extends FormRequest
      */
     public function authorize()
     {
-        return false;
+        return true;
     }
 
     /**

app/InventoryAccount.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 
-class InventoryAccount extends Model
+class InventoryAccount extends ModelExtended
 {
     use ModelTimeFormat;
     use SoftDeletes;

app/InventoryAccountMission.php

@@ -6,7 +6,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
-class InventoryAccountMission extends Model
+class InventoryAccountMission extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/InventoryBlindReceiveExcel.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
 
-class InventoryBlindReceiveExcel extends Model
+class InventoryBlindReceiveExcel extends ModelExtended
 {
     //
     protected $fillable = [

app/InventoryCompare.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class InventoryCompare extends Model
+class InventoryCompare extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/InventoryDailyLog.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class InventoryDailyLog extends Model
+class InventoryDailyLog extends ModelExtended
 {
     public $timestamps=false;
     protected $fillable=[

app/InventoryDailyLoggingOwner.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class InventoryDailyLoggingOwner extends Model
+class InventoryDailyLoggingOwner extends ModelExtended
 {
     protected $fillable=[
         "owner_id","status"

app/JobType.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class JobType extends Model
+class JobType extends ModelExtended
 {
     //
 }

app/LaborCompany.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class LaborCompany extends Model
+class LaborCompany extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/LaborReport.php

@@ -10,7 +10,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 
-class LaborReport extends Model
+class LaborReport extends ModelExtended
 {
     use ModelTimeFormat;
     use SoftDeletes;

app/LaborReportStatus.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class LaborReportStatus extends Model
+class LaborReportStatus extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/Log.php

@@ -7,7 +7,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Str;
 
-class Log extends Model
+class Log extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable = [

app/Logistic.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
  * @method static Builder orderBy(string $string, string $string1)
  */use App\Traits\ModelTimeFormat;
 
-class Logistic extends Model
+class Logistic extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable = ['name','code',"type","mobile","remark","delivery_fee"];

app/LogisticNumberFeature.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class LogisticNumberFeature extends Model
+class LogisticNumberFeature extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=['logistic_id','name','value','weight'];

app/LogisticTiming.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class LogisticTiming extends Model
+class LogisticTiming extends ModelExtended
 {
     //
     protected $fillable = [

app/MaterialBox.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class MaterialBox extends Model
+class MaterialBox extends ModelExtended
 {
     protected $fillable=['code'];
 }

app/MeasuringMachine.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Support\Carbon;
 
-class MeasuringMachine extends Model
+class MeasuringMachine extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/Menu.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class Menu extends Model
+class Menu extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/ModelExtended.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ModelExtended extends Model
+{
+    protected $isNotLogging=[
+        Log::class
+    ];
+    protected function shouldLog():bool{
+        return array_search(get_class($this),$this->isNotLogging)!==false;
+    }
+}

app/OperatorLog.php

@@ -5,7 +5,7 @@ namespace App;
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
-class OperatorLog extends Model
+class OperatorLog extends ModelExtended
 {
     const UPDATED_AT = null;
     protected $fillable=[
@@ -26,4 +26,5 @@ class OperatorLog extends Model
     {
         return $this['user']['name'] ??'';
     }
+
 }

app/OracleActAllocationDetails.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleActAllocationDetails extends Model
+class OracleActAllocationDetails extends ModelExtended
 {
     protected $connection="oracle";
     protected $primaryKey="ALLOCATIONDETAILSID";

app/OracleActTransactionLog.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   ACT_TRANSACTION_LOG
  * EXPLAIN: 库存事务
  */
-class OracleActTransactionLog extends Model
+class OracleActTransactionLog extends ModelExtended
 {
     protected $connection="oracle";
     protected $table="ACT_TRANSACTION_LOG";

app/OracleBasCode.php

@@ -9,11 +9,11 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   BAS_Codes
  * EXPLAIN: 系统代码内容
  */
-class OracleBasCode extends Model
+class OracleBasCode extends ModelExtended
 {
     protected $connection="oracle";
     protected $table="BAS_CODES";
     /*
      * column: CodeID=>代码表ID,Code=>代码,CodeName_C=>中文描述
      * */
-}
+}

app/OracleBasCustomer.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleBasCustomer extends Model
+class OracleBasCustomer extends ModelExtended
 {
     protected $connection="oracle";
     protected $table="BAS_CUSTOMER";

app/OracleBasSKU.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  */
 use App\Traits\ModelTimeFormat;
 
-class OracleBasSKU extends Model
+class OracleBasSKU extends ModelExtended
 {
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCASNDetail.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class OracleDOCASNDetail extends Model
+class OracleDOCASNDetail extends ModelExtended
 {
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCASNHeader.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OracleDOCASNHeader extends Model
+class OracleDOCASNHeader extends ModelExtended
 {
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCMovementDetail.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class OracleDOCMovementDetail extends Model
+class OracleDOCMovementDetail extends ModelExtended
 {
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCMovementHeader.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class OracleDOCMovementHeader extends Model
+class OracleDOCMovementHeader extends ModelExtended
 {
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCOrderDetail.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleDOCOrderDetail extends Model
+class OracleDOCOrderDetail extends ModelExtended
 {
     protected $connection="oracle";
     protected $table="DOC_Order_Details";

app/OracleDOCOrderHeader.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OracleDOCOrderHeader extends Model
+class OracleDOCOrderHeader extends ModelExtended
 {
 
     use ModelTimeFormat;

app/OracleDOCWaveDetails.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleDOCWaveDetails extends Model
+class OracleDOCWaveDetails extends ModelExtended
 {
     protected $connection='oracle';
     protected $table='DOC_WAVE_DETAILS';

app/OracleDOCWaveHeader.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class OracleDOCWaveHeader extends Model
+class OracleDOCWaveHeader extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/OracleDocOrderPackingSummary.php

@@ -6,7 +6,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OracleDocOrderPackingSummary extends Model
+class OracleDocOrderPackingSummary extends ModelExtended
 {
     protected $connection="oracle";
     protected $primaryKey="traceid";

app/OracleIdxAsrsReceive.php

@@ -6,7 +6,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OracleIdxAsrsReceive extends Model
+class OracleIdxAsrsReceive extends ModelExtended
 {
     protected $connection="oracle";
     protected $primaryKey="GROUPTASKID";

app/OracleInvLotAtt.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   INV_LOT_ATT
  * EXPLAIN: 批次属性
  */
-class OracleInvLotAtt extends Model
+class OracleInvLotAtt extends ModelExtended
 {
 
     protected $connection="oracle";

app/OracleInvLotLocId.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   INV_LOT_LOC_ID
  * EXPLAIN: 库存状态
  */
-class OracleInvLotLocId extends Model
+class OracleInvLotLocId extends ModelExtended
 {
     protected $connection="oracle";
     protected $table="INV_LOT_LOC_ID";

app/Order.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class Order extends Model
+class Order extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/OrderBin.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OrderBin extends Model
+class OrderBin extends ModelExtended
 {
     protected $fillable = [
         'order_id', 'number',

app/OrderCommodity.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderCommodity extends Model
+class OrderCommodity extends ModelExtended
 {
     protected $fillable = [
         'id', 'order_id','commodity_id', 'amount','wms_ptltaskid','location'

app/OrderCommodityAssign.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderCommodityAssign extends Model
+class OrderCommodityAssign extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable = [

app/OrderCountingRecord.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OrderCountingRecord extends Model
+class OrderCountingRecord extends ModelExtended
 {
     //
     protected $fillable = ['owner_id','shop_id' ,'warehouse_id' ,'logistic_id' ,'date_target' ,'counting_unit' ,'amount','year','month','week'];

app/OrderIssue.php

@@ -6,7 +6,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class OrderIssue extends Model
+class OrderIssue extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/OrderIssueOnTop.php

@@ -5,11 +5,11 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderIssueOnTop extends Model
+class OrderIssueOnTop extends ModelExtended
 {
     //
     use ModelTimeFormat;
-    
+
     protected $fillable = [ 'order_issue_id','remark'];
 
     public function OrderIssue(){

app/OrderIssueProcessLog.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderIssueProcessLog extends Model
+class OrderIssueProcessLog extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/OrderIssueType.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderIssueType extends Model
+class OrderIssueType extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/OrderPackage.php

@@ -13,7 +13,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
-class OrderPackage extends Model
+class OrderPackage extends ModelExtended
 {
     use ModelTimeFormat;
 

app/OrderPackageCommodities.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderPackageCommodities extends Model
+class OrderPackageCommodities extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/OrderTracking.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderTracking extends Model
+class OrderTracking extends ModelExtended
 {
 
     use ModelTimeFormat;

app/OrderTrackingOwner.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderTrackingOwner extends Model
+class OrderTrackingOwner extends ModelExtended
 {
     //
     use ModelTimeFormat;

app/Owner.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Auth;
  */
 use App\Traits\ModelTimeFormat;
 
-class Owner extends Model
+class Owner extends ModelExtended
 {
     use ModelTimeFormat;
     public $fillable = [

app/OwnerAreaReport.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerAreaReport extends Model
+class OwnerAreaReport extends ModelExtended
 {
     protected $fillable = [
         "owner_id",             //货主ID

app/OwnerBillReport.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerBillReport extends Model
+class OwnerBillReport extends ModelExtended
 {
    protected $fillable = [
        "owner_id",       //项目ID

app/OwnerContract.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerContract extends Model
+class OwnerContract extends ModelExtended
 {
     use ModelTimeFormat;
 

app/OwnerFeeDetail.php

@@ -5,7 +5,7 @@ namespace App;
 use App\Services\ProcessMethodService;
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerFeeDetail extends Model
+class OwnerFeeDetail extends ModelExtended
 {
     protected $fillable = [
         "owner_id",         //货主ID

app/OwnerInStorageRule.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerInStorageRule extends Model
+class OwnerInStorageRule extends ModelExtended
 {
     protected $fillable = [
         "owner_price_operation_id", //作业计费ID

app/OwnerOutStorageRule.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerOutStorageRule extends Model
+class OwnerOutStorageRule extends ModelExtended
 {
     protected $fillable = [
         "owner_price_operation_id",         //作业计费ID

app/OwnerPriceDirectLogistic.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OwnerPriceDirectLogistic extends Model
+class OwnerPriceDirectLogistic extends ModelExtended
 {
     protected $fillable = [
         "name",     //名称

app/OwnerPriceDirectLogisticCar.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceDirectLogisticCar extends Model
+class OwnerPriceDirectLogisticCar extends ModelExtended
 {
     protected $fillable = [
         "owner_price_direct_logistic_id",   //直发车计费ID

app/OwnerPriceExpress.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OwnerPriceExpress extends Model
+class OwnerPriceExpress extends ModelExtended
 {
     protected $fillable = [
         "name",             //名称

app/OwnerPriceExpressProvince.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceExpressProvince extends Model
+class OwnerPriceExpressProvince extends ModelExtended
 {
     protected $fillable = [
         "owner_price_express_id",   //快递价格ID

app/OwnerPriceLogistic.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OwnerPriceLogistic extends Model
+class OwnerPriceLogistic extends ModelExtended
 {
     protected $fillable = [
         "name",             //名称

app/OwnerPriceLogisticDetail.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceLogisticDetail extends Model
+class OwnerPriceLogisticDetail extends ModelExtended
 {
     protected $fillable = [
         "owner_price_logistic_id",  //物流计费

app/OwnerPriceOperation.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceOperation extends Model
+class OwnerPriceOperation extends ModelExtended
 {
     protected $fillable = [
         "operation_type",   //操作类型

app/OwnerReport.php

@@ -6,7 +6,7 @@ use App\Traits\ModelTimeFormat;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerReport extends Model
+class OwnerReport extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable = [

app/OwnerStoragePriceModel.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerStoragePriceModel extends Model
+class OwnerStoragePriceModel extends ModelExtended
 {
     protected $fillable = [
         "counting_type",    //计费类型

app/OwnerStoragePriceModelOwner.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerStoragePriceModelOwner extends Model
+class OwnerStoragePriceModelOwner extends ModelExtended
 {
     protected $table = "owner_storage_price_model_owner";
 }

app/Package.php

@@ -10,7 +10,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 
-class Package extends Model
+class Package extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/PaperBox.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class PaperBox extends Model
+class PaperBox extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/Process.php

@@ -7,7 +7,7 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 
-class Process extends Model
+class Process extends ModelExtended
 {
     use ModelTimeFormat;
     use SoftDeletes;

app/ProcessDaily.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessDaily extends Model
+class ProcessDaily extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/ProcessDailyParticipant.php

@@ -6,7 +6,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessDailyParticipant extends Model
+class ProcessDailyParticipant extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[

app/ProcessMethod.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessMethod extends Model
+class ProcessMethod extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=['name',"unit_id","unit_price"];

app/ProcessStatistic.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessStatistic extends Model
+class ProcessStatistic extends ModelExtended
 {
     use ModelTimeFormat;
     //重新约定主键且不允许自增

app/ProcessesContent.php

@@ -5,7 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessesContent extends Model
+class ProcessesContent extends ModelExtended
 {
     use ModelTimeFormat;
     protected $fillable=[