Browse Source

接口对接

cqpCow 1 year ago
parent
commit
148f61b590

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

@@ -270,6 +270,17 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function screenGetPackageAssemData(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenGetPackageAssemData($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 furnSeparateOrderDtAssemList(Request $request){
         list($bool, $data) = (new JRFIDServerService())->furnSeparateOrderDtAssemList($request->all(),$request->common_param);
 

+ 33 - 0
app/Service/JRFIDServerService.php

@@ -754,6 +754,39 @@ class JRFIDServerService extends Service
         return [true, $result['assembly_list']];
     }
 
+    public function screenGetPackageAssemData($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.screenGetPackageAssemData");
+        $post = [
+            'id' => $data['id'],
+            'type' => $data['type'],
+            'site' => $data['site'],
+            'contract_no' => $data['contract_no'] ?? ""
+        ];
+
+        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['message']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['assembly_list'])) {
+            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
+            return [false, $error];
+        }
+
+        foreach ($result['assembly_list'] as $key => $value){
+            foreach ($value['package_assembly_list'] as $kk => $vv){
+                $result['assembly_list'][$key]['package_assembly_list'][$kk]['package_date'] = $this->changeDateToDateMin($vv['package_date']);
+            }
+        }
+
+        return [true, $result['assembly_list']];
+    }
+
     public function screenGetDispatchDtData($data,$param){
         if(empty($data['id'])) return [false, '数据ID不能为空'];
         if(empty($data['type'])) return [false, 'TYPE不能为空'];

+ 2 - 0
config/j_rfid.php

@@ -59,4 +59,6 @@ return [
     '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',
+    //工位屏-根据芯片查询包装单组件数据
+    'screenGetPackageAssemData' => 'https://gzy.qingyaokeji.com//api/module-data/furn_package_dt/furn_package_dt/diy/screen_get_package_assem_data',
 ];

+ 2 - 0
routes/api.php

@@ -74,4 +74,6 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('furnSeparateOrderDtAssemList', 'Api\JRFIDController@furnSeparateOrderDtAssemList');
     //包装—拆单详情组件
     $route->any('screenPackageBySepAssem', 'Api\JRFIDController@screenPackageBySepAssem');
+    //工位屏-根据芯片查询包装单组件数据
+    $route->any('screenGetPackageAssemData', 'Api\JRFIDController@screenGetPackageAssemData');
 });