接口对接

app/Http/Controllers/Api/JRFIDController.php

@@ -127,6 +127,17 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function scanScreenCompleted(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->scanScreenCompleted($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            if($bool === 0) return $this->json_return(401,$data);
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function qualityOrders(Request $request){
         list($bool, $data) = (new JRFIDServerService())->qualityOrders($request->all(),$request->common_param);
 

app/Service/JRFIDServerService.php

@@ -337,28 +337,6 @@ class JRFIDServerService extends Service
     }
 
     public function completionOrders($data,$param){
-        //{"type":"","id":[],"completed_teams_group":"","completed_teams_group_show":"","completed_date":"","completed_date_lt":""}
-//        $p = [
-//            'screenDataList' =>[
-//                [
-//                    'id' => [], //产品
-//                    'type' => ''
-//                ],
-//                [
-//                    'id' => [],//组件
-//                    'type' => ''
-//                ],
-//                [
-//                    'id' => [],//部件
-//                    'type' => ''
-//                ],
-//            ],
-//            'completed_teams_group' => "",
-//            'completed_teams_group_show' => "",
-//            'procedure_code' => [],
-//            'site' => ""
-//        ];dd(json_encode($p));
-
         if(empty($data['screenDataList'])) return [false, '完工数据不能为空'];
         if(empty($data['site'])) return [false, '站点信息不能为空'];
 
@@ -389,6 +367,37 @@ class JRFIDServerService extends Service
         return [true, ''];
     }
 
+    public function scanScreenCompleted($data,$param){
+        if(empty($data['screenDataList'])) return [false, '完工数据不能为空'];
+        if(empty($data['site'])) return [false, '站点信息不能为空'];
+
+        list($date,$utc_date) = $this->getE8AndUTC();
+        foreach ($data['screenDataList'] as $key => $value){
+            if(empty($value['id']) || ! isset($value['type'])) return [false, '完工数据不能为空'];
+            $data['screenDataList'][$key]['completed_teams_group'] = $data['completed_teams_group'] ?? "";
+            $data['screenDataList'][$key]['completed_teams_group_show'] = $data['completed_teams_group_show'] ?? "";
+            $data['screenDataList'][$key]['completed_date'] = $utc_date;
+            $data['screenDataList'][$key]['completed_date_lt'] = $date;
+            $data['screenDataList'][$key]['procedure_code'] = $data['procedure_code'] ?? [];
+            $data['screenDataList'][$key]['site'] = $data['site'] ?? "";
+        }
+
+        $url = config("j_rfid.scanScreenCompleted");
+        $post = [
+            'screenDataList' => $data['screenDataList'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,$post, $param['header']);
+        if(! $status) return [$status, $result];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, ''];
+    }
+
     public function qualityOrders($data,$param){
         if(empty($data['screenDataList'])) return [false, '质检数据不能为空'];
         if(empty($data['site'])) return [false, '站点信息不能为空'];

config/j_rfid.php

@@ -29,6 +29,8 @@ return [
     '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',
+    //（扫码完工）
+    'scanScreenCompleted' => 'https://gzy.qingyaokeji.com/api/module-data/furn_dispatch_order_dt/furn_dispatch_order_dt/diy/screen_completed',
     //质检
     'quality_orders' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_quality',
     //打印

routes/api.php

@@ -48,6 +48,8 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('furnProduceScheduleList', 'Api\JRFIDController@furnProduceScheduleList');
     //完工
     $route->any('completionOrders', 'Api\JRFIDController@completionOrders');
+    //扫码完工
+    $route->any('scanScreenCompleted', 'Api\JRFIDController@scanScreenCompleted');
     //质检
     $route->any('qualityOrders', 'Api\JRFIDController@qualityOrders');
     //（查询合同号、图号、房间号）