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

app/AuditLog.php

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

app/Authority.php

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

app/Batch.php

@@ -4,11 +4,11 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class Batch extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable = [
         'id','code','type', 'wms_type', 'status', 'wms_status', 'wms_created_at',"remark","owner_id",
@@ -41,5 +41,17 @@ class Batch extends Model
     {
         return $this->hasOne(Owner::class,"id","owner_id");
     }
+    public function stationBatchTask()
+    {
+        return $this->hasOne(StationTaskBatch::class);
+    }
+    public function stationTask()
+    {
+
+        return $this->stationBatchTask?
+            $this->stationBatchTask->belongsTo(StationTask::class):
+            null;
+    }
+
 
 }

app/CarType.php

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

app/Carrier.php

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

app/City.php

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

app/Commodity.php

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

app/CommodityBarcode.php

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

app/Console/Commands/MakeTestCommand.php

@@ -22,8 +22,7 @@ class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
             ||$this->option('controllers')) {
             return $rootNamespace.'\Controllers';
         }
-        if ($this->option('services')
-            ||$this->option('service')) {
+        if ($this->isForService()) {
             return $rootNamespace.'\Services\\'
                 .$this->getServiceName()
                 ;
@@ -35,9 +34,20 @@ class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
         }
     }
 
+    protected function isForService()
+    {
+        if ($this->option('services')
+            ||$this->option('service')) {
+            return true;
+        }
+        return false;
+    }
     protected function getNameInput()
     {
         $input= trim($this->argument('name'));
+        if(!$this->isForService()){
+            return $input;
+        }
         $inputs = explode(':', $input);
         return $inputs[1]
             ?$this->getMethodName()
@@ -47,16 +57,22 @@ class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
     protected function getServiceName()
     {
         $input= trim($this->argument('name'));
+        if(!$this->isForService()){
+            return $input;
+        }
         return ucfirst(explode(':',$input)[0]);
     }
     protected function getModelName()
     {
         $input= trim($this->argument('name'));
+        if(!$this->isForService()){
+            return $input;
+        }
         return str_replace('Service','',(explode(':',$input)[0]));
     }
     protected function getModelNamePlural()
     {
-        $modelName=preg_replace('/(s|x|ch|sh)$/','ses',lcfirst($this->getModelName()));
+        $modelName=preg_replace('/(s|x|ch|sh)$/','$1es',lcfirst($this->getModelName()));
         $modelName=preg_replace('/y$/','ies',$modelName);
         $modelName=preg_replace('/[cC]hild$/','children',$modelName);
         if(preg_match('/[cC]hildren$/',$modelName)==0){
@@ -67,6 +83,9 @@ class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
     protected function getMethodName()
     {
         $input= trim($this->argument('name'));
+        if(!$this->isForService()){
+            return $input;
+        }
         return ucfirst(explode(':',$input)[1]).'Test';
     }
 
@@ -92,7 +111,7 @@ class MakeTestCommand extends \Illuminate\Foundation\Console\TestMakeCommand
         $stub = str_replace(['{{ serviceName }}', '{{serviceName}}'], $this->getServiceName(), $stub);
         $stub = str_replace(['{{ modelName }}', '{{modelName}}'], $this->getModelName(), $stub);
         $stub = str_replace(['{{ modelNameUc }}', '{{modelNameUc}}'], ucfirst($this->getModelName()), $stub);
-        $stub = str_replace(['{{ modelNamePlural }}', '{{modelNamePlural}}'], ucfirst($this->getModelNamePlural()), $stub);
+        $stub = str_replace(['{{ modelNamePlural }}', '{{modelNamePlural}}'], lcfirst($this->getModelNamePlural()), $stub);
 
         return str_replace(['DummyClass', '{{ class }}', '{{class}}'], $class, $stub);
     }

app/Console/Commands/SyncBatchTask.php

@@ -257,10 +257,9 @@ sql;
                 }
             }
         }
-
-         $this->batchService->assignTasks($batches);    //在这里为波次注册任务！
-
         ValueStore::query()->where("name","wave_detail_last_sync_date")->update(["value"=>$details[count($details)-1]->edittime]);
+
+        $this->batchService->assignTasks($batches);    //在这里为波次注册任务！
     }
 
     /**

app/CustomField.php

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

app/Customer.php

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

app/CustomerLog.php

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

app/CustomerLogStatus.php

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

app/CustomerTag.php

@@ -5,11 +5,11 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class CustomerTag extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
 

app/Depository.php

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

app/Feature.php

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

app/Http/Controllers/StationController.php

@@ -20,7 +20,7 @@ class StationController extends Controller
     }
     public function monitorIndex()
     {
-        $stations = Station::query()->with('type:name','parent:name')->whereHas('type',function($query){
+        $stations = Station::query()->with('stationType:name','parent:name')->whereHas('stationType',function($query){
             /** @var Builder $query */
             $query->where('name','料箱监视器');
         })->paginate(100);

app/Http/Controllers/TestController.php

@@ -85,6 +85,7 @@ use App\Services\ShopService;
 use App\Services\StoreService;
 use App\Services\WarehouseService;
 use App\StationRuleBatch;
+use App\StationTask;
 use App\Store;
 use App\StationTaskBatch;
 use App\StoreCheckingReceiveItem;
@@ -290,7 +291,8 @@ sql;
 
     function tlog(Request $request)
     {
-        app('LogService')->log(__METHOD__, 'cczdelme' . __FUNCTION__, json_encode($request->all()), null);
+        $user = User::query()->first();
+        $user->update();
     }
 
     function setCache(Request $request)
@@ -308,9 +310,7 @@ sql;
 
     function t1(Request $request)
     {
-        throw new ErrorException('eeeff');
-        DB::connection('oracle')->update(DB::raw("update BAS_SKU set HAZARD_FLAG= 'N' where SKU= '13564151055'"));
-//        DB::connection('oracle')->update(DB::raw("UPDATE DOC_ORDER_HEADER SET notes = CASE WHEN notes IS NULL THEN '停运' ELSE  notes||',停运' END where ORDERNO in ('','SO190628000050','SO190628000001')"));
+//        StationTask::query()->create(['status'=>'待处理']);
     }
 
     function packageT(Request $request)

app/InventoryAccount.php

@@ -7,11 +7,11 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class InventoryAccount extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     use SoftDeletes;

app/InventoryAccountMission.php

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

app/InventoryBlindReceiveExcel.php

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

app/InventoryCompare.php

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

app/InventoryDailyLog.php

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

app/InventoryDailyLoggingOwner.php

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

app/JobType.php

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

app/LaborCompany.php

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

app/LaborReport.php

@@ -10,11 +10,11 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class LaborReport extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     use SoftDeletes;

app/LaborReportStatus.php

@@ -5,11 +5,11 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class LaborReportStatus extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     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;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class Log extends Model
 {

app/Logistic.php

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

app/LogisticNumberFeature.php

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

app/LogisticTiming.php

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

app/MailEvent.php

@@ -4,12 +4,12 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class MailEvent extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable = ['name', 'event_name', 'remark', 'is_active', 'template'];
 

app/MaterialBox.php

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

app/MeasuringMachine.php

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

app/Menu.php

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

app/OperatorLog.php

@@ -5,11 +5,11 @@ namespace App;
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OperatorLog extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     const UPDATED_AT = null;
     protected $fillable=[

app/OracleActAllocationDetails.php

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

app/OracleActTransactionLog.php

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

app/OracleBasCode.php

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

app/OracleBasCustomer.php

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

app/OracleBasSKU.php

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

app/OracleDOCASNDetail.php

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

app/OracleDOCASNHeader.php

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

app/OracleDOCMovementDetail.php

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

app/OracleDOCMovementHeader.php

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

app/OracleDOCOrderDetail.php

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

app/OracleDOCOrderHeader.php

@@ -8,11 +8,11 @@ use App\Traits\HasCompositePrimaryKey;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OracleDOCOrderHeader extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     protected $connection="oracle";

app/OracleDOCWaveDetails.php

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

app/OracleDOCWaveHeader.php

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

app/OracleDocOrderPackingSummary.php

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

app/OracleIdxAsrsReceive.php

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

app/OracleInvLotAtt.php

@@ -9,11 +9,11 @@ use Illuminate\Database\Eloquent\Model;
  * TABLE:   INV_LOT_ATT
  * EXPLAIN: 批次属性
  */
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OracleInvLotAtt extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     public function __construct(array $attributes = [])
     {

app/OracleInvLotLocId.php

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

app/Order.php

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

app/OrderBin.php

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

app/OrderCommodity.php

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

app/OrderCommodityAssign.php

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

app/OrderCountingRecord.php

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

app/OrderFreeze.php

@@ -5,11 +5,11 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OrderFreeze extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     use ModelTimeFormat;
 
     protected $fillable = [

app/OrderIssue.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 /**
  * @method Builder filter
@@ -16,7 +16,7 @@ use App\Traits\LogModelChanging;
 
 class OrderIssue extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     //
     use ModelTimeFormat;

app/OrderIssueOnTop.php

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

app/OrderIssueProcessLog.php

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

app/OrderIssueRejectedBill.php

@@ -4,11 +4,11 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OrderIssueRejectedBill extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     protected $table='order_issue_rejected_bill';
     protected $fillable = [
         'order_issue_id','logistic_number_return'

app/OrderIssueType.php

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

app/OrderPackage.php

@@ -14,11 +14,11 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OrderPackage extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
 

app/OrderPackageCommodities.php

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

app/OrderPackageCountingRecord.php

@@ -4,11 +4,11 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OrderPackageCountingRecord extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable=[
         "targeted_at","un_weigh_count","total_count"

app/OrderTracking.php

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

app/OrderTrackingOwner.php

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

app/Owner.php

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

app/OwnerAreaReport.php

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

app/OwnerBillReport.php

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

app/OwnerContract.php

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

app/OwnerFeeDetail.php

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

app/OwnerPriceDirectLogistic.php

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

app/OwnerPriceDirectLogisticCar.php

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

app/OwnerPriceExpress.php

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

app/OwnerPriceExpressProvince.php

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

app/OwnerPriceLogistic.php

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

app/OwnerPriceLogisticDetail.php

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

app/OwnerPriceOperation.php

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

app/OwnerPriceOperationItem.php

@@ -4,11 +4,11 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OwnerPriceOperationItem extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable = [
         "owner_price_operation_id",         //作业计费ID

app/OwnerReport.php

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

app/OwnerStoragePriceModel.php

@@ -4,11 +4,11 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class OwnerStoragePriceModel extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable = [
         "name",             //名称

app/OwnerStoragePriceModelOwner.php

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

app/Package.php

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

app/PaperBox.php

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

app/Process.php

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

app/ProcessDaily.php

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

app/ProcessDailyParticipant.php

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

app/ProcessMethod.php

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

app/ProcessStatistic.php

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

app/ProcessesContent.php

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

app/Province.php

@@ -5,11 +5,11 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class Province extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     protected $fillable=[

app/QualityLabel.php

@@ -9,11 +9,11 @@ use Illuminate\Database\Eloquent\Model;
  * @method static Builder orderBy(string $string, string $string1)
  */use App\Traits\ModelTimeFormat;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class QualityLabel extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     protected $fillable = ['name'];

app/Region.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  */
 class Region extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     use SoftDeletes;
 
     public $timestamps=false;

app/Rejected.php

@@ -9,11 +9,11 @@ use Illuminate\Database\Eloquent\Model;
  * @method static Builder orderBy(string $string, string $string1)
  */use App\Traits\ModelTimeFormat;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class Rejected extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     use ModelTimeFormat;
     protected $fillable=['id_owner','order_number','sender','mobile_sender',

app/RejectedAnalyzeOwner.php

@@ -8,11 +8,11 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class RejectedAnalyzeOwner extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
 
     /**