From 673c122a229f010b2a5b617e02098c0db88ca813 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 20 Mar 2024 15:04:29 +0800
Subject: [PATCH] update

---
 .../SupervisionWitnessSamplingDetailLists.php                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php
index b08ecb3e4..a63e00e13 100644
--- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php
+++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php
@@ -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'];