Browse Source

接口对接

cqpCow 10 months ago
parent
commit
bf715ffd07

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

@@ -86,6 +86,16 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function furnProduceScheduleList(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->furnProduceScheduleList($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);
 

+ 40 - 0
app/Service/JRFIDServerService.php

@@ -255,6 +255,46 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function furnProduceScheduleList($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.furn_produce_schedule_list");
+
+        $sorts = [];
+        if(empty($data['sorts'])) {
+            //默认
+            $sorts = [
+                [
+                    "property" => "exe_produce_order_a.order_date",
+                    "direction" => "DESC",
+                    "sortOrderNumber" => 2
+                ]
+            ];
+        }
+
+        $post = [
+            "direction" => $data['direction'] ?? "DESC", //排序
+            "property" =>  $data['direction'] ?? "id", // 排序
+            "sorts" => $sorts
+        ];
+        $post['size'] = $data['size'] ?? 10;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+        $post['rules'] = $data['rules'] ?? [];
+
+        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 = [

+ 2 - 0
config/j_rfid.php

@@ -43,4 +43,6 @@ return [
     'screenGetProDtData' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_get_pro_dt_data',
     //根据组件id、type和合同号查询工艺流程单详情数据
     'screenGetPackageAssem' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_get_package_assem',
+    //生产进度汇总报表
+    'furn_produce_schedule_list' => 'https://gzy.qingyaokeji.com/api/module-data/furn_produce_schedule_list/page',
 ];

+ 2 - 0
routes/api.php

@@ -42,6 +42,8 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('getDepart', 'Api\JRFIDController@getDepart');
     //获取工序分类
     $route->any('getProcedureClass', 'Api\JRFIDController@getProcedureClass');
+    //生产进度报表
+    $route->any('furnProduceScheduleList', 'Api\JRFIDController@furnProduceScheduleList');
     //完工
     $route->any('completionOrders', 'Api\JRFIDController@completionOrders');
     //质检