Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/JRFIDController.php

@@ -155,4 +155,14 @@ class JRFIDController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function screenGetPackageAssem(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenGetPackageAssem($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Service/JRFIDServerService.php

@@ -179,16 +179,22 @@ class JRFIDServerService extends Service
 //            ],
 //            '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, '站点信息不能为空'];
+
         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_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.completion_orders");
@@ -209,13 +215,17 @@ class JRFIDServerService extends Service
 
     public function qualityOrders($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]['qualified_teams_group'] = $data['qualified_teams_group'];
-            $data['screenDataList'][$key]['qualified_teams_group_show'] = $data['qualified_teams_group_show'];
+            $data['screenDataList'][$key]['qualified_teams_group'] = $data['qualified_teams_group'] ?? "";
+            $data['screenDataList'][$key]['qualified_teams_group_show'] = $data['qualified_teams_group_show'] ?? "";
             $data['screenDataList'][$key]['qualified_date'] = $utc_date;
             $data['screenDataList'][$key]['qualified_date_lt'] = $date;
+            $data['screenDataList'][$key]['procedure_code'] = $data['procedure_code'] ?? [];
+            $data['screenDataList'][$key]['site'] = $data['site'] ?? "";
         }
 
         $url = config("j_rfid.quality_orders");
@@ -396,7 +406,7 @@ class JRFIDServerService extends Service
             return [false, $error];
         }
 
-        return [true, ''];
+        return [true, ['box_no' => $result['data'] ?? [], 'package_date' => $date]];
     }
 
     public function screenGetPackageData($data,$param){
@@ -455,6 +465,33 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function screenGetPackageAssem($data,$param){
+        if(empty($data['id'])) return [false, '数据ID不能为空'];
+        if(empty($data['type'])) return [false, 'TYPE不能为空'];
+        if(empty($data['site'])) return [false, '站点不能为空'];
+
+        $url = config("j_rfid.screenGetPackageAssem");
+        $post = [
+            'id' => $data['id'],
+            'type' => $data['type'],
+            'site' => $data['site'],
+            'contract_no' => $data['contract_no'] ?? ""
+        ];
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['assembly_list'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['assembly_list']];
+    }
+
     public function post_helper($url, $data, $header = [], $timeout = 20){
         Log::channel('apiLog')->info('工装云POST', ["api" => $url , "param" => $data ,"header" => $header]);
 

config/j_rfid.php

@@ -37,4 +37,6 @@ return [
     'screen_get_package_data' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_get_package_data',
     //(查询工艺流程单详情信息)
     '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',
 ];

routes/api.php

@@ -54,4 +54,6 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('screenGetPackageData', 'Api\JRFIDController@screenGetPackageData');
     //(查询工艺流程单详情信息)
     $route->any('screenGetProDtData', 'Api\JRFIDController@screenGetProDtData');
+    //根据组件id、type和合同号查询工艺流程单详情数据
+    $route->any('screenGetPackageAssem', 'Api\JRFIDController@screenGetPackageAssem');
 });