版本大修改

app/Service/ApplyOrderService.php

@@ -958,13 +958,21 @@ class ApplyOrderService extends Service
     }
 
     public function reportWorkingDetail($data){
-        if($this->isEmpty($data,'id')) return [false,'ID不能为空！'];
-        $id = $data['id'];
+        if(empty($data['id']) && empty($data['order_number'])) return [false,'ID与OrderNumber不能为空！'];
+
+        $id = $data['id'] ?? 0;
+        $order_number = $data['order_number'] ?? "";
         $detail = ReportWorking::where('del_time',0)
-            ->where('id',$id)
+            ->when(! empty($id), function ($query) use ($id){
+                return $query->where('id', $id);
+            })
+            ->when(! empty($order_number), function ($query) use ($order_number){
+                return $query->where('order_number', $order_number);
+            })
             ->first();
         if(empty($detail)) return [false,'报工单不存在或已被删除'];
         $detail = $detail->toArray();
+        if(empty($id)) $id = $detail['id'];
         $detail['report_time'] = $detail['report_time'] ? date('Y-m-d',$detail['report_time']) : '';
 
         $apply_d = ReportWorkingDetail::where('del_time', 0)