|
|
@@ -370,7 +370,7 @@ class ProcurementController extends Controller
|
|
|
$procurement->ownerMaterial->owner ? $procurement->ownerMaterial->owner->name :'',
|
|
|
is_null($procurement->type) ? '' :$procurementType[$procurement->type],
|
|
|
$procurement->ownerMaterial->owner->customer ? $procurement->ownerMaterial->owner->customer->company_name :'',
|
|
|
- $procurement->ownerMaterial->material ? $procurement->ownerMaterial->material->code :'',
|
|
|
+ $procurement->ownerMaterial ? $procurement->ownerMaterial->material_code :'',
|
|
|
$procurement->ownerMaterial->material ? $procurement->ownerMaterial->material->name :'',
|
|
|
$procurement->ownerMaterial ? $procurement->ownerMaterial->size :'',
|
|
|
$procurement->ownerMaterial ? $procurement->ownerMaterial->special :'',
|
|
|
@@ -411,7 +411,7 @@ class ProcurementController extends Controller
|
|
|
$procurementCheckSheet->procurementDelivery->procurement ? $procurementCheckSheet->procurementDelivery->procurement->created_at :'',
|
|
|
$procurementCheckSheet->procurementDelivery ? $procurementCheckSheet->procurementDelivery->created_at :'',
|
|
|
$procurementCheckSheet->procurementDelivery->procurement->supplier ? $procurementCheckSheet->procurementDelivery->procurement->supplier->name :'',
|
|
|
- $procurementCheckSheet->procurementDelivery->procurement->ownerMaterial->material ? $procurementCheckSheet->procurementDelivery->procurement->ownerMaterial->material->code :'',
|
|
|
+ $procurementCheckSheet->procurementDelivery->procurement->ownerMaterial ? $procurementCheckSheet->procurementDelivery->procurement->ownerMaterial->material_code :'',
|
|
|
$procurementCheckSheet->procurementDelivery->procurement->ownerMaterial->material ? $procurementCheckSheet->procurementDelivery->procurement->ownerMaterial->material->name :'',
|
|
|
$procurementCheckSheet->procurementDelivery->procurement ? $procurementCheckSheet->procurementDelivery->procurement->quantity :'',
|
|
|
$procurementCheckSheet->procurementDelivery ? $procurementCheckSheet->procurementDelivery->amount :'',
|
|
|
@@ -460,7 +460,7 @@ class ProcurementController extends Controller
|
|
|
$procurement->ownerMaterial->owner ? $procurement->ownerMaterial->owner->name :'',
|
|
|
$procurement->ownerMaterial->owner->customer ? $procurement->ownerMaterial->owner->customer->company_name :'',
|
|
|
$procurement->supplier ? $procurement->supplier->name :'',
|
|
|
- $procurement->ownerMaterial->material ? $procurement->ownerMaterial->material->code :'',
|
|
|
+ $procurement->ownerMaterial ? $procurement->ownerMaterial->material_code :'',
|
|
|
$procurement->ownerMaterial->material ? $procurement->ownerMaterial->material->name :'',
|
|
|
$procurement->ownerMaterial ? $procurement->ownerMaterial->size :'',
|
|
|
$procurement->ownerMaterial ? $procurement->ownerMaterial->special :'',
|