Browse Source

接口对接

cqpCow 9 tháng trước cách đây
mục cha
commit
9e6c0e1f42

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

@@ -280,4 +280,15 @@ class JRFIDController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function screenPackageBySepAssem(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenPackageBySepAssem($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);
+        }
+    }
 }

+ 32 - 1
app/Service/JRFIDServerService.php

@@ -378,7 +378,6 @@ class JRFIDServerService extends Service
             $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'] ?? "";
         }
 
@@ -813,6 +812,38 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function screenPackageBySepAssem($data,$param){
+        if(empty($data['screenDataList'])) return [false, '包装数据不能为空'];
+        if(empty($data['site']) || empty($data['site_show'])) 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]['package_teams_group'] = $data['package_teams_group'];
+            $data['screenDataList'][$key]['package_teams_group_show'] = $data['package_teams_group_show'];
+            $data['screenDataList'][$key]['package_date'] = $utc_date;
+            $data['screenDataList'][$key]['package_date_lt'] = $date;
+            $data['screenDataList'][$key]['site'] = $data['site'];
+            $data['screenDataList'][$key]['site_show'] = $data['site_show'];
+        }
+
+        $url = config("j_rfid.screen_package_by_sep_assem");
+        $post = [
+            'screenDataList' => $data['screenDataList'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,$post,$param['header']);
+        if(! $status) return [$status, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, ['box_no' => $result['data'] ?? [], 'package_date' => $date]];
+    }
+
     public function post_helper($url, $data, $header = [], $timeout = 20){
         Log::channel('apiLog')->info('工装云POST', ["api" => $url , "param" => $data ,"header" => $header]);
 

+ 2 - 0
config/j_rfid.php

@@ -57,4 +57,6 @@ return [
     'furn_produce_schedule_list' => 'https://gzy.qingyaokeji.com/api/module-data/furn_produce_schedule_list/page',
     //拆单详情组件查询
     'furn_separate_order_dt_assem_list' => 'https://gzy.qingyaokeji.com/api/module-data/furn_separate_order_dt_assem_list/page',
+    //包装—拆单详情组件
+    'screen_package_by_sep_assem' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_package_by_sep_assem',
 ];

+ 2 - 0
routes/api.php

@@ -72,4 +72,6 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('screenGetPackageAssem', 'Api\JRFIDController@screenGetPackageAssem');
     //拆单详情组件查询
     $route->any('furnSeparateOrderDtAssemList', 'Api\JRFIDController@furnSeparateOrderDtAssemList');
+    //包装—拆单详情组件
+    $route->any('screenPackageBySepAssem', 'Api\JRFIDController@screenPackageBySepAssem');
 });