diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php
index bec3a89e1..37644508a 100644
--- a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php
+++ b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php
@@ -106,6 +106,11 @@ class SupervisionMaterialEntryController extends BaseAdminController
         $result = SupervisionMaterialEntryLogic::detail($params);
         return $this->data($result);
     }
+	
+	public function datas()
+	{
+		return $this->data(SupervisionMaterialEntryLogic::datas());
+	}
 
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php
index d137a181f..719bc6fa9 100644
--- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php
+++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php
@@ -84,7 +84,7 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
      */
     public function count(): int
     {
-        return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count();
+        return SupervisionWitnessSampling::where($this->searchWhere)->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php
index 188fa45c2..1211aa186 100644
--- a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php
+++ b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php
@@ -175,4 +175,15 @@ class SupervisionMaterialEntryLogic extends BaseLogic
 		$data['parallel_test_text'] = $data->parallel_test_text;
         return $data->toArray();
     }
+	
+	public static function datas()
+	{
+		$datas = SupervisionMaterialEntry::field(['id', 'code'])
+			->order(['id' => 'desc'])
+			->select()->each(function($data){
+				$data['projectinfo'] = 'ID：' . $data['id'] . ' / 编码：' . $data['code'];
+			})
+			->toArray();
+		return $datas;
+	}
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
index d3b8146fb..cf6adbdb4 100644
--- a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
+++ b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingLogic.php
@@ -47,7 +47,7 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
             $res = SupervisionWitnessSampling::create([
                 'project_id' => $params['project_id'],
                 'material_entry_id' => $params['material_entry_id'],
-                'code' => data_unique_code('CLJZ'),
+                'code' => data_unique_code('JZQY'),
                 'sampling_date' => !empty($params['sampling_date']) ? strtotime($params['sampling_date']) : 0,
                 'witness' => $params['witness'],
                 'sampler' => $params['sampler'],