Merge branch 'zzd'

# Conflicts:
#	app/Providers/AppServiceProvider.php
#	app/Services/OrderService.php

app/Exceptions/Handler.php

@@ -50,12 +50,13 @@ class Handler extends ExceptionHandler
      *
      * @param Request $request
      * @param Throwable $exception
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      * @throws Throwable
      */
     public function render($request, Throwable $exception)
     {
-        if (method_exists($exception,'getStatusCode')) {
+        try{
+            if (method_exists($exception,'getStatusCode')) {
             $code = $exception->getStatusCode();
             Controller::logS('exception',$code,$exception->getTraceAsString().'|| ||'.json_encode($request));
             switch ($code){
@@ -63,8 +64,11 @@ class Handler extends ExceptionHandler
                 case 404:return response()->view('exception.404');
                 default: return response()->view('exception.default',compact('code'));
             }
+            }
+            Controller::logS('exception',class_basename($exception),$exception->getTraceAsString().'|| ||'.json_encode($request));
+        }catch (\Exception $e){
+
         }
-        Controller::logS('exception',class_basename($exception),$exception->getTraceAsString().'|| ||'.json_encode($request));
         return parent::render($request, $exception);
     }
 }

app/Http/Controllers/OwnerController.php

@@ -24,7 +24,7 @@ class OwnerController extends Controller
     public function index()
     {
         if(!Gate::allows('货主-查询')){ return redirect(url('/'));  }
-        $owners=Owner::orderBy('id','desc')->paginate(25);
+        $owners=Owner::query()->orderBy('id','desc')->whereNull('deleted_at')->paginate(25);
         return view('maintenance.owner.index',['owners'=>$owners]);
     }
 
@@ -124,8 +124,6 @@ class OwnerController extends Controller
     public function destroy(Owner $owner)
     {
         if(!Gate::allows('货主-删除')){ return redirect(url('/'));  }
-//        $authority=Authority::where('name',"_{$owner['id']}")->first();
-//        if($authority)$authority->delete();
         $re=$owner->delete();
         $this->log(__METHOD__,__FUNCTION__,$owner->toJson(),Auth::user()['id']);
         return ['success'=>$re];
@@ -133,15 +131,14 @@ class OwnerController extends Controller
     public function recycle()
     {
         if(!Gate::allows('货主-删除')){ return redirect(url('/'));  }
-        $owners=Owner::orderBy('id','desc')->withTrashed()->whereNotNull('deleted_at')->paginate(25);
+        $owners=Owner::query()->orderBy('id','desc')->whereNotNull('deleted_at')->paginate(25);
         return view('maintenance.owner.recycle',['owners'=>$owners]);
     }
     public function restoreSelected(Request $request)
     {
         if(!Gate::allows('货主-删除')){ return ['success'=>'false','fail_info'=>"没有权限"];  }
         $id=$request->input('id');
-        $owner=Owner::withTrashed()->where('id',$id)->first();
-        $owner->restore();
+        $owner=Owner::query()->whereNotNull('deleted_at')->where('id',$id)->delete();
         $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','owner'=>$owner];
     }

app/Http/Controllers/TestController.php

@@ -13,8 +13,12 @@ use App\OracleActAllocationDetails;
 use App\OracleDOCOrderHeader;
 use App\OracleDocOrderPackingSummary;
 use App\OracleDOCWaveDetails;
+use App\Owner;
+use App\Package;
 use App\RejectedBillItem;
 use App\Services\InventoryCompareService;
+use App\Services\LogService;
+use App\Services\OrderPackageService;
 use App\User;
 use App\Waybill;
 use Carbon\Carbon;
@@ -185,7 +189,32 @@ class TestController extends Controller
     }
 
     public function mergerPackageData(){
-
+        $number = 1000;
+        $sum = Package::query()->count();
+        $len = ceil($sum / $number);
+        $id = 0;
+        for ($i = 1;$i <= $len; $i++){
+            $packages = Package::query()->orderBy('id')->where('id','>',$id)->limit($number)->get();
+            $error = [];
+            foreach ($packages as $package){
+                /** @var OrderPackageService */
+               $orderPackage =  app('orderPackageService')->firstOrCreate($package->logistic_number,
+                    ['batch_number'=>$package->batch_number,
+                        'batch_rule'=>$package->batch_rule,
+                        'bulk'=>$package->bulk,
+                        'weight'=>$package->weight,
+                        'length'=>$package->length,
+                        'width'=>$package->width,
+                        'height'=>$package->height,
+                        'paper_box_id'=>$package->paper_box_id,
+                        'measuring_machine_id'=>$package->measuring_machine_id,
+                        'weighed_at'=>$package->weighed_at,
+                        'status'=>$package->status]);
+               if (!$orderPackage)array_push($error,$package->id);
+            }
+            LogService::log(__METHOD__,"同步时WMS中未找到这些订单",json_encode($error));
+            $id = $packages[count($packages)-1]->id;
+        }
     }
 
     public function excelIt()
@@ -261,6 +290,9 @@ class TestController extends Controller
     }
 
     function test(){
+        dd(Owner::query()->where('code','CHAIJING')->first());
+        $owner = app('ownerService')->first(['code' => "CHAIJING"]);
+        dd($owner);
         dd(Waybill::query()->with('uploadFile')->find(695));
         $actAllocationDetail = OracleActAllocationDetails::query();
         $actAllocationDetail->with(['oracleDocOrderHeader'=>function(Builder $query){

app/OracleDOCOrderHeader.php

@@ -33,7 +33,7 @@ class OracleDOCOrderHeader extends Model
         return $this->hasOne('App\OracleBasCustomer','customerid','customerid');
     }
     public function oracleBASCode(){
-        return $this->hasOne('App\OracleBasCode','Code','sostatus')->where('codeid','SO_STS');
+        return $this->hasOne('App\OracleBasCode','code','sostatus')->where('codeid','SO_STS');
     }
 
     public function getOracleBASCustomerDescrCAttribute(){

app/OrderPackage.php

@@ -4,7 +4,6 @@ namespace App;
 
 use App\Http\Controllers\Controller;
 use App\Services\LogService;
-use App\Services\OrderIssueService;
 use App\Services\OrderPackageService;
 use App\Services\OrderService;
 use App\Traits\ModelTimeFormat;

app/Owner.php

@@ -14,15 +14,15 @@ use App\Traits\ModelTimeFormat;
 class Owner extends Model
 {
     use ModelTimeFormat;
-    use SoftDeletes;
     public $fillable = ['name','code','checking_count','deleted_at'];
     public static function filterAuthorities(){
         $user=Auth::user();
+        $query = (new static)->newQuery();
         if(!$user){
-            return (new static)->newQuery()->where('id','0');
+            return $query->where('id','0');
         }
         $ownerIds=$user->getPermittingOwnerIdsAttribute();
-        return (new static)->newQuery()->whereIn('id',$ownerIds);
+        return $query->whereIn('id',$ownerIds);
     }
     public function getIncreasedCheckingCount(){
         $this['checking_count']=$this['checking_count']+1;

app/Services/OrderService.php

@@ -116,18 +116,18 @@ class OrderService
          * @var OracleActAllocationDetails $actAllocationDetail
          */
         $actAllocationDetail = app('oracleActAllocationDetailService')->first(['picktotraceid' => $logistic_number]);
+        if (!$actAllocationDetail) return null;
 
-//        if(!$actAllocationDetail)return dd($logistic_number,$actAllocationDetail);;
         $order = $this->first(['code' => $actAllocationDetail->orderno]);
         if ($order) return $order;
 
-
         $actAllocationDetail->load(['oracleDocOrderHeader' => function ($query) {
             $query->with('oracleBASCode');
         }]);
         $orderHeader = $actAllocationDetail->oracleDocOrderHeader ?? null;
         if ($orderHeader == null) return null;
 
+        /** @var OwnerService $owner */
         $owner = app('ownerService')->first(['code' => $orderHeader->customerid]);
         if (!$owner) {
             $orderHeader->load('oracleBASCustomer');
@@ -144,7 +144,6 @@ class OrderService
 
         $logistics = app('logisticService')->firstOrCreate(['code' => $orderHeader->carrierid],
             ['code' => $orderHeader->carrierid, 'name' => $orderHeader->carriername]);
-
         return Order::query()->create([
             'code' => $orderHeader->orderno,
             'owner_id' => $owner ? $owner->id : null,

app/User.php

@@ -107,7 +107,7 @@ class User extends Authenticatable
     function getPermittingOwnerIdsAttribute(){
         $ownerIds=[];
         if($this->isSuperAdmin()||Gate::allows('货主-可见全部')){
-            $owners=Owner::all();
+            $owners=Owner::query()->whereNull('deleted_at')->get();
             $owners->each(function(Owner $owner)use(&$ownerIds){
                 array_push($ownerIds,$owner['id']);
             });