Merge branch 'master' into Haozi

# Conflicts:
#	app/Console/Kernel.php
#	app/Http/Controllers/TestController.php

app/AuditLog.php

@@ -6,8 +6,12 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Traits\ModelTimeFormat;
 
-class AuditLog extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class AuditLog extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     use SoftDeletes;
     protected $table='audit_logs';

app/Authority.php

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

app/Batch.php

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

app/CarType.php

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

app/Carrier.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Carrier extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Carrier extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'name','mobile','delivery_fee','remark'

app/City.php

@@ -2,12 +2,16 @@
 
 namespace App;
 
+use App\Traits\LogModelChanging;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class City extends ModelExtended
+class City extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
+    use LogModelChanging;
     protected $fillable=[
         'province_id','name','type'
     ];

app/Commodity.php

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

app/CommodityBarcode.php

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

app/Console/Commands/stubs/model.stub

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

app/Console/Kernel.php

@@ -56,8 +56,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('createOwnerAreaReport')->monthlyOn(25);
         $schedule->command('sync:batch')->everyMinute();
         $schedule->command('sync:order')->everyMinute();
-        //$schedule->command('SyncWmsCommoditiesInformation')->everyMinute();
-//        $schedule->command('sync:order')->everyMinute();
     }
 
     /**

app/CustomField.php

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

app/Customer.php

@@ -6,8 +6,12 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-class Customer extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Customer extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
 
     protected $fillable = [

app/CustomerLog.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class CustomerLog extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class CustomerLog extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
 
     protected $fillable = ['customer_id', 'customer_log_status_id', 'user_id', 'description'];

app/CustomerLogStatus.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class CustomerLogStatus extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class CustomerLogStatus extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
 
     protected $fillable = ['name', 'description'];

app/CustomerTag.php

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

app/Depository.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class Depository extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Depository extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'name','code'

app/Events/ModelChangedEvent.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Events;
+
+use App\LaborReport;
+use App\UserDutyCheck;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Queue\SerializesModels;
+
+
+class ModelChangedEvent
+{
+    use  SerializesModels;
+
+    public $model;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param Model $model
+     */
+    public function __construct(Model $model)
+    {
+        $this->model=$model;
+    }
+
+}

app/Exceptions/Exception.php

@@ -8,9 +8,10 @@ use Throwable;
 
 class Exception extends \Exception
 {
+        public $type;
         public function __construct($message = "",$type='error', $code = 0, Throwable $previous = null)
         {
             parent::__construct($message, $code, $previous);
-            $this['type']=$type;
+            $this->type=$type;
         }
 }

app/Exceptions/Handler.php

@@ -2,17 +2,12 @@
 
 namespace App\Exceptions;
 
-use App\Http\Controllers\Controller;
 use App\Services\LogService;
 use Exception;
 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 Illuminate\Validation\ValidationException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -48,30 +43,39 @@ class Handler extends ExceptionHandler
         parent::report($exception);
     }
 
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param Request $request
-     * @param Throwable $exception
-     * @return \Symfony\Component\HttpFoundation\Response|void
-     * @throws Throwable
-     */
-    public function render($request, Throwable $exception)
+
+    public function render( $request, Throwable $exception)
     {
         $errMsg='';
         try{
             $type = $exception->type ?? 'error';
-            $errMsg=(function()use($exception){
+            $errMsg=(function()use($request,$exception){
                 return $errMsg=
                     '异常: '
-                    .' code:'.(
-                    method_exists($exception,'getStatusCode')
-                        ?($exception->getStatusCode()??'')
+                    .' URL:'.(
+                    method_exists($request,'fullUrl')
+                        ?($request->fullUrl()??'')
+                        :'')
+                    .' method:'.(
+                    method_exists($request,'method')
+                        ?($request->method()??'')
+                        :'')
+                    .' params:'.(
+                    method_exists($request,'all')
+                        ?json_encode($request->all()??'')
                         :'')
                     .' errors:'.(
                     method_exists($exception,'errors')
                         ?(json_encode($exception->errors(),JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES)??'')
                         :'')
+                    .' header:'.(
+                    method_exists($request,'header')
+                        ?json_encode($request->headers->all()??'')
+                        :'')
+                    .' code:'.(
+                    method_exists($exception,'getStatusCode')
+                        ?($exception->getStatusCode()??'')
+                        :'')
                     .' message:'.(
                     method_exists($exception,'getMessage')
                         ?($exception->getMessage()??'')
@@ -110,8 +114,8 @@ class Handler extends ExceptionHandler
                     ?($exception->getTraceAsString()??'')
                     :'';
                 if(!$traces)return '';
-                preg_match('/\#0.*?\: (.*?)-\>(.*?)\(/', $traces, $result);
-                return [$result[1]??'',$result[2]??'',$traces];
+                preg_match('/\#0.*?\: (.*?)(-\>|\:\:)(.*?)\(/', $traces, $result);
+                return [$result[1]??'',$result[3]??'',$traces];
             })();
             LogService::log(
                 $className,

app/Feature.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Feature extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Feature extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "type",     //类型
         "logic",    //逻辑

app/Http/Controllers/OrderTrackingController.php

@@ -77,17 +77,18 @@ class OrderTrackingController extends Controller
             return ['success'=>false,'fail_info'=>'没有对应权限'];
         try {
             $logistic = Logistic::query()->where('name',$request['value'])->first();
-            $order = Order::query()->whereHas('packages.commodities.orderTracking',function($query)use($request){
-                $query->where('id',$request['id']);
-            })->first();
-            $order->update(['logistic_id'=>$logistic->id]);
-            app('LogService')->log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
-            return ['success'=>true];
+            $bool = OrderTracking::query()->where('id',$request['id'])->update(['logistic_id'=>$logistic['id']]);
+            if($bool){
+                app('LogService')->log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
+                return ['success'=>true];
+            }else{
+                app('LogService')->log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()));
+                return  ['success'=>false,'fail_info'=>'修改失败'];
+            }
         } catch (\Exception $e) {
             app('LogService')->log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false,'fail_info'=>$e->getMessage()];
         }
-
     }
 
     public function upload(Request $request)
@@ -162,7 +163,7 @@ class OrderTrackingController extends Controller
         $order_client_code_temp = '';
         $row_count = 0;
         foreach ($orderTrackings as $index=> $orderTracking) {
-            $logistic =  $orderTracking->commodities->package->order->logistic->name ?? '';
+            $logistic =  $orderTracking->logistic->name ?? '';
             if($order_client_code_temp==''){
                 $order_client_code_temp=$orderTracking->order_client_code;
                 $row_count=1;
@@ -212,7 +213,7 @@ class OrderTrackingController extends Controller
                 $orderTracking->gross_weight,
                 $orderTracking->bulk,
                 $orderTracking->pallet_total,
-                $orderTracking->commodities->package->order->logistic->name ??'',
+                $logistic,
                 $logistic_number,
                 $orderTracking->commodities->package->order->city ?? '',
                 $planning_sent_at=='0000-00-00'?'':$planning_sent_at,

app/Http/Controllers/TestController.php

@@ -261,7 +261,7 @@ class TestController extends Controller
 
     function t1(Request $request)
     {
-        $user=City::query()->first();
+        $user=City::query()->firstx();
         $user['created_at'] = '2020-12-23';
         $user->save();
     }
@@ -1090,21 +1090,7 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         dd($requests);
     }
 
-    public function syncOrderTracking()
-    {
-        /** @var OrderTrackingService $orderTrackingService */
-        $orderTrackingService = app('OrderTrackingService');
-        /** @var OrderService $orderService */
-        $orderService = app(OrderService::class);
-        /*$owners = app(OrderTrackingOwnerService::class)->getTrackingOrderOwner();*/
-        /*$startDate = \Illuminate\Support\Carbon::parse('2020-10-28 00:00:00')->toDateTimeString();*/
-        $orderNos = ['SO201205001735', 'SO201204003891', 'SO201204003706', 'SO201204002877', 'SO201203003771'];
-        $orderHeaders = OracleDOCOrderHeader::query()->with(['oracleDOCOrderDetails', 'actAllocationDetails', 'oracleBASCode'])
-            ->whereIn('orderno', $orderNos)
-            ->get();
-        $orderService->updateByWmsOrders($orderHeaders);
-        $orderTrackingService->createByWmsOrderHeader($orderHeaders);
-    }
+
 
     public function testSyncOrderTask()
     {
@@ -1296,83 +1282,159 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         ValueStore::query()->where('name','order_last_updated_sync_at')->update(['value'=>'2020-12-22 09:00:00']);
     }
 
-    public function testHz(){
-        dump('start'.Carbon::now()->toDateTimeString());
-        $ownerAreaReportTask=new CreateOwnerAreaReport();
-        $ownerAreaReportTask->handle();
-        $ownerBillReportTask= new CreateOwnerBillReport();
-        $ownerBillReportTask->handle();
-        $ownerReportTask= new CreateOwnerReport();
-        $ownerReportTask->handle();
-        dump('end'.Carbon::now()->toDateTimeString());
+    public function syncOrderTask()
+    {
+        $service = new OrderService();
+        $start_data = Carbon::parse('2020-12-21 10:00:00');
+        $end_data = Carbon::parse('2020-12-21 11:00:00');
+        $orderNos = OracleDOCOrderHeader::query()->selectRaw('orderno')
+            ->where('addTime', '>=', $start_data)
+            ->where('addTime', '<=', $end_data)
+            ->get()->map(function($orderHeader){
+                return $orderHeader->orderno;
+            });
+        $order_no_list = $orderNos->chunk(3000);
+        foreach ($order_no_list as $order_nos) {
+            $orderHeaders = OracleDOCOrderHeader::query()->selectRaw(implode(',', OracleDOCOrderHeaderService::$columns))
+                ->with(['oracleBASCustomer' => function ($query) {
+                    $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
+                }, 'oracleDOCOrderDetails' => function ($query) {
+                    $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered,doc_order_details.Location');
+                }, 'actAllocationDetails' => function ($query) {
+                    $query->selectRaw('ACT_Allocation_Details.AllocationDetailsID,ACT_Allocation_Details.OrderNo,ACT_Allocation_Details.Qty_Each,ACT_Allocation_Details.PickToTraceID,ACT_Allocation_Details.CustomerID,ACT_Allocation_Details.Sku,ACT_Allocation_Details.Location');
+                }, 'oracleBASCode' => function ($query) {
+                    $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
+                }, 'orderType' => function ($query) {
+                    $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
+                }])
+                ->whereIn('DOC_Order_Header.OrderNo', $order_nos)
+                ->get();
+            $service->syncOrder($orderHeaders);
+            unset($orderHeaders);
+        }
+    }
+    public function syncOrderTracking()
+    {
+        $orderTrackingService = new OrderTrackingService();
+        $orderService = new OrderService();
+        $start_data = Carbon::parse('2020-12-21 10:00:00');
+        $end_data = Carbon::parse('2020-12-21 11:00:00');
+        $orderNos = OracleDOCOrderHeader::query()->selectRaw('orderno')
+            ->where('addTime', '>=', $start_data)
+            ->where('addTime', '<=', $end_data)
+            ->get()->map(function($orderHeader){
+                return $orderHeader->orderno;
+            });
+        $order_no_list = $orderNos->chunk(3000);
+        foreach ($order_no_list as $order_nos) {
+            $orderHeaders = OracleDOCOrderHeader::query()->selectRaw(implode(',', OracleDOCOrderHeaderService::$columns))
+                ->with(['oracleBASCustomer' => function ($query) {
+                    $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
+                }, 'oracleDOCOrderDetails' => function ($query) {
+                    $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered,doc_order_details.Location');
+                }, 'actAllocationDetails' => function ($query) {
+                    $query->selectRaw('ACT_Allocation_Details.AllocationDetailsID,ACT_Allocation_Details.OrderNo,ACT_Allocation_Details.Qty_Each,ACT_Allocation_Details.PickToTraceID,ACT_Allocation_Details.CustomerID,ACT_Allocation_Details.Sku,ACT_Allocation_Details.Location');
+                }, 'oracleBASCode' => function ($query) {
+                    $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
+                }, 'orderType' => function ($query) {
+                    $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
+                }])
+                ->whereIn('DOC_Order_Header.OrderNo', $order_nos)
+                ->get();
+            $orderService->createByWmsOrder($orderHeaders);
+            $orderTrackingService->createByWmsOrderHeader($orderHeaders);
+            unset($orderHeaders);
+        }
     }
 
-    public function syncOrderTask()
+
+    public function testMbStrPos()
     {
-        $start_data = Carbon::parse('2020-12-10 00:00:00');
-        $orderHeaders = OracleDOCOrderHeader::query()->selectRaw(implode(',', OracleDOCOrderHeaderService::$columns))
-            ->with(['oracleBASCustomer' => function ($query) {
-                $query->selectRaw('BAS_CUSTOMER.CustomerID,BAS_CUSTOMER.Customer_Type,BAS_CUSTOMER.Descr_C,BAS_CUSTOMER.Active_Flag');
-            }, 'oracleDOCOrderDetails' => function ($query) {
-                $query->selectRaw('doc_order_details.orderNo,doc_order_details.customerid,doc_order_details.sku,doc_order_details.QtyOrdered,doc_order_details.Location');
-            }, 'actAllocationDetails' => function ($query) {
-                $query->selectRaw('ACT_Allocation_Details.AllocationDetailsID,ACT_Allocation_Details.OrderNo,ACT_Allocation_Details.Qty_Each,ACT_Allocation_Details.PickToTraceID,ACT_Allocation_Details.CustomerID,ACT_Allocation_Details.Sku,ACT_Allocation_Details.Location');
-            }, 'oracleBASCode' => function ($query) {
-                $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
-            }, 'orderType' => function ($query) {
-                $query->selectRaw('BAS_Codes.CodeID,BAS_Codes.CodeName_C,BAS_Codes.Code');
-            }])->where('DOC_Order_Header.AddTime', '>', $start_data)
+        $string = '天猫旗舰店';
+        dd((bool)mb_stristr('天猫旗舰店','天猫'));
+    }
+
+    public function testOrderissue()
+    {
+        $orderIssue_unique = \App\OrderIssue::withTrashed()
+            ->selectRaw('count(1) as count,id,order_id')
+            ->whereNotNull('order_id')
+            ->orderByDesc('created_at')
+            ->groupBy('order_id')
+            ->having('count', '>', 1)
+            ->limit(100)
             ->get();
-        $service = new OrderService();
-        $service->syncOrder($orderHeaders);
+        if ($orderIssue_unique->count() == 0) return;
+        foreach ($orderIssue_unique as $item) {
+            $orderIssue_delete = OrderIssue::withTrashed()->where('order_id', $item->order_id)->get();
+            /** @var OrderIssue $order_issue_unique */
+            $order_issue_unique = $orderIssue_delete->whereNull('deleted_at')->first();
+            if (!$order_issue_unique) $order_issue_unique = $orderIssue_delete->first();
+            $ids = [];
+            foreach ($orderIssue_delete as $key => $order_issue) {
+                if ($order_issue->id == $order_issue_unique->id) continue;
+                $ids[] = $order_issue->id;
+                if($order_issue['logistic_number_return'])$order_issue_unique['logistic_number_return'] =$order_issue['logistic_number_return'];
+                if($order_issue['rejecting_status']!='未退回')$order_issue_unique['rejecting_status'] =$order_issue['rejecting_status'];
+                if($order_issue['is_new_rejecting']!='无')$order_issue_unique['is_new_rejecting'] =$order_issue['is_new_rejecting'];
+                if($order_issue['user_workgroup_id'])$order_issue_unique['user_workgroup_id'] =$order_issue['user_workgroup_id'];
+                if($order_issue['imported_status']!='正常')$order_issue_unique['imported_status'] =$order_issue['imported_status'];
+                if($order_issue['custom_code'])$order_issue_unique['custom_code'] =$order_issue['custom_code'];
+            }
+            $order_issue_unique->save();
+            app('LogService')->log(__METHOD__, __FUNCTION__, '修改OrderIssue:' . json_encode($order_issue_unique));
+            $orderIssues = OrderIssue::query()->whereIn('id',$ids)->get();
+            $bool = OrderIssue::query()->whereIn('id',$ids)->forceDelete();
+            if($bool)app('LogService')->log(__METHOD__, __FUNCTION__, '删除OrderIssue:' . json_encode($orderIssues));
+        }
     }
-    public function cleanOrderIssueRepeat()
+
+    public function testChangeOrderTracking()
     {
-        ini_set('max_execution_time', 6500);
-        ini_set('memory_limit', '1526M');
-        for ($i = 0; true; $i++) {
-            $orderIssue_unique = \App\OrderIssue::withTrashed()
-                ->selectRaw('count(1) as count,id,order_id')
-                ->whereNotNull('order_id')
-                ->orderByDesc('created_at')
-                ->groupBy('order_id')
-                ->having('count', '>', 1)
-                ->limit(100)
+        /** @var OrderTrackingService $service */
+        $service = app(OrderTrackingService::class);
+        $maxId= \App\OrderTracking::query()->orderByDesc('id')->first();
+        $orderTracking_min = \App\OrderTracking::query()->where('logistic_id',0)->orderBy('id')->first();
+         if(!$maxId)return;
+        $maxId = $maxId->id;
+        $minId= $orderTracking_min->id;
+        $logistic = \App\Logistic::query()->where('name','新杰物流')->first();
+        $logistic_zt = \App\Logistic::query()->where('name','自提')->first();
+        for ($i=$minId;$i<= $maxId;$i+=100){
+            $orderTrackings = \App\OrderTracking::query()
+                ->where('id','>=',$i)
+                ->where('id','<=',$i+100)
+                ->where('logistic_id','=',0)
+                ->where('created_at','!=','0000-00-00 00:00:00')
                 ->get();
-            if ($orderIssue_unique->count() == 0) return;
-            foreach ($orderIssue_unique as $item) {
-                $orderIssue_delete = OrderIssue::withTrashed()->where('order_id', $item->order_id)->get();
-                /** @var OrderIssue $order_issue_unique */
-                $order_issue_unique = $orderIssue_delete->whereNull('deleted_at')->first();
-                if(!$order_issue_unique) $order_issue_unique = $orderIssue_delete->first();
-                $ids = [];
-                foreach ($orderIssue_delete as $key => $order_issue) {
-                    if ($order_issue->id == $order_issue_unique->id) continue;
-                    $ids[] = $order_issue->id;
-                    if ($order_issue['rejecting_status'] != '未退回') $order_issue_unique['rejecting_status'] = $order_issue['rejecting_status'];
-                    if ($order_issue['situation_explain']) $order_issue_unique['situation_explain'] = $order_issue['situation_explain'];
-                    if ($order_issue['order_issue_type_id']) $order_issue_unique['order_issue_type_id'] = $order_issue['order_issue_type_id'];
-                    if ($order_issue['second_order_id']) $order_issue_unique['second_order_id'] = $order_issue['second_order_id'];
-                    if ($order_issue['is_new_rejecting'] != '无') $order_issue_unique['is_new_rejecting'] = $order_issue['is_new_rejecting'];
-                    if ($order_issue['second_client_no']) $order_issue_unique['second_client_no'] = $order_issue['second_client_no'];
-                    if ($order_issue['final_status']) $order_issue_unique['final_status'] = $order_issue['final_status'];
-                    if ($order_issue['logistic_indemnity_money']) $order_issue_unique['logistic_indemnity_money'] = $order_issue['logistic_indemnity_money'];
-                    if ($order_issue['logistic_express_remission']) $order_issue_unique['logistic_express_remission'] = $order_issue['logistic_express_remission'];
-                    if ($order_issue['baoshi_indemnity_money']) $order_issue_unique['baoshi_indemnity_money'] = $order_issue['baoshi_indemnity_money'];
-                    if ($order_issue['baoshi_express_remission']) $order_issue_unique['baoshi_express_remission'] = $order_issue['baoshi_express_remission'];
-                    if ($order_issue['user_workgroup_id']) $order_issue_unique['user_workgroup_id'] = $order_issue['user_workgroup_id'];
-                    if ($order_issue['custom_code']) $order_issue_unique['custom_code'] = $order_issue['custom_code'];
-                    if ($order_issue['imported_status']) $order_issue_unique['imported_status'] = $order_issue['imported_status'];
+            if($orderTrackings->count() ==0) continue;
+            $update_params = [['id','logistic_id']];
+            $orderTrackings->each(function($orderTracking)use($logistic_zt,$logistic,&$update_params){
+                $order =$orderTracking->commodities->package->order;
+                $logistic_id = $order->logistic_id;
+                if($logistic_id!=null){
+                    if($order->logistic_id == $logistic_zt->id)$logistic_id = $logistic->id;
+                    if($logistic_id==0)dd($order,$logistic_id);
+                    $update_params[] = [
+                        'id' => $orderTracking->id,
+                        'logistic_id' => $logistic_id,
+                    ];
                 }
-                if ($order_issue_unique['deleted_at']) $order_issue_unique['deleted_at'] = null;
-                $order_issue_unique->save();
-                $order_issue_unique->同步退单状态();
-                OrderIssue:: withTrashed()->whereIn('id', $ids)->forceDelete();
-                app('LogService')->log(__METHOD__, __FUNCTION__, 'orders_toCombine:' . json_encode($order_issue_unique) . '|toBe OrderId: ' . json_encode($order_issue_unique->id));
-                $orderIssueProcessLogs = \App\OrderIssueProcessLog::query()->whereIn('order_issue_id', $ids)->get();
-                app('LogService')->log(__METHOD__, __FUNCTION__, 'delete order_issue processLogs:' . json_encode($orderIssueProcessLogs));
-                \App\OrderIssueProcessLog::query()->whereIn('order_issue_id', $ids)->forceDelete();
+            });
+            if(count($update_params) > 1){
+                $service->batchUpdate($update_params);
             }
         }
     }
+
+    public function testHz(){
+        dump('start'.Carbon::now()->toDateTimeString());
+        $ownerAreaReportTask=new CreateOwnerAreaReport();
+        $ownerAreaReportTask->handle();
+        $ownerBillReportTask= new CreateOwnerBillReport();
+        $ownerBillReportTask->handle();
+        $ownerReportTask= new CreateOwnerReport();
+        $ownerReportTask->handle();
+        dump('end'.Carbon::now()->toDateTimeString());
+    }
 }

app/Http/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\LogPostRequest;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -30,6 +31,7 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
+            LogPostRequest::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
@@ -40,10 +42,12 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
+            LogPostRequest::class,
 //            'throttle:60,1',
             'bindings',
         ],
         'apiLocal' => [
+            LogPostRequest::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,

app/Http/Middleware/LogPostRequest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Services\LogService;
+use Closure;
+
+class LogPostRequest
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if($request->method()!='GET'){
+            LogService::log($request->fullUrl(),$request->method(),
+                '请求：'.json_encode($request->all())
+                .'请求头：'.json_encode($request->headers->all())
+            );
+        }
+        return $next($request);
+    }
+}

app/Http/Requests/ForeignHaiRobotic_taskUpdateRequest.php

@@ -43,17 +43,6 @@ class ForeignHaiRobotic_taskUpdateRequest extends FormRequest
                 $validator->errors()->add('errMsg', json_encode($validator->errors()->messages(),JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES));
                 $validator->errors()->add('data',$validator->errors()->toJson(JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES));
             }
-
-            $errMsg=(function()use($validator){
-                if($validator->errors()->isEmpty())return '';
-                return $errMsg = '错误: '.$validator->errors()->toJson(JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
-            })();
-
-            LogService::log(__METHOD__,__FUNCTION__,
-                $errMsg??''
-                .'请求：'.json_encode($this->all())
-                .'调用堆栈：'.json_encode(array_slice(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),0,3))
-            );
         });
     }
 }

app/Imports/OrderIssueImport.php

@@ -9,6 +9,7 @@ use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderIssueType;
 use App\OrderPackage;
+use App\Services\OrderService;
 use App\Services\RejectedService;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
@@ -25,6 +26,9 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
 
     public function Collection(Collection $collection)
     {
+        /** @var OrderService $orderService */
+        $orderService = app('OrderService');
+
         $endIS = false;
         $headerRow =  $collection->toArray()[0];
         if (!isset($headerRow['原始运单号']) || !isset($headerRow['情况说明']) || !isset($headerRow['问题类别'])) {
@@ -34,7 +38,6 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
         }
         $exception = [];
         $sum = 2;
-        $orderService = app('OrderService');
         $rejectedService = new RejectedService();
         if ($endIS) {
             foreach ($collection as $row) {
@@ -75,20 +78,20 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
                         }
                     }
                 }
-                $client_no = null;$order_no = null;
+                $client_no = null;
+                $order_nos = [];
                 if ($count) {
                     $orderHeader = OracleDOCOrderHeader::query()->where('soreference5', $logistic_number)->first();
                     $client_no = $orderHeader['soreference1'];
-                    $order_no = $orderHeader['orderno'];
+                    $order_nos[] = $orderHeader['orderno'];
                 } else if ($detailCount) {
                     $detail = OracleActAllocationDetails::query()->where('picktotraceid', $logistic_number)->first();
                     $orderHeader = OracleDOCOrderHeader::query()->where('orderno', $detail['orderno'])->first();
                     $client_no = $orderHeader['soreference1'];
-                    $order_no = $orderHeader['orderno'];
+                    $order_nos[] = $orderHeader['orderno'];
                 }
-                $order = null;
-                if($order_no)$order = Order::query()->where('code',$order_no)->first();
-                if(!$order)$order = $orderService->findOrCreateByClientCode($client_no);
+                $orderService->syncOrderInfoByWmsOrderNos($order_nos);
+                $order = Order::query()->where('code',$order_nos[0])->first();
                 $orderIssue = OrderIssue::query()->where('order_id', $order['id'])->first();
                 $rejectedBill = $rejectedService->getRejectedByClientNo($client_no);
                 if ($orderIssue) {

app/InventoryAccount.php

@@ -7,8 +7,12 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 
-class InventoryAccount extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class InventoryAccount extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     use SoftDeletes;
     protected $fillable=[

app/InventoryAccountMission.php

@@ -6,8 +6,12 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
-class InventoryAccountMission extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class InventoryAccountMission extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'id','inventory_account_id','location','commodity_id', 'produced_at', 'valid_at','stored_at','batch_number','erp_type_position','quality','stored_amount','valid_amount',

app/InventoryBlindReceiveExcel.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Storage;
 
-class InventoryBlindReceiveExcel extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class InventoryBlindReceiveExcel extends Model
 {
+    use LogModelChanging;
+
     //
     protected $fillable = [
         'file','goods_amount','name'

app/InventoryCompare.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class InventoryCompare extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class InventoryCompare extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'owner_id','commodity_id', 'mission_code', 'source','custom_location','quality','amount_in_sys','amount_in_compare','differ','created_at',

app/InventoryDailyLog.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class InventoryDailyLog extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class InventoryDailyLog extends Model
 {
+    use LogModelChanging;
+
     public $timestamps=false;
     protected $fillable=[
         'owner_id','created_at','commodity_id','amount','volumn_occupied','gross_weight','depository_id'

app/InventoryDailyLoggingOwner.php

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

app/JobType.php

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

app/LaborCompany.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class LaborCompany extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class LaborCompany extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'id','name',

app/LaborReport.php

@@ -10,8 +10,12 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 
-class LaborReport extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class LaborReport extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     use SoftDeletes;
     protected $fillable=[

app/LaborReportStatus.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class LaborReportStatus extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class LaborReportStatus extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'id','status','labor_report_id','created_at',

app/Listeners/ModelChangedListener.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\ModelChangedEvent;
+use App\Services\LogService;
+
+class ModelChangedListener
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    public function handle(ModelChangedEvent $event)
+    {
+        $traces=json_encode(array_slice(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),6,config('exception.log.traceDepth.modelChange')));
+        preg_match('/Model.php.*?function\"\:\"(.*?)\"/', $traces, $result);
+        $methodName = $result[1]??'';
+        LogService::log(
+            get_class($event->model),
+            $methodName,
+            '对象：'.$event->model->toJson()
+            .'调用堆栈：'.$traces
+        );
+    }
+
+}

app/Log.php

@@ -7,11 +7,13 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Str;
 
-class Log extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Log extends Model
 {
     use ModelTimeFormat;
     protected $fillable = [
-        'operation', 'description','method', 'class', 'ip','id_user','created_at','updated_at'
+         'description','type','method', 'class', 'ip','id_user','created_at','updated_at'
     ];
     function user(): HasOne
     {

app/Logistic.php

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

app/LogisticNumberFeature.php

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

app/LogisticTiming.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class LogisticTiming extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class LogisticTiming extends Model
 {
+    use LogModelChanging;
+
     //
     protected $fillable = [
         'logistic_id','to_province_id','to_city_id','days_at_working'

app/MaterialBox.php

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

app/MeasuringMachine.php

@@ -7,8 +7,12 @@ use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Support\Carbon;
 
-class MeasuringMachine extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class MeasuringMachine extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'name','code','status',

app/Menu.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class Menu extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Menu extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'name','level', 'parent_id', 'route','sequence',

app/ModelExtended.php

@@ -1,47 +0,0 @@
-<?php
-
-
-namespace App;
-
-use App\Services\LogService;
-use Illuminate\Database\Eloquent\Model;
-
-class ModelExtended extends Model
-{
-    protected $isNotLogging=[
-        Log::class
-    ];
-    private $isShouldLog=null;
-    protected function log($input=''):bool{
-        if($this->isShouldLog===null)
-            $this->isShouldLog
-                =array_search(get_class($this),$this->isNotLogging)===false;
-        if(!$this->isShouldLog)return false;
-        $traces=json_encode(array_slice(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),0,5));
-        preg_match('/\"function\"\:\".*?"function\"\:\"(.*?)\"\,\"class\"\:\".*?\"/', $traces, $result);
-        $methodName = $result[1]??'';
-        LogService::log(get_class($this),$methodName,
-            '对象：'.$this->toJson()
-            .'参数：'.json_encode([$input])
-            .'调用堆栈：'.$traces
-        );
-
-        return $this->isShouldLog;
-    }
-
-    function save(array $options = [])
-    {
-        $this->log($options);
-        return parent::save($options); // TODO: Change the autogenerated stub
-    }
-    function update(array $attributes = [], array $options = [])
-    {
-        $this->log([$attributes, $options]);
-        return parent::update($attributes, $options); // TODO: Change the autogenerated stub
-    }
-    public function delete()
-    {
-        $this->log();
-        return parent::delete(); // TODO: Change the autogenerated stub
-    }
-}

app/OperatorLog.php

@@ -5,8 +5,12 @@ namespace App;
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
-class OperatorLog extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OperatorLog extends Model
 {
+    use LogModelChanging;
+
     const UPDATED_AT = null;
     protected $fillable=[
         'operator_logable_type','operator_logable_id','user_id','operation'

app/OracleActAllocationDetails.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleActAllocationDetails extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleActAllocationDetails extends Model
 {
+    use LogModelChanging;
+
     protected $connection="oracle";
     protected $primaryKey="ALLOCATIONDETAILSID";
     protected $table="act_allocation_details";

app/OracleActTransactionLog.php

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

app/OracleBasCode.php

@@ -9,8 +9,12 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   BAS_Codes
  * EXPLAIN: 系统代码内容
  */
-class OracleBasCode extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleBasCode extends Model
 {
+    use LogModelChanging;
+
     protected $connection="oracle";
     protected $table="BAS_CODES";
     /*

app/OracleBasCustomer.php

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

app/OracleBasSKU.php

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

app/OracleDOCASNDetail.php

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

app/OracleDOCASNHeader.php

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

app/OracleDOCMovementDetail.php

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

app/OracleDOCMovementHeader.php

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

app/OracleDOCOrderDetail.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OracleDOCOrderDetail extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleDOCOrderDetail extends Model
 {
+    use LogModelChanging;
+
     protected $connection="oracle";
     protected $table="DOC_Order_Details";
     protected $fillable = ['sku','customerId'];

app/OracleDOCOrderHeader.php

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

app/OracleDOCWaveDetails.php

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

app/OracleDOCWaveHeader.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class OracleDOCWaveHeader extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleDOCWaveHeader extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'WAVENO','ROUTE','TRANSPORTATION','ORDERTYPE','PRIORITY','WCSSENDFLAG','WCSSENDTIME','WCSSENDDESCR','DESCR','USERDEFINE1','USERDEFINE2','USERDEFINE3','USERDEFINE4','USERDEFINE5','RELEASESTATUS','WAVESTATUS','ADDTIME','ADDWHO','EDITTIME','EDITWHO','EDISENDTIME','WAREHOUSEID','CUSTOMERID','CUBIC','GROSSWEIGHT','TASKDISPATCH','CROSSAREA','TASKSTATUS','WAVERULE','CARRIERID','GROUPNUMBER','SORTATIONTYPE','UDFPRINTFLAG1','UDFPRINTFLAG2','UDFPRINTFLAG3','WORKINGAREA','WAVEDISPATCHID','WAVEGROUPNO','WAVEGROUPPRINTFLAG','WAV_TSK_MGM','ASSORTINGID'

app/OracleDocOrderPackingSummary.php

@@ -6,8 +6,12 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OracleDocOrderPackingSummary extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleDocOrderPackingSummary extends Model
 {
+    use LogModelChanging;
+
     protected $connection="oracle";
     protected $primaryKey="traceid";
     protected $table = 'doc_order_packing_summary';

app/OracleIdxAsrsReceive.php

@@ -6,8 +6,12 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OracleIdxAsrsReceive extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleIdxAsrsReceive extends Model
 {
+    use LogModelChanging;
+
     protected $connection="oracle";
     protected $primaryKey="GROUPTASKID";
     protected $table = 'idx_asrs_receive';

app/OracleInvLotAtt.php

@@ -9,12 +9,20 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   INV_LOT_ATT
  * EXPLAIN: 批次属性
  */
-class OracleInvLotAtt extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OracleInvLotAtt extends Model
 {
+    use LogModelChanging;
+
+    public function __construct(array $attributes = [])
+    {
+        $this->timestamps=false;
+        parent::__construct($attributes);
+    }
 
     protected $connection="oracle";
     protected $table="INV_LOT_ATT";
-    public $timestamps=false;
     /*
      * column: LotAtt05 属性仓
      *         LotAtt08 质量状态

app/OracleInvLotLocId.php

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

app/Order.php

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

app/OrderBin.php

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

app/OrderCommodity.php

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

app/OrderCommodityAssign.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderCommodityAssign extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OrderCommodityAssign extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable = [
         "order_id",         //外键订单

app/OrderCountingRecord.php

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

app/OrderIssue.php

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

app/OrderIssueOnTop.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderIssueOnTop extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OrderIssueOnTop extends Model
 {
+    use LogModelChanging;
+
     //
     use ModelTimeFormat;
 

app/OrderIssueProcessLog.php

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

app/OrderIssueType.php

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

app/OrderPackage.php

@@ -13,8 +13,12 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
-class OrderPackage extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OrderPackage extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
 
     protected $fillable = ['order_id','logistic_number','batch_number',

app/OrderPackageCommodities.php

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

app/OrderTracking.php

@@ -5,12 +5,17 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderTracking extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OrderTracking extends Model
 {
+    use LogModelChanging;
+
 
     use ModelTimeFormat;
     protected $fillable = [
-        'order_package_commodity_id','owner_id','web_order_number',
+        'order_package_commodity_id','owner_id','logistic_id',
+        'web_order_number',
         'pick_up_at','sale','client','order_client_code',
         'order_remark','pallet_total','planning_sent_at',
         'is_on_duty_shift','is_arrival','signed_at',
@@ -45,6 +50,9 @@ class OrderTracking extends ModelExtended
     public function owner(){
         return $this->hasOne(Owner::class,'id','owner_id');
     }
+    public function logistic(){
+        return $this->hasOne(Logistic::class,'id','logistic_id');
+    }
     public function uploadFile()
     {
         return $this->hasOne(UploadFile::class,'table_id','order_client_code')->where('table_name','order_trackings');

app/OrderTrackingOwner.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-class OrderTrackingOwner extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OrderTrackingOwner extends Model
 {
+    use LogModelChanging;
+
     //
     use ModelTimeFormat;
     protected $fillable = ['owner_id','status'];

app/Owner.php

@@ -11,8 +11,12 @@ use Illuminate\Support\Facades\Auth;
  */
 use App\Traits\ModelTimeFormat;
 
-class Owner extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Owner extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     public $fillable = [
         'name',                 //名称

app/OwnerAreaReport.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerAreaReport extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerAreaReport extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "owner_id",             //货主ID
         "counting_month",       //结算月

app/OwnerBillReport.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerBillReport extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerBillReport extends Model
 {
+    use LogModelChanging;
+
    protected $fillable = [
        "owner_id",       //项目ID
        "counting_month", //结算月

app/OwnerContract.php

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

app/OwnerFeeDetail.php

@@ -5,8 +5,12 @@ namespace App;
 use App\Services\ProcessMethodService;
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerFeeDetail extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerFeeDetail extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "owner_id",         //货主ID
         "worked_at",        //作业时间

app/OwnerInStorageRule.php

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

app/OwnerOutStorageRule.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerOutStorageRule extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerOutStorageRule extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "owner_price_operation_id",         //作业计费ID
         "strategy",                         //出库策略

app/OwnerPriceDirectLogistic.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OwnerPriceDirectLogistic extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerPriceDirectLogistic extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "name",     //名称
         "base_km"   //起步公里数

app/OwnerPriceDirectLogisticCar.php

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

app/OwnerPriceExpress.php

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

app/OwnerPriceExpressProvince.php

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

app/OwnerPriceLogistic.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
-class OwnerPriceLogistic extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerPriceLogistic extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "name",             //名称
         "unit_range",       //单价一区间

app/OwnerPriceLogisticDetail.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceLogisticDetail extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerPriceLogisticDetail extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "owner_price_logistic_id",  //物流计费
         "unit_id",                  //单位ID

app/OwnerPriceOperation.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerPriceOperation extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerPriceOperation extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "operation_type",   //操作类型
         "name",             //名称

app/OwnerReport.php

@@ -6,8 +6,12 @@ use App\Traits\ModelTimeFormat;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerReport extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerReport extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable = [
         "owner_id",                     //货主ID

app/OwnerStoragePriceModel.php

@@ -4,8 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class OwnerStoragePriceModel extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class OwnerStoragePriceModel extends Model
 {
+    use LogModelChanging;
+
     protected $fillable = [
         "counting_type",    //计费类型
         "using_type",       //用仓类型

app/OwnerStoragePriceModelOwner.php

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

app/Package.php

@@ -10,8 +10,12 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 
-class Package extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Package extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'owner_id','logistic_number','delivery_number','batch_number','batch_rule','recipient','recipient_mobile','logistic_id',

app/PaperBox.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class PaperBox extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class PaperBox extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'model','length','width','height',

app/Process.php

@@ -7,8 +7,12 @@ use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 
-class Process extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class Process extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     use SoftDeletes;
     protected $fillable=[

app/ProcessDaily.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessDaily extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class ProcessDaily extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'process_id','date','output','remain'

app/ProcessDailyParticipant.php

@@ -6,8 +6,12 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessDailyParticipant extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class ProcessDailyParticipant extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     protected $fillable=[
         'process_daily_id','user_id','started_at','ended_at','hour_price',

app/ProcessMethod.php

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

app/ProcessStatistic.php

@@ -5,8 +5,12 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-class ProcessStatistic extends ModelExtended
+use App\Traits\LogModelChanging;
+
+class ProcessStatistic extends Model
 {
+    use LogModelChanging;
+
     use ModelTimeFormat;
     //重新约定主键且不允许自增
     protected $primaryKey='process_id';