This commit is contained in:
weiz 2024-03-20 15:04:29 +08:00
parent 3bdc87e984
commit 673c122a22

View File

@ -64,12 +64,14 @@ class SupervisionWitnessSamplingDetailLists extends BaseAdminDataLists implement
->order(['id' => 'desc'])
->select()->each(function($data){
$witness_sampling = SupervisionWitnessSampling::field('sampling_date')->where('id',$data['witness_sampling_id'])->findOrEmpty();
$material_entry_detail = SupervisionMaterialEntryDetail::field('material_entry_id,name,brand,model,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty();
$material_entry_detail = SupervisionMaterialEntryDetail::field('material_entry_id,name,brand,model,unit,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('enter_time')->where('id',$material_entry_detail['material_entry_id'])->findOrEmpty();
$data['name'] = $material_entry_detail['name'];
$data['brand'] = $material_entry_detail['brand'];
$data['model'] = $material_entry_detail['model'];
$data['contract_brand_text'] = $material_entry_detail->contract_brand_text;
$data['contract_brand'] = $material_entry_detail['contract_brand'];
$data['unit'] = $material_entry_detail['unit'];
$data['entry_number'] = $material_entry_detail['entry_number'];
$data['enter_time'] = $material_entry['enter_time'];
$data['sampling_date'] = $witness_sampling['sampling_date'];