cqpCow 1 vuosi sitten
vanhempi
sitoutus
27cd6d8955

+ 20 - 0
app/Http/Controllers/Api/JRFIDController.php

@@ -66,6 +66,26 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function getDepart(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->getDepart($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function getProcedureClass(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->getProcedureClass($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function completionOrders(Request $request){
         list($bool, $data) = (new JRFIDServerService())->completionOrders($request->all(),$request->common_param);
 

+ 56 - 0
app/Service/JRFIDServerService.php

@@ -191,6 +191,62 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function getDepart($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.get_depart");
+        $post['rules'] = [
+            [
+                'field' => 'is_used',
+                'option' => 'IN',
+                'values' => ['1']
+            ]
+        ];
+        $post['size'] = $data['size'] ?? 6;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+
+        list($status,$result) = $this->post_helper($url,$post,$header);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['content'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result];
+    }
+
+    public function getProcedureClass($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.get_procedure_class");
+        $post['rules'] = [
+            [
+                'field' => 'is_used',
+                'option' => 'IN',
+                'values' => ['1']
+            ]
+        ];
+        $post['size'] = $data['size'] ?? 6;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+
+        list($status,$result) = $this->post_helper($url,$post,$header);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['content'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result];
+    }
+
     public function completionOrders($data,$param){
         //{"type":"","id":[],"completed_teams_group":"","completed_teams_group_show":"","completed_date":"","completed_date_lt":""}
 //        $p = [

+ 4 - 0
config/j_rfid.php

@@ -19,6 +19,10 @@ return [
     'get_print_data' => 'https://gzy.qingyaokeji.com/api/module-data/process_flow/process_flow/diy/get_process_data',
     //班组查询
     'get_team' => 'https://gzy.qingyaokeji.com/api/module-data/teams_group_list/page',
+    //部门查询
+    'get_depart' => 'https://gzy.qingyaokeji.com/api/module-data/department_list/page',
+    //工序分类查询
+    'get_procedure_class' => 'https://gzy.qingyaokeji.com/api/module-data/procedure_calss_list/page',
     //完工
     'completion_orders' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_completed',
     //质检

+ 4 - 0
routes/api.php

@@ -38,6 +38,10 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('getProduceByContract', 'Api\JRFIDController@getProduceByContract');
     //获取班组
     $route->any('getTeam', 'Api\JRFIDController@getTeam');
+    //获取部门
+    $route->any('getDepart', 'Api\JRFIDController@getDepart');
+    //获取工序分类
+    $route->any('getProcedureClass', 'Api\JRFIDController@getProcedureClass');
     //完工
     $route->any('completionOrders', 'Api\JRFIDController@completionOrders');
     //质检