Merge branch 'master' into zzd

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 stationTaskBatch()
+    {
+        return $this->hasOne(StationTaskBatch::class);
+    }
+    public function stationTask()
+    {
+
+        return $this->stationTaskBatch?
+            $this->stationTaskBatch->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/MakeModelCommand.php

@@ -4,6 +4,9 @@
 namespace App\Console\Commands;
 
 
+use Illuminate\Support\Str;
+use Symfony\Component\Console\Input\InputOption;
+
 class MakeModelCommand extends \Illuminate\Foundation\Console\ModelMakeCommand
 {
     protected function getStub()
@@ -13,5 +16,34 @@ class MakeModelCommand extends \Illuminate\Foundation\Console\ModelMakeCommand
         }
         return __DIR__ . '/stubs/model.stub';
     }
+    public function handle()
+    {
+        if (parent::handle() === false && ! $this->option('force')) {
+            return false;
+        }
+
+        if ($this->option('all')) {
+            $this->input->setOption('service', true);
+        }
+
+        if ($this->option('service')) {
+            $this->createService();
+        }
+    }
+    public function createService()
+    {
+        $modelName = Str::studly(class_basename($this->argument('name')));
+
+        $this->call('make:service', [
+            'name' => "{$modelName}Service",
+        ]);
+    }
+
+    protected function getOptions(): array
+    {
+        $options= parent::getOptions();
+        $options[]=['service', 'sv', InputOption::VALUE_NONE, 'Create a new service file'];
+        return $options;
+    }
 
 }

app/Console/Commands/MakeServiceCommand.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands;
 
 use App\Traits\ServiceAppAop;
 use Illuminate\Console\Command;
+use Illuminate\Support\Str;
 
 class MakeServiceCommand extends Command
 {
@@ -13,7 +14,7 @@ class MakeServiceCommand extends Command
      * @var string
      */
     protected $signature = 'make:service
-    {--provider : Register in the provider}
+    {--noProvider : Register in the provider}
     {name : fileName}';
 
     /**
@@ -43,7 +44,16 @@ class MakeServiceCommand extends Command
         if (!file_exists(base_path('app\\Services'))){
             mkdir('app\\Services',666,false);
         }
-        $fileName=$this->argument('name');
+        preg_match('/(.*?)Service/',$this->argument('name'),$resultNames);
+        var_dump($this->argument('name'),$resultNames);
+        if(count($resultNames)==0) {
+            $fileName = $this->argument('name');
+            $modelName = $this->argument('name');
+        }else{
+            $fileName=$resultNames[0];
+            $modelName=Str::studly($resultNames[1]);
+        }
+
         if (!file_exists(base_path('app\\Services\\'.$fileName.'.php'))){
             file_put_contents(base_path('app\\Services\\'.$fileName.'.php'),
                 '<?php '
@@ -54,6 +64,8 @@ class MakeServiceCommand extends Command
                 .PHP_EOL
                 .'use App\Traits\ServiceAppAop;'
                 .PHP_EOL
+                .'use App\\'.$modelName.';'
+                .PHP_EOL
                 .PHP_EOL
                 .'class '.$fileName
                 .PHP_EOL
@@ -61,11 +73,13 @@ class MakeServiceCommand extends Command
                 .PHP_EOL
                 .'    use ServiceAppAop;'
                 .PHP_EOL
+                .'    protected $modelClass='.$modelName.'::class;'
+                .PHP_EOL
                 .PHP_EOL.
                 '}');
         }
         else $this->error("ERROR: file exists;");
-        if ($this->option("provider")){
+        if (!$this->option("noProvider")){
             $path = base_path("app\\Providers\\AppServiceProvider.php");
             $i = 0;
             $fop = fopen($path,"r+");
@@ -107,4 +121,5 @@ class MakeServiceCommand extends Command
         }
         $this->info("File create success!");
     }
+
 }

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/Console/Commands/stubs/model.stub

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

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/OrderIssueController.php

@@ -9,6 +9,7 @@ use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
+use App\OrderIssueRejectedBill;
 use App\OrderIssueType;
 use App\Owner;
 use App\QualityLabel;
@@ -67,16 +68,19 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-订单问题件生成')) {
             return redirect(url('/'));
         }
-        /** @var OrderIssueService $orderIssueService */
+        /**
+         * @var OrderIssueService $orderIssueService
+         * @var OrderIssue $orderIssue
+         */
         $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
-        $orderIssue = null;
-        if ($request->filled('logistic_number_return')) {
-            $orderIssue = $orderIssueService->createByLogisticNumber($request->all());
-        } else {
-            $orderIssue = $orderIssueService->create($request->all());
+        $orderIssue = $orderIssueService->create($request->all());
+        if($request->has('logistic_number_return') && !OrderIssueRejectedBill::isExit($orderIssue->id,$request['logistic_number_return'])){
+            $orderIssue->joinRejectedBill($request['logistic_number_return']);
         }
-        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '创建订单问题件', 'type' => '创建']);
+        $orderIssue->loadMissing('orderIssueRejectedBills');
+        $orderIssue->syncRejectingStatus();
+        OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => $request['content'], 'type' => '创建']);
         return redirect('order/issue/index');
     }
 
@@ -305,21 +309,11 @@ class OrderIssueController extends Controller
         if (!$request->filled('logisticNumberReturn')) {
             return ['success' => false, 'fail_info' => '缺少对应的参数或条件'];
         }
-        $logisticNumberReturn = $request->input('logisticNumberReturn');
-        $rejectedBill = RejectedBill::with('items')->where('logistic_number_return', $logisticNumberReturn)->first();
-        if ($rejectedBill) {
-            $orderIssue = OrderIssue::query()->where('rejected_bill_id', $rejectedBill->id)->first();
-
-            if ($orderIssue) {
-                return ['success' => false, 'fail_info' => '该退回单号已有对应的问题件'];
-            } else {
-                $orderService = app('OrderService');
-                $order = $orderService->findOrCreteByLogisticNumberReturn($logisticNumberReturn);
-                return ['success' => true, 'order' => $order, 'rejectedBill' => $rejectedBill];
-            }
-        } else {
-            return ['success' => true, 'meg' => '没有对应的退回单号，不与WMS同步'];
-        }
+        $rejectedBill = RejectedBill::query()->with('items')->where('logistic_number_return', $request['logisticNumberReturn'])->first();
+        if(!$rejectedBill) return ['success' => true, 'message' => '没有对应的退回单号，不与WMS同步'];
+        $exists = OrderIssueRejectedBill::query()->where('logistic_number_return',$request['logisticNumberReturn'])->exists();
+        if($exists)return ['success' => false, 'fail_info' => '该退回单号已有对应的问题件'];
+        return ['success' => true, 'rejectedBill' => $rejectedBill];
     }
 
     public function isExistByOrderNoApi(Request $request){

app/Http/Controllers/OwnerController.php

@@ -58,8 +58,6 @@ class OwnerController extends Controller
         $this->validatorCreate($request->all())->validate();
         $owner = new Owner($request->all());
         $owner->save();
-//        event(new CustomerStoreEvent($owner));
-        event(new CustomerStored($owner));
         $authority = new Authority([
             'name' => "_{$owner['id']}",
             'alias_name' => "(货主：{$owner['name']})",

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/StoreController.php

@@ -7,7 +7,7 @@ use App\Owner;
 use App\Services\common\BatchUpdateService;
 use App\Services\StoreService;
 use App\Store;
-use App\StoreItems;
+use App\StoreItem;
 use App\Warehouse;
 use App\WMSReflectReceive;
 use Carbon\Carbon;
@@ -140,7 +140,7 @@ class StoreController extends Controller
                         }
                         return $depository;
                     })();
-                    $storeItem=new StoreItems([
+                    $storeItem=new StoreItem([
                         'store_id'=>$store->id,
                         'asn_line_code'=>$sku->ASNLINENO,
                         'name'=>$sku->SKUDESCRC,

app/Http/Controllers/StoreItemsController.php → app/Http/Controllers/StoreItemController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\StoreItems;
+use App\StoreItem;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Response;
 use Illuminate\View\View;
 
-class StoreItemsController extends Controller
+class StoreItemController extends Controller
 {
     /**
      * Display a listing of the resource.
@@ -17,7 +17,7 @@ class StoreItemsController extends Controller
      */
     public function index()
     {
-        $storeItems=StoreItems::query()->with('store')
+        $storeItems=StoreItem::query()->with('store')
             ->whereHas('store',function($query){
                 $query->where('is_fast_stored','快速入库');
             })

app/Http/Controllers/TestController.php

@@ -19,6 +19,7 @@ use App\Console\Commands\WasSyncWmsAsnInformation;
 use App\Exceptions\ErrorException;
 use App\Events\CancelOrder;
 use App\Events\SendEmailEvent;
+use App\Exceptions\Exception;
 use App\Http\Requests\ForeignHaiRobotic_taskUpdateRequest;
 use App\Http\Requests\TestAaRequest;
 use App\Imports\OrderTrackingImport;
@@ -87,10 +88,11 @@ 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;
-use App\StoreItems;
+use App\StoreItem;
 use App\Unit;
 use App\User;
 use App\ValueStore;
@@ -291,7 +293,7 @@ sql;
 
     function tlog(Request $request)
     {
-        app('LogService')->log(__METHOD__, 'cczdelme' . __FUNCTION__, json_encode($request->all()), null);
+         dd((User::class)::query()->first());
     }
 
     function setCache(Request $request)
@@ -309,9 +311,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)
@@ -803,8 +803,20 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function output2()
     {
-        dump(Cache::get('aa'));
-        Cache::put('aa', '2223', 5);
+        StationTaskBatch::query()->insert([[
+            'batch_id' => 41414351,
+            'station_id' => 4131251,
+            'station_task_batch_type_id' => 1231231251,
+            'status' => '待处理',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]]);
+//        (new StationTaskBatch([
+//            'batch_id' => 41414324,
+//            'station_id' => 4131224,
+//            'station_task_batch_type_id' => 123123124,
+//            'status' => '待处理'
+//        ]))->save();
     }
 
     public function usage()
@@ -1069,6 +1081,7 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
 
     public function testSyncOrderTask()
     {
+        Cache::flush();
         dump('hendle...');
         dump((string)Carbon::now());
         dump(memory_get_usage() / 1024 / 1024);
@@ -1106,11 +1119,11 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     public function testUpdateSkuNameBarcodeToCommodity_id()
     {
         $amount = 1000;
-        $storeItem = StoreItems::query()->orderByDesc('id')->first();
+        $storeItem = StoreItem::query()->orderByDesc('id')->first();
         $sum = $storeItem->id;
         $number = ceil($sum / $amount);
         for ($i = 0; $i < $number; $i++) {
-            $storeItems = StoreItems::query()->with('store')
+            $storeItems = StoreItem::query()->with('store')
                 ->where('id', '>=', $i * $amount)
                 ->where('id', '<', ($i * $amount + $amount))
                 ->get();
@@ -1481,21 +1494,19 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             });
     }
 
-//    public function testNumber()
-//    {
-//        $asnnos=['ASN2101200684','ASN2101220543','ASN2101220542'];
-//        $asnHeaders=OracleDOCASNHeader::query()->whereIn('asnno',$asnnos)->get();
-//        /**
-//         * @var RejectedBillService $rejectedBillService
-//         */
-//        $rejectedBillService=app(RejectedBillService::class);
-//
-//        $updates = $rejectedBillService->getNeedUpdateCheckedStatusByWms($asnHeaders);
-//        app(BatchUpdateService::class)->batchUpdate('rejected_bills', $updates);
-//        dump($updates);
-//        //$logisticNumberReturn = $rejectedBillService->getLogisticNumberReturn($arr);
-//        //$rejectedBills = $rejectedBillService->getRejectedBills($logisticNumberReturn);
-//    }
+    public function testCarbon()
+    {
+        $month_begin = date('Y-m-01 00:00:00');
+        dump($month_begin);
+        dd(Carbon::parse($month_begin)->isAfter(Carbon::parse('2020-12-01 00:00:00')));
+    }
+
+    public function testGet()
+    {
+        $service = new OrderService();
+        $count = $service->getCurrentFinishedOrders_byOwnerId(7);
+        dd($count);
+    }
 
     public function updateRejectBillCheckedStatus()
     {
@@ -1512,4 +1523,16 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         app(BatchUpdateService::class)->batchUpdate('rejected_bills', $updates);
         }
     }
+
+    public function clearCancelledOrder()
+    {
+        $wave_nos = ['W210129000248','W210202000216','W210202000251','W210202000216','W210202000282'];
+        $order_nos = ['SO210129004112' , 'SO210202003333','SO210202003333','SO210202003236','SO210202003247','SO210202003719'];
+        try {
+            OracleDOCWaveDetails::query()->whereIn('WaveNo',$wave_nos)->whereIn('OrderNo', $order_nos)->delete();
+            app('LogService')->log(__CLASS__, __METHOD__, 'Delete OracleDOCWaveDetails' . '  ' . json_encode($order_nos).json_encode($wave_nos));
+        } catch (Exception $e) {
+            app('LogService')->log(__CLASS__, __METHOD__,'Error clearCancelledOrder'.json_encode($order_nos).json_encode($wave_nos));
+        }
+    }
 }

app/Http/Controllers/WeighController.php

@@ -103,9 +103,9 @@ class WeighController extends Controller
             if(!$package->paper_box_id)$package->paper_box_id=$paper_box_id;
             $result=$accomplishToWMS->accomplishToWMS($package);
             if ($result['result']){
-                $package->status="已上传";
+                $package->uploaded_to_wms="是";
             }else{
-                $package->status="上传异常";
+                $package->uploaded_to_wms="异常";
             }
             $package->save();
             app('LogService')->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
@@ -117,7 +117,7 @@ class WeighController extends Controller
             $package = app('OrderPackageService')->firstOrCreate($logistic_number,[
                 'weight'=>$weight,
                 'weighed_at'=>Carbon::now(),
-                'status'=>"已上传",
+                'uploaded_to_wms'=>"是",
             ]);
             $package->fetchAllFromOracle();
             $result=$accomplishToWMS->accomplishToWMS($package);
@@ -125,7 +125,7 @@ class WeighController extends Controller
             $str .= $package['logistic_number']?"快递单号：{$package['logistic_number']}":'';
             $str .= $order_code?", 订单号：{$order_code}":'';
             if(!$result||$result['result']=='false'){
-                $package['status'] = '上传失败';
+                $package['uploaded_to_wms'] = '异常';
                 $str = "录入包裹失败！";
                 $str .= $package['logistic_number']?"快递单号：{$package['logistic_number']}":'';
                 $str .= $order_code?", 订单号：{$order_code}":'';

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

@@ -152,18 +152,18 @@ class PackageController
             OrderPackage::query()->where('batch_number',$orderPackage['batch_number'])->update($params);
             $result=$fluxController->markWMSOnBatch($orderPackage['batch_number'], $orderPackage['weight']);
             if(!$result['result']){
-                $orderPackage->status="上传异常";
+                $orderPackage->uploaded_to_wms="异常";
             }
         }else{
             app('LogService')->log(__METHOD__,__FUNCTION__,"GoodScan 写入包裹至WMS：".json_encode($orderPackage),null);
             try{
                 $result=$fluxController->accomplishToWMS($orderPackage);
                 if ($result['result'])
-                    $orderPackage->status="已上传";
+                    $orderPackage->uploaded_to_wms="是";
                 else
-                    $orderPackage->status="上传异常";
+                    $orderPackage->uploaded_to_wms="异常";
             }catch (\Exception $e){
-                $orderPackage->status="未上传";
+                $orderPackage->uploaded_to_wms="否";
             }
         }
         $response=$this->saveOrderPackage($orderPackage);

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

@@ -204,19 +204,19 @@ class PackageController extends Controller
                 $package->unifyThisMeasureUnderSameBatch();
                 $result=$fluxController->markWMSOnBatch($package['batch_number'], $request['weight']);
                 if(!$result['result']){
-                    $package->status="上传异常";
+                    $package->uploaded_to_wms="异常";
                 }
             }else{
                 app('LogService')->log(__METHOD__,__FUNCTION__,"写入包裹至WMS：".json_encode($package),null);
                 try{
                     $result=$fluxController->accomplishToWMS($package);
                     if ($result['result']){
-                        $package->status="已上传";
+                        $package->uploaded_to_wms="是";
                     }else{
-                        $package->status="上传异常";
+                        $package->uploaded_to_wms="异常";
                     }
                 }catch (\Exception $e){
-                    $package->status="未上传";
+                    $package->uploaded_to_wms="否";
                 }
             }
             try{

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/Listeners/FulfillFulfillPackageCustomer.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\CustomerStored;
-use App\OrderPackage;
-
-class FulfillPackageCustomer
-{
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     *
-     * @param  CustomerStored  $event
-     * @return bool
-     */
-    public function handle(CustomerStored $event)
-    {
-        $packages=OrderPackage::with('WMSReflectPackage')->where('status','记录异常')->orWhere('status','已上传异常')->get();
-        foreach ($packages as $package){
-            if (isset($package->WMSReflectPackage->Customer)&&$package->WMSReflectPackage->Customer==$event->owner->code){
-                $package->status="未测量";
-                $package->owner_id=$event->owner->id;
-                $package->save();
-            }
-        }
-        return false;
-    }
-}

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,16 +14,16 @@ 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;
 
     protected $fillable = ['order_id','logistic_number','batch_number',
-        'batch_rule','bulk','weight','length','width','height','paper_box_id','measuring_machine_id','weighed_at','status','sent_at','received_at','exception','transfer_status','remark','owner_id'];
+        'batch_rule','bulk','weight','length','width','height','paper_box_id','measuring_machine_id','weighed_at','status','sent_at','received_at','exception','transfer_status','remark','owner_id','uploaded_to_wms'];
 
     public function order(){
         return $this->belongsTo('App\Order','order_id','id');
@@ -132,7 +132,7 @@ class OrderPackage extends Model
                 'logistic_number'=>$resultOracleObj['soreference5']??'',
                 'weight'=>$weight,
                 'weighed_at'=> $now,
-                'status'=>"已上传",
+                'uploaded_to_wms'=>"是",
                 "created_at"=>$now,
             ]);
         }
@@ -149,7 +149,7 @@ class OrderPackage extends Model
             'batch_number'=>$batchCode??'',
             'weight'=>$weight,
             'weighed_at'=> $now,
-            'status'=>"已上传",]);
+            'uploaded_to_wms'=>"是",]);
         $newPackages=$packages;
         if($existingOrderPackages->isNotEmpty())
             $newPackages=array_filter($packages,function ($package)use($existingLogisticNumbers){

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=[