appends问题修正

app/Commodity.php

@@ -20,13 +20,14 @@ class Commodity extends Model
         return $this->belongsTo('App\Owner','owner_id','id');
     }
     public function getBarcodeAttribute(){
-        return $this->barcodes()->first()['code'];
+//        return $this->barcodes()->first()['code'];
+        return $this->barcodes[0]['code']??'';
     }
     public function getOwnerNameAttribute(){
-        return $this->owner()->first()['name'];
+        return $this->owner['name']??'';
     }
     public function getOwnerCodeAttribute(){
-        return $this['owner'] ? $this['owner']['code'] : null;
+        return $this->owner['code']??'';
     }
 
     static function newCommodityBy_BarcodeOwnerIdNameSku($barcode,$ownerId,$name,$sku){

app/Http/Controllers/InventoryController.php

@@ -94,7 +94,7 @@ class InventoryController extends Controller
     }
     //动库报表
     public function changeInventory(Request $request){
-        if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
+        if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
         $page=$request->input('page')??1;
         $paginate=$request->input('paginate')??50;
         $oracleActTransactingLogs=$this->conditionQuery($request,$page,$paginate);
@@ -113,7 +113,7 @@ class InventoryController extends Controller
         return view('inventory.statement.allInventory',compact('oracleActTransactingLogs','page','owners'));
     }
     public function exportData(Request $request){
-        if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
+        if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
         if (!$request->checkAllSign){
             $oracleActTransactingLogs=json_decode($request->input('data'),true);
             return $this->export($oracleActTransactingLogs);

app/Http/Controllers/TestController.php

@@ -88,8 +88,8 @@ class TestController extends Controller
     function t2(Request $request)
     { //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
 
-        $user = factory(User::class)->create();
-        dd($user);
+        $user = User::get();
+        dd($user[1011]['name']??'x');
 
     }
 

app/OperatorLog.php

@@ -24,6 +24,6 @@ class OperatorLog extends Model
     }
     public function getUserNameAttribute()
     {
-        return $this['user'] ? $this['user']['name'] : null;
+        return $this['user']['name'] ??'';
     }
 }

app/OracleDOCOrderHeader.php

@@ -37,10 +37,10 @@ class OracleDOCOrderHeader extends Model
     }
 
     public function getOracleBASCustomerDescrCAttribute(){
-        return $this['oracleBASCustomer']? $this['oracleBASCustomer']['descr_c']:null;
+        return $this['oracleBASCustomer']['descr_c']??'';
     }
     public function getOracleBASCodeCodenameCAttribute(){
-        return $this['oracleBASCode'] ? $this['oracleBASCode']['codename_c'] : null;
+        return $this['oracleBASCode']['codename_c'] ??'';
     }
     public function hasUn(){
         return $this->hasMany('App\OracleDOCOrderDetail','orderno','orderno');

app/Order.php

@@ -53,12 +53,11 @@ class Order extends Model
     }
 
     public function getlogisticNumbersAttribute(){
-        $packages = $this->packages();
-        if(!$packages){
+        if(!$this->packages){
             return [];
         }else{
             $arr = [];
-           foreach ( $packages->get() as $package){
+           foreach ( $this->packages as $package){
                $arr[] = $package->logistic_number;
            }
            return $arr;
@@ -66,12 +65,11 @@ class Order extends Model
     }
 
     public function getAmountAttribute(){
-        $packages = $this->packages();
-        if(!$packages){
+        if(!$this->packages){
             return 0;
         }else{
             $count = 0;
-            foreach ( $packages->get() as $package){
+            foreach ( $this->packages as $package){
                 foreach ($package->commodities as $item){
                     $count += $item->amount;
                 }

app/OrderIssue.php

@@ -48,7 +48,7 @@ class OrderIssue extends Model
     }
 
     public function getSecondLogisticNumberAttribute(){
-        return $this['secondOrder'] ? $this['secondOrder']['code'] : null;
+        return $this['secondOrder']['code'] ??'';
     }
 
 }

app/RejectedBillItem.php

@@ -23,6 +23,9 @@ class RejectedBillItem extends Model
     public function rejectedBill(){
         return $this->belongsTo('App\RejectedBill', 'id_rejected_bill', 'id');
     }
+    public function quality(){
+        return $this->belongsTo(QualityLabel::class, 'id_quality_label', 'id');
+    }
     public function wmsReflectSku(){
         $bill=$this->rejectedBill()->first();
         $wmsReflectReceive=$bill->wmsReflectReceive()->first();
@@ -58,7 +61,6 @@ class RejectedBillItem extends Model
         }
     }
     public function getQualityLabelAttribute(){
-        $label=QualityLabel::find($this['id_quality_label']);
-        return $label['name'];
+        return $this['quality']['name'];
     }
 }