星科源

app/Http/Controllers/Api/U8Controller.php

@@ -275,6 +275,19 @@ class U8Controller extends BaseController
         }
     }
 
+    public function recordList(Request $request)
+    {
+        $userData = $request->userData;
+        $service = new U8XkyServerService();
+        list($status,$data) = $service->recordList($request->all(),$userData);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function fieldList(Request $request)
     {
         $userData = $request->userData;

app/Service/U8XkyServerService.php

@@ -12,6 +12,37 @@ use Illuminate\Support\Facades\DB;
 
 class U8XkyServerService extends Service
 {
+    public function recordCommon($data, $user, $field = []){
+       $state = $data['state'] ?? null;
+       $model = U8State::where('del_time',0)
+           ->when(! empty($state), function ($query) use($state){
+               return $query->where('state', $state);
+           })
+           ->where('login_type', $user['login_type'])
+           ->select('type', 'order_number', 'state')
+           ->orderBy('id','desc');
+
+        return $model;
+    }
+
+    public function recordList($data, $user){
+        $model = $this->recordCommon($data, $user);
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillRecordData($list,$user);
+
+        return [true, $list];
+    }
+
+    public function fillRecordData($data, $user){
+        if(empty($data['data'])) return $data;
+
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['type_title'] = FieldData::$name[$value['type']] ?? '';
+        }
+
+        return $data;
+    }
+
     //新增存货到本地-----------------------------------------------
 
     public function inventoryAdd($data, $user){
@@ -193,6 +224,7 @@ class U8XkyServerService extends Service
         }
 
         if(! empty($data['id'])) $model->where('i.id', $data['id']);
+        if(! empty($data['order_number'])) $model->where('i.order_number', $data['order_number']);
 
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
             $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
@@ -204,7 +236,7 @@ class U8XkyServerService extends Service
     }
 
     public function inventoryDetail($data, $user){
-       if(empty($data['id'])) return [false, 'ID不能为空'];
+       if(empty($data['id']) && empty($data['order_number'])) return [false, 'ID或流水号不能都为空'];
        list($status, $msg) = $this->inventoryList($data, $user);
        $return = $msg['data'][0] ?? [];
 
@@ -411,6 +443,7 @@ class U8XkyServerService extends Service
         }
 
         if(! empty($data['id'])) $model->where('v.id', $data['id']);
+        if(! empty($data['order_number'])) $model->where('v.order_number', $data['order_number']);
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
             $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
             $model->where('v.crt_time', '>=', $return[0]);
@@ -445,7 +478,7 @@ class U8XkyServerService extends Service
     }
 
     public function vendorDetail($data, $user){
-        if(empty($data['id'])) return [false, 'ID不能为空'];
+        if(empty($data['id']) && empty($data['order_number'])) return [false, 'ID或流水号不能都为空'];
         list($status, $msg) = $this->vendorList($data, $user);
         $return = $msg['data'][0] ?? [];